REFACTORING: changing readability of records and repairing reactive s…

…treams in GithubService

src/main/java/org/example/githubservice/model/Branch.java

@@ -1,5 +1,7 @@
 package org.example.githubservice.model;
 
-public record Branch(String name, Commit commit) {
-
+public record Branch(
+        String name,
+        Commit commit
+) {
 }

src/main/java/org/example/githubservice/model/Commit.java

@@ -1,4 +1,6 @@
 package org.example.githubservice.model;
 
-public record Commit(String sha) {
+public record Commit(
+        String sha
+) {
 }

src/main/java/org/example/githubservice/model/Owner.java

@@ -1,5 +1,6 @@
 package org.example.githubservice.model;
 
-public record Owner(String login) {
-
+public record Owner(
+        String login
+) {
 }

src/main/java/org/example/githubservice/model/Repository.java

@@ -1,6 +1,15 @@
 package org.example.githubservice.model;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.util.List;
 
-public record Repository(String name, Owner owner, Boolean fork, String branchesUrl, List<Branch> branches) {
+public record Repository(
+        String name,
+        Owner owner,
+        Boolean fork,
+        @JsonProperty("branches_url")
+        String branchesUrl,
+        List<Branch> branches
+) {
 }

src/main/java/org/example/githubservice/service/GithubService.java

@@ -6,9 +6,6 @@
 import org.example.githubservice.model.dtos.RepositoryDTO;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-
-import java.util.List;
 
 @Service
 public class GithubService {
@@ -21,16 +18,13 @@ public GithubService(GithubClient githubClient) {
     public Flux<RepositoryDTO> getRepositoriesWithBranchesByUser(String username) {
         return githubClient.getAllRepositoriesByUser(username)
                 .filter(repositoryDTO -> !repositoryDTO.fork())
-                .flatMap(repository -> {
-                    new RepositoryDTO(repository.name(), repository.owner().login(), getListOfBranchesDTO(repository))
-
-                });
-
+                .concatMap(repository -> getListOfBranchesDTO(repository)
+                        .collectList()
+                        .map(branches -> new RepositoryDTO(repository.name(), repository.owner().login(), branches)));
     }
 
-    private Mono<List<BranchDTO>> getListOfBranchesDTO(Repository repository) {
+    private Flux<BranchDTO> getListOfBranchesDTO(Repository repository) {
         return githubClient.getAllBranches(repository)
-                .map(branch -> new BranchDTO(branch.name(), branch.commit().sha()))
-                .collectList();
+                .map(branch -> new BranchDTO(branch.name(), branch.commit().sha()));
     }
 }