feature: Update Dashboard data model to use string interval for date representation

#deploy-test-dolly-backend #deploy-dolly-backend

Author: krharum

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

@@ -5,7 +5,6 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.LocalDate;
 import java.util.List;
 
 @Data
@@ -14,7 +13,7 @@
 @AllArgsConstructor
 public class DashboardTeamsDTO {
 
-    private LocalDate dato;
+    private String interval;
     private List<Entry> teams;
 
     @Data

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

@@ -5,15 +5,13 @@
 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 interval;
     private String epost;
 }

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

@@ -170,12 +170,13 @@ when lower(bp.feil) like '%feil%' then 'FEIL'
 
 
     @Query("""
-            select count(*) antall, b.sist_oppdatert::date dato, br.epost from bestilling b
+            select count(*) antall, to_char(b.sist_oppdatert, 'YYYY-MM') interval, br.epost
+            from bestilling b
             join bruker br on br.id = b.bruker_id
             and br.brukertype = 'AZURE'
             and br.epost is not null
-            group by dato, br.epost
-            order by dato desc;
+            group by interval, br.epost
+            order by interval desc;
             """)
     Flux<TeamFragment> findBestillingerForTeamsOrderBySistOppdatert();
 }

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

@@ -66,18 +66,18 @@ public Flux<DashboardTeamsDTO> getTeamsStatus() {
                 .flatMap(teamkatalogConsumer::getTeamForEpost, 5)
                 .collect(Collectors.toMap(TeamkatalogDTO::getEmail, TeamkatalogDTO::getTeamNavn))
                 .flatMapMany(teams -> bestillingRepository.findBestillingerForTeamsOrderBySistOppdatert()
-                        .groupBy(TeamFragment::getDato)
+                        .groupBy(TeamFragment::getInterval)
                         .flatMap(Flux::collectList)
                         .flatMap(fragments -> Mono.just(
-                                Tuples.of(groupFragmentsByTeam(fragments, teams), fragments.getFirst().getDato()))))
+                                Tuples.of(groupFragmentsByTeam(fragments, teams), fragments.getFirst().getInterval()))))
                 .map(tuple ->
                         DashboardTeamsDTO.builder()
-                                .dato(tuple.getT2())
+                                .interval(tuple.getT2())
                                 .teams(tuple.getT1().entrySet().stream()
                                         .map(entry -> new DashboardTeamsDTO.Entry(entry.getKey(), entry.getValue().size()))
                                         .toList())
                                 .build())
-                .sort(Comparator.comparing(DashboardTeamsDTO::getDato).reversed());
+                .sort(Comparator.comparing(DashboardTeamsDTO::getInterval).reversed());
     }
 
     private static long sumByStatus(List<BestillingerFragment> fragments,
@@ -97,7 +97,7 @@ private static Map<String, Set<String>> groupFragmentsByTeam(List<TeamFragment>
         fragments.forEach(fragment -> {
             var teamNames = teams.getOrDefault(fragment.getEpost(), List.of(INGEN_TEAM));
             teamNames.forEach(team ->
-                    grouped.computeIfAbsent(team, k -> new HashSet<>()).add(fragment.getEpost()));
+                    grouped.computeIfAbsent(team, _ -> new HashSet<>()).add(fragment.getEpost()));
         });
         return grouped;
     }