Merge pull request #3739 from navikt/feature/fjern-synt-sykemelding

Feature/fjern synt sykemelding

Author: betsytraran

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/SykemeldingClient.java

@@ -10,7 +10,6 @@
 import no.nav.dolly.bestilling.ClientRegister;
 import no.nav.dolly.bestilling.personservice.PersonServiceConsumer;
 import no.nav.dolly.bestilling.sykemelding.domain.DetaljertSykemeldingRequest;
-import no.nav.dolly.bestilling.sykemelding.domain.SyntSykemeldingRequest;
 import no.nav.dolly.bestilling.sykemelding.dto.SykemeldingResponse;
 import no.nav.dolly.config.ApplicationConfig;
 import no.nav.dolly.consumer.kodeverk.KodeverkConsumer;
@@ -48,7 +47,6 @@
 public class SykemeldingClient implements ClientRegister {
 
     private final SykemeldingConsumer sykemeldingConsumer;
-    private final SyntSykemeldingConsumer syntSykemeldingConsumer;
     private final ErrorStatusDecoder errorStatusDecoder;
     private final TransaksjonMappingService transaksjonMappingService;
     private final MapperFacade mapperFacade;
@@ -75,14 +73,12 @@ public Flux<ClientFuture> gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly
                         setProgress(progress, getGenereringStartet());
 
                         return getPerson(dollyPerson.getIdent())
-                                .flatMap(persondata -> Flux.concat(postSyntSykemelding(sykemelding, persondata),
-                                                postDetaljertSykemelding(sykemelding, persondata))
+                                .flatMap(persondata ->
+                                                postDetaljertSykemelding(sykemelding, persondata)
                                         .filter(Objects::nonNull)
                                         .doOnNext(status -> saveTransaksjonId(status, bestilling.getId()))
-                                        .map(this::getStatus)
-                                        .collect(Collectors.joining()))
-                                .timeout(Duration.ofSeconds(applicationConfig.getClientTimeout() *
-                                        (sykemelding.hasSyntSykemelding() ? 3 : 1)))
+                                        .map(this::getStatus))
+                                .timeout(Duration.ofSeconds(applicationConfig.getClientTimeout()))
                                 .onErrorResume(error -> Mono.just(encodeStatus(WebClientFilter.getMessage(error))))
                                 .collect(Collectors.joining())
                                 .map(status -> futurePersist(progress, status));
@@ -166,22 +162,6 @@ private Mono<SykemeldingResponse> postDetaljertSykemelding(RsSykemelding sykemel
                                 }));
     }
 
