feature: Refactor dashboard components to include team statistics and update data models

Author: krharum

…o/nav/dolly/domain/dto/DashboardDTO.java …lly/domain/dto/DashboardPersonerDTO.javaapps/dolly-backend/src/main/java/no/nav/dolly/domain/dto/DashboardDTO.java renamed to apps/dolly-backend/src/main/java/no/nav/dolly/domain/dto/DashboardPersonerDTO.java apps/dolly-backend/src/main/java/no/nav/dolly/domain/dto/DashboardDTO.java renamed to apps/dolly-backend/src/main/java/no/nav/dolly/domain/dto/DashboardPersonerDTO.java

@@ -11,12 +11,12 @@
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class DashboardDTO {
+public class DashboardPersonerDTO {
 
     private LocalDate dato;
     private Long personerTotalt;
     private Long nye;
     private Long gjenopprettede;
     private Long pdlFeil;
-    private Long annenFeil;
+    private Long andreFeil;
 }

apps/dolly-backend/src/main/java/no/nav/dolly/domain/dto/DashboardTeamsDTO.java

@@ -0,0 +1,29 @@
+package no.nav.dolly.domain.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class DashboardTeamsDTO {
+
+    private LocalDate dato;
+    private List<Entry> entries;
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    public static class Entry {
+
+        private String epost;
+        private Long antall;
+    }
+}

apps/dolly-backend/src/main/java/no/nav/dolly/domain/projection/TeamFragment.java

@@ -0,0 +1,19 @@
+package no.nav.dolly.domain.projection;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class TeamFragment {
+
+    private Long antall;
+    private LocalDate dato;
+    private String epost;
+}

apps/dolly-backend/src/main/java/no/nav/dolly/provider/DashboardController.java

@@ -1,7 +1,8 @@
 package no.nav.dolly.provider;
 
 import lombok.RequiredArgsConstructor;
-import no.nav.dolly.domain.dto.DashboardDTO;
+import no.nav.dolly.domain.dto.DashboardPersonerDTO;
+import no.nav.dolly.domain.dto.DashboardTeamsDTO;
 import no.nav.dolly.service.DashboardService;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -16,9 +17,15 @@ public class DashboardController {
 
     private final DashboardService dashboardService;
 
-    @GetMapping(value = "/bestillinger", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
-    public Flux<DashboardDTO> getDashboard() {
+    @GetMapping(value = "/personer", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public Flux<DashboardPersonerDTO> getDashboard() {
 
-        return dashboardService.getBestillingStatus();
+        return dashboardService.getPersonerStatus();
+    }
+
+    @GetMapping(value = "/teams", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
+    public Flux<DashboardTeamsDTO> getDashboardTeams() {
+
+        return dashboardService.getTeamsStatus();
     }
 }

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

@@ -3,6 +3,7 @@
 import no.nav.dolly.domain.jpa.Bestilling;
 import no.nav.dolly.domain.projection.BestillingerFragment;
 import no.nav.dolly.domain.projection.RsBestillingFragment;
+import no.nav.dolly.domain.projection.TeamFragment;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.r2dbc.repository.Modifying;
 import org.springframework.data.r2dbc.repository.Query;
@@ -166,4 +167,13 @@ when lower(bp.feil) like '%feil%' then 'FEIL'
             order by dato desc
             """)
     Flux<BestillingerFragment> findBestillingerOrderBySistOppdatert();
+
+
+    @Query("""
+            select count(*) antall, b.sist_oppdatert::date dato, br.epost from bestilling b
+            join bruker br on br.id = b.bruker_id
+            group by dato, br.epost
+            order by dato desc;
+            """)
+    Flux<TeamFragment> findBestillingerForTeamsOrderBySistOppdatert();
 }

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

@@ -2,28 +2,32 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import no.nav.dolly.domain.dto.DashboardDTO;
+import no.nav.dolly.domain.dto.DashboardPersonerDTO;
+import no.nav.dolly.domain.dto.DashboardTeamsDTO;
 import no.nav.dolly.domain.projection.BestillingerFragment;
+import no.nav.dolly.domain.projection.TeamFragment;
 import no.nav.dolly.repository.BestillingRepository;
 import org.springframework.stereotype.Service;
 import reactor.core.publisher.Flux;
 
 import java.util.Comparator;
 
+import static org.apache.commons.lang3.StringUtils.isNotBlank;
+
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class DashboardService {
 
     private final BestillingRepository bestillingRepository;
 
-    public Flux<DashboardDTO> getBestillingStatus() {
+    public Flux<DashboardPersonerDTO> getPersonerStatus() {
 
         return bestillingRepository.findBestillingerOrderBySistOppdatert()
                 .groupBy(BestillingerFragment::getDato)
                 .flatMap(Flux::collectList)
                 .map(fragmentliste ->
-                        DashboardDTO.builder()
+                        DashboardPersonerDTO.builder()
                                 .dato(fragmentliste.stream()
                                         .map(BestillingerFragment::getDato)
                                         .findAny().orElse(null))
@@ -43,12 +47,33 @@ public Flux<DashboardDTO> getBestillingStatus() {
                                                 "FEIL".equals(fragment.getPdlstatus()))
                                         .map(BestillingerFragment::getPersoner)
                                         .reduce(0L, Long::sum))
-                                .annenFeil(fragmentliste.stream()
+                                .andreFeil(fragmentliste.stream()
                                         .filter(fragment ->
                                                 "FEIL".equals(fragment.getAnnenstatus()))
                                         .map(BestillingerFragment::getPersoner)
                                         .reduce(0L, Long::sum))
                                 .build())
-                .sort(Comparator.comparing(DashboardDTO::getDato).reversed());
+                .sort(Comparator.comparing(DashboardPersonerDTO::getDato).reversed());
+    }
+
+
+    public Flux<DashboardTeamsDTO> getTeamsStatus() {
+
+        return bestillingRepository.findBestillingerForTeamsOrderBySistOppdatert()
+                .groupBy(TeamFragment::getDato)
+                .flatMap(Flux::collectList)
+                .map(fragmentliste ->
+                        DashboardTeamsDTO.builder()
+                                .dato(fragmentliste.stream()
+                                        .map(TeamFragment::getDato)
+                                        .findAny().orElse(null))
+                                .entries(fragmentliste.stream()
+                                        .filter(fragment -> isNotBlank(fragment.getEpost()))
+                                        .map(fragment -> new DashboardTeamsDTO.Entry(
+                                                fragment.getEpost(),
+                                                fragment.getAntall()))
+                                        .toList())
+                                .build())
+                .sort(Comparator.comparing(DashboardTeamsDTO::getDato).reversed());
     }
 }