feature: Implement DollyTeams status retrieval in DashboardService and refactor related methods for improved clarity

Author: krharum

apps/dolly-backend/src/main/java/no/nav/dolly/repository/BestillingRepository.java

@@ -194,7 +194,7 @@ select count(*) antall, to_char(b.sist_oppdatert, 'YYYY-MM') interval, br.bruker
 
     @Query("""
             select count(*) antall, to_char(b.sist_oppdatert, 'YYYY-MM') interval,
-                   t.navn || '|' || t.beskrivelse || '|' || t.bruker_id informasjon
+                   t.navn || '|' || coalesce(t.beskrivelse, '') || '|' || t.bruker_id informasjon
             from bestilling b
             join bruker br on br.id = b.bruker_id
             join team t on t.bruker_id = br.id

apps/dolly-backend/src/main/java/no/nav/dolly/service/DashboardService.java

@@ -126,6 +126,30 @@ public Flux<DashboardOrganisasjonerDTO> getOrganisasjonerStatus() {
                 .sort(Comparator.comparing(DashboardOrganisasjonerDTO::getInterval).reversed());
     }
 
+    public Flux<DashboardDollyTeamsDTO> getDollyTeamsStatus() {
+
+        return teamRepository.findAllTeamBrukere()
+                .collect(Collectors.toMap(DollyTeam2Fragment::getBrukerid, DollyTeam2Fragment::getAntall))
+                .flatMapMany(oppslag -> bestillingRepository.findBestillingerForDollyTeamsOrderBySistOppdatert()
+                        .groupBy(DollyTeamFragment::getInterval)
+                        .flatMap(Flux::collectList)
+                        .map(fragments -> {
+                            var teams = fragments.stream()
+                                    .map(fragment -> toDollyTeamEntry(fragment, oppslag))
+                                    .sorted(Comparator.comparing(DashboardDollyTeamsDTO.Entry::getNavn))
+                                    .toList();
+                            return DashboardDollyTeamsDTO.builder()
+                                    .interval(fragments.getFirst().getInterval())
+                                    .teams(teams)
+                                    .totaltAntallTeams(teams.size())
+                                    .totaltAntallMedlemmer(teams.stream()
+                                            .mapToInt(DashboardDollyTeamsDTO.Entry::getAntallMedlemmer)
+                                            .sum())
+                                    .build();
+                        }))
+                .sort(Comparator.comparing(DashboardDollyTeamsDTO::getInterval).reversed());
+    }
+
     private static long sumByStatus(List<BestillingerFragment> fragments,
                                     Function<BestillingerFragment, String> statusGetter,
                                     String value) {
@@ -170,30 +194,10 @@ private static DashboardOrganisasjonerDTO.Entry toOrganisasjonEntry(String orgNu
         return new DashboardOrganisasjonerDTO.Entry(orgNummer, info.getNavn(), info.getOrganisasjonsform(), brukere.size());
     }
 
-    public Flux<DashboardDollyTeamsDTO> getDollyTeamsStatus() {
+    private static DashboardDollyTeamsDTO.Entry toDollyTeamEntry(DollyTeamFragment fragment,
+                                                                  Map<String, Long> oppslag) {
 
-        return teamRepository.findAllTeamBrukere()
-                .collect(Collectors.toMap(DollyTeam2Fragment::getBrukerid, DollyTeam2Fragment::getAntall))
-                .flatMapMany(oppslag -> bestillingRepository.findBestillingerForDollyTeamsOrderBySistOppdatert()
-                        .groupBy(DollyTeamFragment::getInterval)
-                        .flatMap(Flux::collectList)
-                        .map(fragments -> DashboardDollyTeamsDTO.builder()
-                                .interval(fragments.getFirst().getInterval())
-                                .teams(fragments.stream()
-                                        .map(fragment -> {
-                                            var info = fragment.getInformasjon().split("\\|");
-                                            return new DashboardDollyTeamsDTO.Entry(info[0], info[1],
-                                                    toIntExact(oppslag.get(info[2])));
-                                        })
-                                        .sorted(Comparator.comparing(DashboardDollyTeamsDTO.Entry::getNavn))
-                                        .toList())
-                                .totaltAntallTeams(fragments.size())
-                                .totaltAntallMedlemmer(fragments.stream()
-                                        .map(fragment -> fragment.getInformasjon().split("\\|")[2])
-                                        .map(oppslag::get)
-                                        .map(Math::toIntExact)
-                                        .reduce(0, Integer::sum))
-                                .build()))
-                .sort(Comparator.comparing(DashboardDollyTeamsDTO::getInterval).reversed());
+        var info = fragment.getInformasjon().split("\\|");
+        return new DashboardDollyTeamsDTO.Entry(info[0], info[1], toIntExact(oppslag.get(info[2])));
     }
 }

apps/dolly-backend/src/main/resources/application.yml

@@ -153,6 +153,6 @@ consumers:
   altinn3-tilgang-service:
     name: testnav-altinn3-tilgang-service-prod
     namespace: dolly
-    url: https://testnav-altinn3-tilgang-service.nav.no/
+    url: https://testnav-altinn3-tilgang-service.nav.no
     cluster: prod-gcp