Multiple transaksjonsmappinger, rettet feil #deploy-test-dolly-backend

navikt · Sep 27, 2023 · e8d2c37 · e8d2c37
1 parent b712b13
commit e8d2c37
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 15 deletions.
diff --git a/...ackend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterClient.java b/...ackend/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/PensjonforvalterClient.java
@@ -309,7 +309,7 @@ private Flux<PensjonforvalterResponse> lagreAlderspensjon(PensjonData pensjonDat
                 .flatMap(alderspensjon -> Flux.fromIterable(miljoer)
                         .flatMap(miljoe -> {
 
-                            if (isOpprettEndre || !transaksjonMappingService.existAlready(PEN_AP, ident, miljoe, null)) {
+                            if (isOpprettEndre || !transaksjonMappingService.existAlready(PEN_AP, ident, miljoe, bestillingId)) {
 
                                 if (isTpsSyncEnv.contains(miljoe)) {
 
@@ -350,7 +350,7 @@ private Flux<PensjonforvalterResponse> lagreUforetrygd(PensjonData pensjondata,
                 .flatMap(uforetrygd -> Flux.fromIterable(miljoer)
                         .flatMap(miljoe -> {
 
-                            if (isOpprettEndre || !transaksjonMappingService.existAlready(PEN_UT, ident, miljoe, null)) {
+                            if (isOpprettEndre || !transaksjonMappingService.existAlready(PEN_UT, ident, miljoe, bestillingId)) {
 
                                 if (isTpsSyncEnv.contains(miljoe)) {
 

diff --git a/...nd/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/command/HentSamboerCommand.java b/...nd/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/command/HentSamboerCommand.java
@@ -7,9 +7,7 @@
 import no.nav.dolly.util.WebClientFilter;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
-import reactor.util.retry.Retry;
 
-import java.time.Duration;
 import java.util.Arrays;
 import java.util.concurrent.Callable;
 
@@ -42,8 +40,6 @@ public Mono<PensjonSamboerResponse> call() {
                 .retrieve()
                 .bodyToMono(PensjonSamboerResponse.class)
                 .doOnError(WebClientFilter::logErrorMessage)
-                .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
-                        .filter(WebClientFilter::is5xxException))
                 .onErrorResume(error -> Mono.just(pensjonforvalterResponseFromError(miljoe, error)));
     }
 

diff --git a/...d/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/command/LagreSamboerCommand.java b/...d/src/main/java/no/nav/dolly/bestilling/pensjonforvalter/command/LagreSamboerCommand.java
@@ -8,9 +8,7 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.web.reactive.function.client.WebClient;
 import reactor.core.publisher.Mono;
-import reactor.util.retry.Retry;
 
-import java.time.Duration;
 import java.util.Arrays;
 import java.util.concurrent.Callable;
 
@@ -44,8 +42,6 @@ public Mono<PensjonforvalterResponse> call() {
                 .toBodilessEntity()
                 .map(response -> pensjonforvalterResponse(miljoe, HttpStatus.valueOf(response.getStatusCode().value())))
                 .doOnError(WebClientFilter::logErrorMessage)
-                .retryWhen(Retry.backoff(3, Duration.ofSeconds(5))
-                        .filter(WebClientFilter::is5xxException))
                 .onErrorResume(error -> Mono.just(pensjonforvalterResponseFromError(miljoe, error)));
     }
 

diff --git a/...src/main/java/no/nav/dolly/bestilling/pensjonforvalter/domain/PensjonSamboerResponse.java b/...src/main/java/no/nav/dolly/bestilling/pensjonforvalter/domain/PensjonSamboerResponse.java
@@ -5,6 +5,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import lombok.ToString;
 import lombok.experimental.SuperBuilder;
 
 import java.time.LocalDate;
@@ -15,6 +16,7 @@
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor

diff --git a/...c/main/java/no/nav/dolly/bestilling/pensjonforvalter/domain/PensjonforvalterResponse.java b/...c/main/java/no/nav/dolly/bestilling/pensjonforvalter/domain/PensjonforvalterResponse.java
@@ -48,7 +48,7 @@ public static class Response {
         private String path;
 
         public boolean isResponse2xx() {
-            return httpStatus.getStatus()>= 200 && httpStatus.getStatus() < 300;
+            return httpStatus.getStatus() >= 200 && httpStatus.getStatus() < 300;
         }
     }
 

diff --git a/...y-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettBestillingService.java b/...y-backend/src/main/java/no/nav/dolly/bestilling/service/GjenopprettBestillingService.java
@@ -74,7 +74,6 @@ public void executeAsync(Bestilling bestilling) {
         var bestKriterier = getDollyBestillingRequest(bestilling);
         if (nonNull(bestKriterier)) {
             bestKriterier.setEkskluderEksternePersoner(true);
-            bestKriterier.setId(bestilling.getOpprettetFraId());
 
             var gamleProgresser = bestillingProgressService.fetchBestillingProgressByBestillingId(bestilling.getOpprettetFraId());
 

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OppdaterPersonService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/service/OppdaterPersonService.java
@@ -74,6 +74,7 @@ public void oppdaterPersonAsync(RsDollyUpdateRequest request, Bestilling bestill
 
         log.info("Bestilling med id=#{} med type={} er startet ...", bestilling.getId(), getBestillingType(bestilling));
         MDC.put(MDC_KEY_BESTILLING, bestilling.getId().toString());
+        request.setId(bestilling.getId());
 
         var testident = identService.getTestIdent(bestilling.getIdent());
         Flux.just(OriginatorUtility.prepOriginator(request, testident, mapperFacade))

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/RsDollyBestilling.java b/apps/dolly-backend/src/main/java/no/nav/dolly/domain/resultset/RsDollyBestilling.java
@@ -45,7 +45,7 @@
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class RsDollyBestilling {
 
-    private static final Set<String> EXCLUDE_METHODS = Set.of("getClass", "getMalBestillingNavn", "getEnvironments", "getPdldata");
+    private static final Set<String> EXCLUDE_METHODS = Set.of("getClass", "getMalBestillingNavn", "getEnvironments", "getPdldata", "getId");
 
     @JsonIgnore
     private long id; // Ved gjenopprett vil denne ID kan ha verdi fra bestillingen som gjenopprettes

diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/repository/IdentRepository.java b/apps/dolly-backend/src/main/java/no/nav/dolly/repository/IdentRepository.java
@@ -37,13 +37,13 @@ public interface IdentRepository extends JpaRepository<Testident, Long> {
     @Query(value = "update Testident ti set ti.ident = :newIdent where ti.ident = :oldIdent")
     int swapIdent(@Param(value = "oldIdent") String oldIdent, @Param(value = "newIdent") String newIdent);
 
-    @Query(value = "select bp.ident as ident, b.id as bestillingid, " +
+    @Query(value = "select bp.ident as ident, b.id as bestillingId, " +
             "b.bestKriterier as bestkriterier, b.miljoer as miljoer from Bestilling b " +
             "join BestillingProgress bp on bp.bestilling.id = b.id " +
             "and b.gruppe = :gruppe ")
     List<GruppeBestillingIdent> getBestillingerFromGruppe(@Param(value = "gruppe") Testgruppe testgruppe);
 
-    @Query(value = "select bp.ident as ident, b.id as bestillingid, " +
+    @Query(value = "select bp.ident as ident, b.id as bestillingId, " +
             "b.bestKriterier as bestkriterier, b.miljoer as miljoer from Bestilling b " +
             "join BestillingProgress bp on bp.bestilling.id = b.id " +
             "and bp.ident = :ident")