feature: Add DollyTeams status retrieval in DashboardService and create corresponding DTOs for enhanced dashboard functionality #deploy-test-dolly-backend #deploy-dolly-backend

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 informasjon
+                   t.navn || '|' || t.beskrivelse 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

@@ -176,7 +176,7 @@ public Flux<DashboardDollyTeamsDTO> getDollyTeamsStatus() {
                         .interval(fragments.getFirst().getInterval())
                         .teams(fragments.stream()
                                 .map(fragment -> {
-                                    var info = fragment.getInformasjon().split(",", 2);
+                                    var info = fragment.getInformasjon().split("\\|", 2);
                                     return new DashboardDollyTeamsDTO.Entry(info[0], info[1], toIntExact(fragment.getAntall()));
                                 })
                                 .sorted(Comparator.comparing(DashboardDollyTeamsDTO.Entry::getNavn))

apps/dolly-backend/src/test/java/no/nav/dolly/service/DashboardServiceTest.java

@@ -6,10 +6,12 @@
 import no.nav.dolly.consumer.brukerservice.dto.BrukerDTO;
 import no.nav.dolly.consumer.teamkatalog.TeamkatalogConsumer;
 import no.nav.dolly.consumer.teamkatalog.dto.TeamkatalogDTO;
+import no.nav.dolly.domain.dto.DashboardDollyTeamsDTO;
 import no.nav.dolly.domain.dto.DashboardOrganisasjonerDTO;
 import no.nav.dolly.domain.dto.DashboardTeamsDTO;
 import no.nav.dolly.domain.jpa.Bruker;
 import no.nav.dolly.domain.projection.BestillingerFragment;
+import no.nav.dolly.domain.projection.DollyTeamFragment;
 import no.nav.dolly.domain.projection.OrganisasjonFragment;
 import no.nav.dolly.domain.projection.TeamFragment;
 import no.nav.dolly.repository.BestillingRepository;
@@ -418,6 +420,92 @@ void shouldSortOrganisasjonerByNavnAlphabetically() {
                 .verifyComplete();
     }
 
+    // ── getDollyTeamsStatus ──────────────────────────────────────────────────
+
+    @Test
+    void shouldReturnEmptyDollyTeamsWhenNoFragments() {
+        when(bestillingRepository.findBestillingerForDollyTeamsOrderBySistOppdatert()).thenReturn(Flux.empty());
+
+        StepVerifier.create(dashboardService.getDollyTeamsStatus())
+                .verifyComplete();
+    }
+
+    @Test
+    void shouldParseDollyTeamInformasjonIntoNavnAndBeskrivelse() {
+        when(bestillingRepository.findBestillingerForDollyTeamsOrderBySistOppdatert())
+                .thenReturn(Flux.just(dollyTeamFragment(INTERVAL_1, "Team A", "En beskrivelse", 3L)));
+
+        StepVerifier.create(dashboardService.getDollyTeamsStatus())
+                .assertNext(dto -> {
+                    assertThat(dto.getTeams()).hasSize(1);
+                    var entry = dto.getTeams().getFirst();
+                    assertThat(entry.getNavn()).isEqualTo("Team A");
+                    assertThat(entry.getBeskrivelse()).isEqualTo("En beskrivelse");
+                    assertThat(entry.getUnikeBrukere()).isEqualTo(3);
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    void shouldSumTotaltUnikeBrukereAcrossTeams() {
+        when(bestillingRepository.findBestillingerForDollyTeamsOrderBySistOppdatert())
+                .thenReturn(Flux.just(
+                        dollyTeamFragment(INTERVAL_1, "Team A", "Beskrivelse A", 4L),
+                        dollyTeamFragment(INTERVAL_1, "Team B", "Beskrivelse B", 6L)
+                ));
+
+        StepVerifier.create(dashboardService.getDollyTeamsStatus())
+                .assertNext(dto -> {
+                    assertThat(dto.getTotaltAntallTeams()).isEqualTo(2);
+                    assertThat(dto.getTotaltUnikeBrukere()).isEqualTo(10);
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    void shouldSortDollyTeamsByNavnAlphabetically() {
+        when(bestillingRepository.findBestillingerForDollyTeamsOrderBySistOppdatert())
+                .thenReturn(Flux.just(
+                        dollyTeamFragment(INTERVAL_1, "Zebra", "Z", 1L),
+                        dollyTeamFragment(INTERVAL_1, "Alpha", "A", 1L)
+                ));
+
+        StepVerifier.create(dashboardService.getDollyTeamsStatus())
+                .assertNext(dto -> {
+                    var names = dto.getTeams().stream().map(DashboardDollyTeamsDTO.Entry::getNavn).toList();
+                    assertThat(names).containsExactly("Alpha", "Zebra");
+                })
+                .verifyComplete();
+    }
+
+    @Test
+    void shouldGroupDollyTeamFragmentsByIntervalIntoSeparateDtos() {
+        when(bestillingRepository.findBestillingerForDollyTeamsOrderBySistOppdatert())
+                .thenReturn(Flux.just(
+                        dollyTeamFragment(INTERVAL_1, "Team A", "A", 1L),
+                        dollyTeamFragment(INTERVAL_2, "Team B", "B", 1L)
+                ));
+
+        StepVerifier.create(dashboardService.getDollyTeamsStatus())
+                .assertNext(dto -> assertThat(dto.getInterval()).isEqualTo(INTERVAL_2))
+                .assertNext(dto -> assertThat(dto.getInterval()).isEqualTo(INTERVAL_1))
+                .verifyComplete();
+    }
+
+    @Test
+    void shouldSortDollyTeamsStatusByIntervalDescending() {
+        when(bestillingRepository.findBestillingerForDollyTeamsOrderBySistOppdatert())
+                .thenReturn(Flux.just(
+                        dollyTeamFragment(INTERVAL_1, "Team A", "A", 1L),
+                        dollyTeamFragment(INTERVAL_2, "Team B", "B", 1L)
+                ));
+
+        var results = dashboardService.getDollyTeamsStatus().collectList().block();
+        assertThat(results).isNotNull();
+        assertThat(results.get(0).getInterval()).isEqualTo(INTERVAL_2);
+        assertThat(results.get(1).getInterval()).isEqualTo(INTERVAL_1);
+    }
+
     // ── helpers ──────────────────────────────────────────────────────────────
 
     private static BestillingerFragment fragment(LocalDate dato, Long personer,
@@ -446,4 +534,12 @@ private static OrganisasjonFragment organisasjonFragment(String interval, String
                 .brukerid(brukerid)
                 .build();
     }
+
+    private static DollyTeamFragment dollyTeamFragment(String interval, String navn, String beskrivelse, long antall) {
+        return DollyTeamFragment.builder()
+                .interval(interval)
+                .informasjon(navn + "|" + beskrivelse)
+                .antall(antall)
+                .build();
+    }
 }