Feature: Refactor status fields in Bestillinger and Dashboard components

Author: krharum

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

@@ -14,10 +14,9 @@
 public class DashboardDTO {
 
     private LocalDate dato;
-    private Long personer;
-    private Long nyePersoner;
-    private Long gjenopprettinger;
+    private Long personerTotalt;
+    private Long nye;
+    private Long gjenopprettede;
     private Long pdlFeil;
-    private Long aaregFeil;
-    private Long penFeil;
+    private Long annenFeil;
 }

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

@@ -17,6 +17,5 @@ public class BestillingerFragment {
     private Long personer;
     private String gjenopprettstatus;
     private String pdlstatus;
-    private String aaregstatus;
-    private String penstatus;
+    private String annenstatus;
 }

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

@@ -148,17 +148,21 @@ when lower(bp.pdl_forvalter_status) like '%feil%' then 'FEIL'
                       when lower(bp.pdl_ordre_status) like '%feil%' then 'FEIL'
                       else 'OK'
                    end as pdlStatus,
-                   case
-                      when lower(bp.aareg_status) like '%feil%' then 'FEIL'
-                      else 'OK'
-                   end as aaregStatus,
                    case
                       when lower(bp.pensjonforvalter_status) like '%feil%' then 'FEIL'
+                      when lower(bp.aareg_status) like '%feil%' then 'FEIL'
+                      when lower(bp.arenaforvalter_status) like '%feil%' then 'FEIL'
+                      when lower(bp.instdata_status) like '%feil%' then 'FEIL'
+                      when lower(bp.inntektsstub_status) like '%feil%' then 'FEIL'
+                      when lower(bp.inntektsmelding_status) like '%feil%' then 'FEIL'
+                      when lower(bp.sigrunstub_status) like '%feil%' then 'FEIL'
+                      when lower(bp.dokarkiv_status) like '%feil%' then 'FEIL'
+                      when lower(bp.feil) like '%feil%' then 'FEIL'
                       else 'OK'
-                   end as penStatus
+                   end as annenStatus
             from bestilling b
             join bestilling_progress bp on b.id = bp.bestilling_id
-            group by dato, gjenopprettStatus, pdlStatus, aaregStatus, penStatus
+            group by dato, gjenopprettStatus, pdlStatus, annenStatus
             order by dato desc
             """)
     Flux<BestillingerFragment> findBestillingerOrderBySistOppdatert();

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

@@ -27,14 +27,14 @@ public Flux<DashboardDTO> getBestillingStatus() {
                                 .dato(fragmentliste.stream()
                                         .map(BestillingerFragment::getDato)
                                         .findAny().orElse(null))
-                                .personer(fragmentliste.stream()
+                                .personerTotalt(fragmentliste.stream()
                                         .map(BestillingerFragment::getPersoner)
                                         .reduce(0L, Long::sum))
-                                .nyePersoner(fragmentliste.stream()
+                                .nye(fragmentliste.stream()
                                         .filter(fragment -> "NYBESTILLING".equals(fragment.getGjenopprettstatus()))
                                         .map(BestillingerFragment::getPersoner)
                                         .reduce(0L, Long::sum))
-                                .gjenopprettinger(fragmentliste.stream()
+                                .gjenopprettede(fragmentliste.stream()
                                         .filter(fragment -> "GJENOPPRETTING".equals(fragment.getGjenopprettstatus()))
                                         .map(BestillingerFragment::getPersoner)
                                         .reduce(0L, Long::sum))
@@ -43,14 +43,9 @@ public Flux<DashboardDTO> getBestillingStatus() {
                                                 "FEIL".equals(fragment.getPdlstatus()))
                                         .map(BestillingerFragment::getPersoner)
                                         .reduce(0L, Long::sum))
-                                .aaregFeil(fragmentliste.stream()
+                                .annenFeil(fragmentliste.stream()
                                         .filter(fragment ->
-                                                "FEIL".equals(fragment.getAaregstatus()))
-                                        .map(BestillingerFragment::getPersoner)
-                                        .reduce(0L, Long::sum))
-                                .penFeil(fragmentliste.stream()
-                                        .filter(fragment ->
-                                                "FEIL".equals(fragment.getPenstatus()))
+                                                "FEIL".equals(fragment.getAnnenstatus()))
                                         .map(BestillingerFragment::getPersoner)
                                         .reduce(0L, Long::sum))
                                 .build())