feature: Refactor logging and error handling in various services for improved clarity and consistency #deploy-test-dolly-backend

Author: krharum

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/InstdataClient.java

@@ -100,9 +100,9 @@ private Mono<BestillingProgress> oppdaterStatus(BestillingProgress progress, Str
     public void release(List<String> identer) {
 
         instdataConsumer.deleteInstdata(identer)
-                .subscribe(response -> log.info("Slettet identer fra Instdata (inst 2)"));
+                .subscribe(_ -> log.info("Slettet identer fra Instdata (inst 2)"));
         instdataConsumer.deleteInstKdiData(identer)
-                .subscribe(response -> log.info("Slettet identer fra Institusjonsopphold fengsel (KDI)"));
+                .subscribe(_ -> log.info("Slettet identer fra Institusjonsopphold fengsel (KDI)"));
     }
 
     private Mono<List<Instdata>> filterInstdata(List<Instdata> instdataRequest, String miljoe) {
@@ -149,8 +149,8 @@ private Mono<String> postInstdataKdi(InstdataKdiDTO instdata, String ident) {
                 .map(response -> String.format("%s:%s".formatted(
                         instdata.getEnvironment(),
                         response.getStatus().is2xxSuccessful() ? "OK" :
-                                errorStatusDecoder.getErrorText(response.getStatus(),
-                                        response.getFeilmelding()))));
+                                ErrorStatusDecoder.encodeStatus(errorStatusDecoder.getErrorText(response.getStatus(),
+                                        response.getFeilmelding())))));
 
     }
 }

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/instdata/domain/InstdataKdiDTO.java

@@ -109,7 +109,7 @@ public static class ForventetLoeslatelse extends Hendelse{
     @AllArgsConstructor
     public static class Annullering extends Hendelse {
 
-        private LocalDateTime annullertMeldingId;
+        private String annullertMeldingId;
     }
 
     @lombok.Data

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/personservice/PersonServiceConsumer.java

@@ -46,8 +46,6 @@ public PersonServiceConsumer(
 
         this.tokenService = tokenService;
         serverProperties = consumers.getTestnavPersonService();
-        log.info("PersonServiceConsumer: Initialiserer med JsonMapper type: {}", 
-                jsonMapper != null ? jsonMapper.getClass().getName() : "null");
         this.webClient = webClient
                 .mutate()
                 .baseUrl(serverProperties.getUrl())
@@ -106,11 +104,11 @@ public Flux<PdlPersonBolk> getPdlPersoner(List<String> identer, AtomicInteger re
                                 .anyMatch(data -> isNull(data.getPerson())))) {
 
                         return Flux.just(true)
-                                .doOnNext(melding ->
+                                .doOnNext(_ ->
                                         log.info("PDL har tomt resultat for {}, retry #{}", String.join(", ", identer),
                                                 retry.incrementAndGet()))
                                 .delayElements(Duration.ofMillis(200))
-                                .flatMap(delay -> getPdlPersoner(identer, new AtomicInteger(retry.get())));
+                                .flatMap(_ -> getPdlPersoner(identer, new AtomicInteger(retry.get())));
                     } else {
                         return Flux.just(resultat);
                     }

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

@@ -51,6 +51,7 @@
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
 import static no.nav.dolly.domain.jpa.Testident.Master.PDL;
+import static no.nav.dolly.domain.jpa.Testident.Master.PDLF;
 import static org.apache.logging.log4j.util.Strings.isBlank;
 import static org.apache.logging.log4j.util.Strings.isNotBlank;
 
@@ -156,7 +157,7 @@ private Mono<BestillingProgress> endrePerson(Supplier<Mono<PdlResponse>> operasj
 
         return transactionHelperService.persister(bestillingProgress, BestillingProgress::setPdlForvalterStatus,
                         bestillingProgress.getPdlForvalterStatus())
-                .flatMap(progress1 -> operasjon.get())
+                .flatMap(_ -> operasjon.get())
                 .map(response -> {
 
                     String status;
@@ -236,7 +237,7 @@ protected Mono<DollyPerson> opprettDollyPerson(BestillingProgress progress, Bruk
                         .master(progress.getMaster())
                         .tags(Stream.concat(testgruppe.getTags().stream(),
                                         Stream.of(Tags.DOLLY)
-                                                .filter(tag -> progress.getMaster() == PDL))
+                                                .filter(_ -> progress.getMaster() == PDL))
                                 .toList())
                         .bruker(bruker)
                         .build()));
@@ -273,9 +274,9 @@ protected Mono<Void> saveBestillingToElasticServer(RsDollyBestilling bestillingR
         }
     }
 
-    protected Mono<BestillingProgress> opprettProgress(Bestilling bestilling, Testident.Master master) {
+    protected Mono<BestillingProgress> opprettPDLFProgress(Bestilling bestilling) {
 
-        return opprettProgress(bestilling, master, null);
+        return opprettProgress(bestilling, PDLF, null);
     }
 
     protected Mono<BestillingProgress> opprettProgress(Bestilling bestilling, Testident.Master master, String ident) {
@@ -292,7 +293,7 @@ protected Mono<BestillingProgress> opprettPerson(OriginatorUtility.Originator or
 
         bestillingProgress.setPdlForvalterStatus("Info: Oppretting av person startet ...");
         return endrePerson(() -> pdlDataConsumer.opprettPdl(originator.getPdlBestilling()), bestillingProgress)
-                .doOnNext(response -> log.info("Opprettet person med ident ... {}", originator.getPdlBestilling()));
+                .doOnNext(response -> log.info("Opprettet person med ident ... {}", response.getIdent()));
     }
 
     protected Mono<BestillingProgress> oppdaterPerson(OriginatorUtility.Originator originator, BestillingProgress progress) {

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

@@ -27,7 +27,6 @@
 
 import java.util.List;
 
-import static no.nav.dolly.domain.jpa.Testident.Master.PDLF;
 import static org.apache.commons.lang3.StringUtils.isBlank;
 
 @Slf4j
@@ -101,7 +100,7 @@ private Flux<BestillingProgress> opprettPerson(Bestilling bestilling,
 
         return Flux.from(bestillingService.isStoppet(bestilling.getId()))
                 .takeWhile(BooleanUtils::isFalse)
-                .concatMap(ok -> opprettProgress(bestilling, PDLF))
+                .concatMap(ok -> opprettPDLFProgress(bestilling))
                 .concatMap(progress -> opprettPerson(originator, progress))
                 .concatMap(this::sendOrdrePerson)
                 .filter(BestillingProgress::isIdentGyldig)

apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/SystemTyper.java

@@ -23,7 +23,7 @@ public enum SystemTyper {
     HISTARK("Saksmappearkiv (HISTARK)"),
     INNTK("Inntektstub (INNTK)"),
     INNTKMELD("Inntektsmelding (ALTINN/JOARK)"),
-    INST2("Institusjonsopphold (Inst2)"),
+    INST2("Institusjonsopphold (INST2)"),
     INST_KDI("Institusjonsopphold fengsel (KDI)"),
     KELVIN_AAP("Kelvin AAP-ytelse"),
     KONTOREGISTER("Bankkontoregister"),

apps/dolly-backend/src/main/java/no/nav/dolly/errorhandling/ErrorStatusDecoder.java

@@ -129,6 +129,7 @@ public static String encodeStatus(String toBeEncoded) {
                         .replace(':', '=')
                         .replace("\"", "")
                         .replace("$", "§")
+                        .replace("%", "")
                         .replace("\n", ""): "";
     }
 }