Oppdatering etter review fra Copilot

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

Author: krharum

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

@@ -54,13 +54,13 @@ where bp.bestilling_id in (select b.id
     Mono<BestillingProgress> findByIdAndLock(@Param("id") Long id);
 
     @Query("""
-           SELECT DISTINCT column_name
-           FROM information_schema.columns
-           WHERE table_name = 'bestilling_progress'
-           AND column_name LIKE '%status%'
-           AND column_name NOT LIKE 'tps_messaging_status'
-           OR column_name = 'feil'
-           ORDER BY column_name;
-           """)
+            SELECT DISTINCT column_name
+            FROM information_schema.columns
+            WHERE table_name = 'bestilling_progress'
+            AND column_name NOT LIKE 'tps_messaging_status'
+            AND (column_name LIKE '%status%'
+            OR column_name = 'feil')
+            ORDER BY column_name;
+            """)
     Flux<String> findStatusColumns();
 }

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

@@ -199,7 +199,6 @@ public Flux<JsonNode> getFeilstatusDetaljert(int year, Month month, int day) {
                         .map((row, metadata) -> entityTemplate.getConverter()
                                 .read(BestillingProgressDTO.class, row, metadata))
                         .all())
-                .sort(Comparator.comparing(BestillingProgressDTO::getSistOppdatert))
                 .flatMap(this::tilFeilJson);
     }
 
@@ -291,7 +290,8 @@ private Mono<String> buildFeilWhereFragment() {
         return bestillingProgressRepository.findStatusColumns()
                 .reduce(new StringJoiner(" or "), (joiner, column) ->
                         joiner.add("lower(bp." + column + ") like '%feil%'"))
-                .map(StringJoiner::toString);
+                .map(StringJoiner::toString)
+                .map(s -> s.isBlank() ? "false" : s);
     }
 
     private Mono<JsonNode> tilFeilstatusSummert(List<BestillingProgressDTO> bestillingProgressDTOS) {
@@ -300,16 +300,16 @@ private Mono<JsonNode> tilFeilstatusSummert(List<BestillingProgressDTO> bestilli
         bestillingProgressDTOS.forEach(progress -> {
             var kilde = (ObjectNode) jsonMapper.valueToTree(progress);
 
-            for (var navn : kilde.propertyNames()) {
+            kilde.propertyNames().forEach(navn -> {
                 var verdi = kilde.get(navn);
                 if (!IDENTITETSFELT.contains(navn)) {
                     if ("bestillingDato".equals(navn)) {
                         resultat.putIfAbsent(navn, verdi);
                     } else if (verdi.isString() && verdi.asString().toLowerCase().contains("feil")) {
-                        resultat.merge(navn, 1, (existing, _) -> (Integer) existing + 1);
+                        resultat.merge(navn, 1, (existing, one) -> (Integer) existing + (Integer) one);
                     }
                 }
-            }
+            });
         });
         var summert = resultat.entrySet().stream()
                 .collect(Collectors.toMap(entry -> {
@@ -331,14 +331,14 @@ private Mono<JsonNode> tilFeilJson(BestillingProgressDTO progress) {
         var kilde = (ObjectNode) jsonMapper.valueToTree(progress);
         var resultat = jsonMapper.createObjectNode();
 
-        for (var navn : kilde.propertyNames()) {
+        kilde.propertyNames().forEach(navn -> {
             var verdi = kilde.get(navn);
             if (IDENTITETSFELT.contains(navn)) {
                 resultat.set(navn, verdi);
             } else if (verdi.isString() && verdi.asString().toLowerCase().contains("feil")) {
                 resultat.set(navn, tilJsonEllerTekst(verdi, navn));
             }
-        }
+        });
         return Mono.just(resultat);
     }