-    private Mono<SykemeldingResponse> postSyntSykemelding(RsSykemelding sykemelding, PdlPersonBolk.Data persondata) {
-
-        return Mono.just(sykemelding)
-                .filter(RsSykemelding::hasSyntSykemelding)
-                .map(RsSykemelding::getSyntSykemelding)
-                .flatMap(syntmelding -> {
-
-                    var context = new MappingContext.Factory().getContext();
-                    context.setProperty("persondata", persondata);
-                    var syntSykemeldingRequest =
-                            mapperFacade.map(syntmelding, SyntSykemeldingRequest.class, context);
-
-                    return syntSykemeldingConsumer.postSyntSykemelding(syntSykemeldingRequest);
-                });
-    }
-
     private void saveTransaksjonId(SykemeldingResponse sykemelding, Long bestillingId) {
 
         if (sykemelding.getStatus().is2xxSuccessful()) {

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/SyntSykemeldingConsumer.java

@@ -6,7 +6,6 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import no.nav.dolly.bestilling.sykemelding.domain.DetaljertSykemeldingRequest;
-import no.nav.dolly.bestilling.sykemelding.domain.SyntSykemeldingRequest;
 import org.springframework.http.HttpStatus;
 
 @Data
@@ -29,7 +28,6 @@ public class SykemeldingResponse {
     public static class SykemeldingRequest {
 
         private String sykemeldingId;
-        private SyntSykemeldingRequest syntSykemeldingRequest;
         private DetaljertSykemeldingRequest detaljertSykemeldingRequest;
     }
 }

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/command/SyntSykemeldingPostCommand.java

@@ -7,11 +7,9 @@
 import no.nav.dolly.bestilling.sykemelding.domain.DetaljertSykemeldingRequest.Adresse;
 import no.nav.dolly.bestilling.sykemelding.domain.DetaljertSykemeldingRequest.Organisasjon;
 import no.nav.dolly.bestilling.sykemelding.domain.DetaljertSykemeldingRequest.Pasient;
-import no.nav.dolly.bestilling.sykemelding.domain.SyntSykemeldingRequest;
 import no.nav.dolly.consumer.norg2.dto.Norg2EnhetResponse;
 import no.nav.dolly.domain.PdlPerson;
 import no.nav.dolly.domain.PdlPersonBolk;
-import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding;
 import no.nav.dolly.domain.resultset.sykemelding.RsSykemelding.RsDetaljertSykemelding;
 import no.nav.dolly.mapper.MappingStrategy;
 import no.nav.testnav.libs.data.pdlforvalter.v1.BostedadresseDTO;
@@ -24,40 +22,13 @@
 
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
-import static org.apache.commons.lang3.StringUtils.isBlank;
-import static org.apache.commons.lang3.StringUtils.isNotBlank;
 
 @Component
 public class SykemeldingMappingStrategy implements MappingStrategy {
 
-    private static final String STANDARD_ARBEIDSFORHOLD_ID = "1";
-
     @Override
     public void register(MapperFactory factory) {
 
-        factory.classMap(RsSykemelding.RsSyntSykemelding.class, SyntSykemeldingRequest.class)
-                .customize(new CustomMapper<>() {
-                    @Override
-                    public void mapAtoB(RsSykemelding.RsSyntSykemelding kilde,
-                                        SyntSykemeldingRequest destinasjon, MappingContext context) {
-
-                        var person = ((PdlPersonBolk.Data) context.getProperty("persondata"))
-                                .getHentPersonBolk().stream()
-                                .filter(personBolk -> nonNull(personBolk.getPerson()))
-                                .findFirst().orElse(PdlPersonBolk.PersonBolk.builder()
-                                        .person(new PdlPerson.Person())
-                                        .build());
-
-                        destinasjon.setIdent(person.getIdent());
-
-                        if (isNotBlank(destinasjon.getOrgnummer()) && isBlank(destinasjon.getArbeidsforholdId())) {
-                            destinasjon.setArbeidsforholdId(STANDARD_ARBEIDSFORHOLD_ID);
-                        }
-                    }
-                })
-                .byDefault()
-                .register();
-
         factory.classMap(RsDetaljertSykemelding.class, DetaljertSykemeldingRequest.class)
                 .customize(new CustomMapper<>() {
                     @Override

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/domain/SyntSykemeldingRequest.java

@@ -42,7 +42,6 @@ public class Consumers {
     private ServerProperties testnavSigrunstubProxy;
     private ServerProperties testnavSkjermingsregisterProxy;
     private ServerProperties testnavSykemeldingApi;
-    private ServerProperties testnavSyntSykemeldingApi;
     private ServerProperties testnavTpsMessagingService;
     private ServerProperties testnavUdistubProxy;
     private ServerProperties testnavSkattekortService;

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/domain/dto/HelsepersonellListeDTO.java

@@ -2,17 +2,12 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
+import lombok.*;
 import org.springframework.data.elasticsearch.annotations.DateFormat;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,7 +22,6 @@
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class RsSykemelding {
 
-    private RsSyntSykemelding syntSykemelding;
     private RsDetaljertSykemelding detaljertSykemelding;
 
     @JsonIgnore
@@ -36,26 +30,6 @@ public boolean hasDetaljertSykemelding() {
         return nonNull(detaljertSykemelding);
     }
 
-    @JsonIgnore
-    public boolean hasSyntSykemelding() {
-
-        return nonNull(syntSykemelding);
-    }
-
-    @Getter
-    @Setter
-    @Builder
-    @NoArgsConstructor
-    @AllArgsConstructor
-    @JsonInclude(JsonInclude.Include.NON_EMPTY)
-    public static class RsSyntSykemelding {
-
-        private String arbeidsforholdId;
-        private String orgnummer;
-        @Field(type = FieldType.Date, format = DateFormat.date_hour_minute_second, pattern = "uuuu-MM-dd'T'HH:mm:ss")
-        private LocalDateTime startDato;
-    }
-
     @Getter
     @Setter
     @Builder

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/dto/SykemeldingResponse.java

@@ -24,7 +24,4 @@ consumers:
     url: http://testnav-pdl-forvalter-dev.dolly.svc.cluster.local
   testnav-sykemelding-api:
     name: testnav-sykemelding-api-dev
-    url: http://testnav-sykemelding-api-dev.dolly.svc.cluster.local
-  testnav-synt-sykemelding-api:
-    name: testnav-synt-sykemelding-api-dev
-    url: http://testnav-synt-sykemelding-api-dev.dolly.svc.cluster.local
+    url: http://testnav-sykemelding-api-dev.dolly.svc.cluster.local

apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/sykemelding/mapper/SykemeldingMappingStrategy.java

@@ -52,9 +52,6 @@ consumers:
     url: https://testnav-amelding-service.intern.dev.nav.no
   testnav-organisasjon-service:
     url: https://testnav-organisasjon-service.intern.dev.nav.no
-  testnav-synt-sykemelding-api:
-    name: testnav-synt-sykemelding-api-dev
-    url: https://testnav-synt-sykemelding-api-dev.intern.dev.nav.no
   testnav-sykemelding-api:
     name: testnav-sykemelding-api-dev
     url: https://testnav-sykemelding-api-dev.intern.dev.nav.no

apps/dolly-backend/src/main/java/no/nav/dolly/config/Consumers.java

@@ -218,11 +218,6 @@ consumers:
     namespace: dolly
     url: http://testnav-sykemelding-api.dolly.svc.cluster.local
     cluster: dev-gcp
-  testnav-synt-sykemelding-api:
-    name: testnav-synt-sykemelding-api
-    namespace: dolly
-    url: http://testnav-synt-sykemelding-api.dolly.svc.cluster.local
-    cluster: dev-gcp
   testnav-organisasjon-service:
     name: testnav-organisasjon-service
     namespace: dolly