diff --git a/src/main/java/no/fintlabs/EgrunnervervInstanceController.java b/src/main/java/no/fintlabs/EgrunnervervInstanceController.java index 50a7937..e24beab 100644 --- a/src/main/java/no/fintlabs/EgrunnervervInstanceController.java +++ b/src/main/java/no/fintlabs/EgrunnervervInstanceController.java @@ -1,10 +1,10 @@ package no.fintlabs; -import no.fintlabs.exceptions.ArchiveCaseNotFoundException; -import no.fintlabs.exceptions.ArchiveResourceNotFoundException; import no.fintlabs.gateway.instance.InstanceProcessor; -import no.fintlabs.gateway.instance.kafka.ArchiveCaseRequestService; -import no.fintlabs.models.*; +import no.fintlabs.models.EgrunnervervJournalpostInstance; +import no.fintlabs.models.EgrunnervervJournalpostInstanceBody; +import no.fintlabs.models.EgrunnervervSakInstance; +import no.fintlabs.models.EgrunnervervSimpleInstance; import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.security.core.annotation.AuthenticationPrincipal; @@ -20,49 +20,36 @@ public class EgrunnervervInstanceController { private final InstanceProcessor sakInstanceProcessor; private final InstanceProcessor journalpostInstanceProcessor; - private final ArchiveCaseRequestService archiveCaseRequestService; - private final ResourceRepository resourceRepository; private final EgrunnervervSimpleInstanceProducerService egrunnervervSimpleInstanceProducerService; public EgrunnervervInstanceController( InstanceProcessor sakInstanceProcessor, InstanceProcessor journalpostInstanceProcessor, - ArchiveCaseRequestService archiveCaseRequestService, - ResourceRepository resourceRepository, EgrunnervervSimpleInstanceProducerService egrunnervervSimpleInstanceProducerService ) { this.sakInstanceProcessor = sakInstanceProcessor; this.journalpostInstanceProcessor = journalpostInstanceProcessor; - this.archiveCaseRequestService = archiveCaseRequestService; - this.resourceRepository = resourceRepository; this.egrunnervervSimpleInstanceProducerService = egrunnervervSimpleInstanceProducerService; } @PostMapping("archive") public Mono> postSakInstance( - @RequestBody EgrunnervervSakInstanceDto egrunnervervSakInstanceDto, + @RequestBody EgrunnervervSakInstance egrunnervervSakInstance, @AuthenticationPrincipal Mono authenticationMono ) { - - String saksansvarlig = resourceRepository.getSaksansvarligHref(egrunnervervSakInstanceDto.getSaksansvarligEpost()) - .orElseThrow(() -> new ArchiveResourceNotFoundException(egrunnervervSakInstanceDto.getSaksansvarligEpost())); - return authenticationMono.flatMap( authentication -> sakInstanceProcessor.processInstance( authentication, - EgrunnervervSakInstance.builder() - .egrunnervervSakInstanceDto(egrunnervervSakInstanceDto) - .saksansvarlig(saksansvarlig) - .build() + egrunnervervSakInstance ) .doOnNext(responseEntity -> { if (responseEntity.getStatusCode().is2xxSuccessful()) { egrunnervervSimpleInstanceProducerService.publishSimpleSakInstance( EgrunnervervSimpleInstance.builder() - .sysId(egrunnervervSakInstanceDto.getSysId()) - .tableName(egrunnervervSakInstanceDto.getTable()) + .sysId(egrunnervervSakInstance.getSysId()) + .tableName(egrunnervervSakInstance.getTable()) .build() ); } @@ -72,27 +59,25 @@ public Mono> postSakInstance( @PostMapping("document") public Mono> postJournalpostInstance( - @RequestBody EgrunnervervJournalpostInstanceDto egrunnervervJournalpostInstanceDto, + @RequestBody EgrunnervervJournalpostInstanceBody egrunnervervJournalpostInstanceBody, @RequestParam("id") String saksnummer, @AuthenticationPrincipal Mono authenticationMono ) { - - archiveCaseRequestService.getByArchiveCaseId(saksnummer) - .orElseThrow(() -> new ArchiveCaseNotFoundException(saksnummer)); + EgrunnervervJournalpostInstance egrunnervervJournalpostInstance = EgrunnervervJournalpostInstance.builder() + .egrunnervervJournalpostInstanceBody(egrunnervervJournalpostInstanceBody) + .saksnummer(saksnummer) + .build(); return authenticationMono.flatMap( authentication -> journalpostInstanceProcessor.processInstance( authentication, - EgrunnervervJournalpostInstance.builder() - .egrunnervervJournalpostInstanceDto(egrunnervervJournalpostInstanceDto) - .saksnummer(saksnummer) - .build() + egrunnervervJournalpostInstance ).doOnNext(responseEntity -> { if (responseEntity.getStatusCode().is2xxSuccessful()) { egrunnervervSimpleInstanceProducerService.publishSimpleJournalpostInstance( EgrunnervervSimpleInstance.builder() - .sysId(egrunnervervJournalpostInstanceDto.getSysId()) - .tableName(egrunnervervJournalpostInstanceDto.getTable()) + .sysId(egrunnervervJournalpostInstanceBody.getSysId()) + .tableName(egrunnervervJournalpostInstanceBody.getTable()) .build() ); } diff --git a/src/main/java/no/fintlabs/InstanceProcessorConfiguration.java b/src/main/java/no/fintlabs/InstanceProcessorConfiguration.java index ab04791..f42e506 100644 --- a/src/main/java/no/fintlabs/InstanceProcessorConfiguration.java +++ b/src/main/java/no/fintlabs/InstanceProcessorConfiguration.java @@ -21,7 +21,7 @@ public InstanceProcessor sakInstanceProcessor( ) { return instanceProcessorFactoryService.createInstanceProcessor( "sak", - egrunnervervSakInstance -> Optional.ofNullable(egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getSysId()), + egrunnervervSakInstance -> Optional.ofNullable(egrunnervervSakInstance.getSysId()), egrunnervervSakInstanceMappingService ); } @@ -33,7 +33,9 @@ public InstanceProcessor journalpostInstancePro ) { return instanceProcessorFactoryService.createInstanceProcessor( "journalpost", - egrunnervervJournalpostInstance -> Optional.ofNullable(egrunnervervJournalpostInstance.getEgrunnervervJournalpostInstanceDto().getSysId()), + egrunnervervJournalpostInstance -> Optional.ofNullable( + egrunnervervJournalpostInstance.getEgrunnervervJournalpostInstanceBody().getSysId() + ), egrunnervervJournalpostInstanceMappingService ); } diff --git a/src/main/java/no/fintlabs/mapping/EgrunnervervJournalpostInstanceMappingService.java b/src/main/java/no/fintlabs/mapping/EgrunnervervJournalpostInstanceMappingService.java index 3880d36..b8831ed 100644 --- a/src/main/java/no/fintlabs/mapping/EgrunnervervJournalpostInstanceMappingService.java +++ b/src/main/java/no/fintlabs/mapping/EgrunnervervJournalpostInstanceMappingService.java @@ -1,11 +1,14 @@ package no.fintlabs.mapping; +import no.fintlabs.exceptions.ArchiveCaseNotFoundException; import no.fintlabs.gateway.instance.InstanceMapper; +import no.fintlabs.gateway.instance.kafka.ArchiveCaseRequestService; import no.fintlabs.gateway.instance.model.File; import no.fintlabs.gateway.instance.model.instance.InstanceObject; import no.fintlabs.gateway.instance.web.FileClient; import no.fintlabs.models.EgrunnervervJournalpostDocument; import no.fintlabs.models.EgrunnervervJournalpostInstance; +import no.fintlabs.models.EgrunnervervJournalpostInstanceBody; import no.fintlabs.models.EgrunnervervJournalpostReceiver; import org.springframework.http.MediaType; import org.springframework.stereotype.Service; @@ -18,16 +21,28 @@ @Service public class EgrunnervervJournalpostInstanceMappingService implements InstanceMapper { + private final ArchiveCaseRequestService archiveCaseRequestService; private final FileClient fileClient; - public EgrunnervervJournalpostInstanceMappingService(FileClient fileClient) { + public EgrunnervervJournalpostInstanceMappingService( + ArchiveCaseRequestService archiveCaseRequestService, + FileClient fileClient + ) { + this.archiveCaseRequestService = archiveCaseRequestService; this.fileClient = fileClient; } @Override public Mono map(Long sourceApplicationId, EgrunnervervJournalpostInstance egrunnervervJournalpostInstance) { - EgrunnervervJournalpostDocument hoveddokument = egrunnervervJournalpostInstance - .getEgrunnervervJournalpostInstanceDto().getDokumenter() + + archiveCaseRequestService.getByArchiveCaseId(egrunnervervJournalpostInstance.getSaksnummer()) + .orElseThrow(() -> new ArchiveCaseNotFoundException(egrunnervervJournalpostInstance.getSaksnummer())); + + EgrunnervervJournalpostInstanceBody egrunnervervJournalpostInstanceBody = + egrunnervervJournalpostInstance.getEgrunnervervJournalpostInstanceBody(); + + EgrunnervervJournalpostDocument hoveddokument = egrunnervervJournalpostInstanceBody + .getDokumenter() .stream() .filter(EgrunnervervJournalpostDocument::getHoveddokument) .findFirst() @@ -35,20 +50,20 @@ public Mono map(Long sourceApplicationId, EgrunnervervJournalpos throw new IllegalStateException("No hoveddokument"); }); - List vedlegg = egrunnervervJournalpostInstance - .getEgrunnervervJournalpostInstanceDto().getDokumenter() + List vedlegg = egrunnervervJournalpostInstanceBody + .getDokumenter() .stream() .filter(dokument -> !dokument.getHoveddokument()) .toList(); Mono> hoveddokumentInstanceValuePerKeyMono = mapHoveddokumentToInstanceValuePerKey( sourceApplicationId, - egrunnervervJournalpostInstance.getEgrunnervervJournalpostInstanceDto().getSysId(), + egrunnervervJournalpostInstanceBody.getSysId(), hoveddokument ); Mono> vedleggInstanceObjectsMono = mapAttachmentDocumentsToInstanceObjects( sourceApplicationId, - egrunnervervJournalpostInstance.getEgrunnervervJournalpostInstanceDto().getSysId(), + egrunnervervJournalpostInstanceBody.getSysId(), vedlegg ); @@ -60,10 +75,10 @@ public Mono map(Long sourceApplicationId, EgrunnervervJournalpos HashMap valuePerKey = new HashMap<>( Map.of( "saksnummer", Optional.ofNullable(egrunnervervJournalpostInstance.getSaksnummer()).orElse(""), - "tittel", Optional.ofNullable(egrunnervervJournalpostInstance.getEgrunnervervJournalpostInstanceDto().getTittel()).orElse(""), - "dokumentNavn", Optional.ofNullable(egrunnervervJournalpostInstance.getEgrunnervervJournalpostInstanceDto().getDokumentNavn()).orElse(""), - "dokumentDato", Optional.ofNullable(egrunnervervJournalpostInstance.getEgrunnervervJournalpostInstanceDto().getDokumentDato()).orElse(""), - "forsendelsesmaate", Optional.ofNullable(egrunnervervJournalpostInstance.getEgrunnervervJournalpostInstanceDto().getForsendelsesMate()).orElse("") + "tittel", Optional.ofNullable(egrunnervervJournalpostInstanceBody.getTittel()).orElse(""), + "dokumentNavn", Optional.ofNullable(egrunnervervJournalpostInstanceBody.getDokumentNavn()).orElse(""), + "dokumentDato", Optional.ofNullable(egrunnervervJournalpostInstanceBody.getDokumentDato()).orElse(""), + "forsendelsesmaate", Optional.ofNullable(egrunnervervJournalpostInstanceBody.getForsendelsesMate()).orElse("") ) ); valuePerKey.putAll(hovedDokumentValuePerKeyAndVedleggInstanceObjects.getT1()); @@ -71,7 +86,7 @@ public Mono map(Long sourceApplicationId, EgrunnervervJournalpos .valuePerKey(valuePerKey) .objectCollectionPerKey( Map.of( - "mottakere", egrunnervervJournalpostInstance.getEgrunnervervJournalpostInstanceDto().getMottakere() + "mottakere", egrunnervervJournalpostInstanceBody.getMottakere() .stream() .map(this::toInstanceObject) .toList(), diff --git a/src/main/java/no/fintlabs/mapping/EgrunnervervSakInstanceMappingService.java b/src/main/java/no/fintlabs/mapping/EgrunnervervSakInstanceMappingService.java index 5393065..931bbcd 100644 --- a/src/main/java/no/fintlabs/mapping/EgrunnervervSakInstanceMappingService.java +++ b/src/main/java/no/fintlabs/mapping/EgrunnervervSakInstanceMappingService.java @@ -1,5 +1,7 @@ package no.fintlabs.mapping; +import no.fintlabs.ResourceRepository; +import no.fintlabs.exceptions.ArchiveResourceNotFoundException; import no.fintlabs.gateway.instance.InstanceMapper; import no.fintlabs.gateway.instance.model.instance.InstanceObject; import no.fintlabs.models.EgrunnervervSakInstance; @@ -13,34 +15,45 @@ @Service public class EgrunnervervSakInstanceMappingService implements InstanceMapper { + + private final ResourceRepository resourceRepository; + + public EgrunnervervSakInstanceMappingService(ResourceRepository resourceRepository) { + this.resourceRepository = resourceRepository; + } + @Override public Mono map(Long sourceApplicationId, EgrunnervervSakInstance egrunnervervSakInstance) { + + String saksansvarlig = resourceRepository.getSaksansvarligHref(egrunnervervSakInstance.getSaksansvarligEpost()) + .orElseThrow(() -> new ArchiveResourceNotFoundException(egrunnervervSakInstance.getSaksansvarligEpost())); + Map valuePerKey = new HashMap<>(); - valuePerKey.put("sys_id", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getSysId()); - valuePerKey.put("knr", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getKnr()); - valuePerKey.put("gnr", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getGnr()); - valuePerKey.put("bnr", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getBnr()); - valuePerKey.put("fnr", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getFnr()); - valuePerKey.put("snr", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getSnr()); - valuePerKey.put("takstnummer", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getTakstnummer()); - valuePerKey.put("tittel", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getTittel()); - valuePerKey.put("saksansvarligEpost", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getSaksansvarligEpost()); - valuePerKey.put("eierforholdsnavn", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getEierforholdsnavn()); - valuePerKey.put("eierforholdskode", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getEierforholdskode()); - valuePerKey.put("prosjektnr", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getProsjektnr()); - valuePerKey.put("prosjektnavn", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getProsjektnavn()); - valuePerKey.put("kommunenavn", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getKommunenavn()); - valuePerKey.put("adresse", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getAdresse()); - valuePerKey.put("saksansvarlig", egrunnervervSakInstance.getSaksansvarlig()); + valuePerKey.put("sys_id", egrunnervervSakInstance.getSysId()); + valuePerKey.put("knr", egrunnervervSakInstance.getKnr()); + valuePerKey.put("gnr", egrunnervervSakInstance.getGnr()); + valuePerKey.put("bnr", egrunnervervSakInstance.getBnr()); + valuePerKey.put("fnr", egrunnervervSakInstance.getFnr()); + valuePerKey.put("snr", egrunnervervSakInstance.getSnr()); + valuePerKey.put("takstnummer", egrunnervervSakInstance.getTakstnummer()); + valuePerKey.put("tittel", egrunnervervSakInstance.getTittel()); + valuePerKey.put("saksansvarligEpost", egrunnervervSakInstance.getSaksansvarligEpost()); + valuePerKey.put("eierforholdsnavn", egrunnervervSakInstance.getEierforholdsnavn()); + valuePerKey.put("eierforholdskode", egrunnervervSakInstance.getEierforholdskode()); + valuePerKey.put("prosjektnr", egrunnervervSakInstance.getProsjektnr()); + valuePerKey.put("prosjektnavn", egrunnervervSakInstance.getProsjektnavn()); + valuePerKey.put("kommunenavn", egrunnervervSakInstance.getKommunenavn()); + valuePerKey.put("adresse", egrunnervervSakInstance.getAdresse()); + valuePerKey.put("saksansvarlig", saksansvarlig); return Mono.just( InstanceObject.builder() .valuePerKey(valuePerKey) .objectCollectionPerKey(Map.of( - "saksparter", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getSaksparter() + "saksparter", egrunnervervSakInstance.getSaksparter() .stream() .map(this::toInstanceObject) .toList(), - "klasseringer", egrunnervervSakInstance.getEgrunnervervSakInstanceDto().getKlasseringer() + "klasseringer", egrunnervervSakInstance.getKlasseringer() .stream() .map(this::toInstanceObject) .toList() diff --git a/src/main/java/no/fintlabs/models/EgrunnervervJournalpostInstance.java b/src/main/java/no/fintlabs/models/EgrunnervervJournalpostInstance.java index 114285e..5248f69 100644 --- a/src/main/java/no/fintlabs/models/EgrunnervervJournalpostInstance.java +++ b/src/main/java/no/fintlabs/models/EgrunnervervJournalpostInstance.java @@ -13,7 +13,7 @@ @Builder public class EgrunnervervJournalpostInstance { @NotNull - private final EgrunnervervJournalpostInstanceDto egrunnervervJournalpostInstanceDto; + private final EgrunnervervJournalpostInstanceBody egrunnervervJournalpostInstanceBody; @NotNull private final String saksnummer; } diff --git a/src/main/java/no/fintlabs/models/EgrunnervervJournalpostInstanceDto.java b/src/main/java/no/fintlabs/models/EgrunnervervJournalpostInstanceBody.java similarity index 88% rename from src/main/java/no/fintlabs/models/EgrunnervervJournalpostInstanceDto.java rename to src/main/java/no/fintlabs/models/EgrunnervervJournalpostInstanceBody.java index 1e1f961..33157c7 100644 --- a/src/main/java/no/fintlabs/models/EgrunnervervJournalpostInstanceDto.java +++ b/src/main/java/no/fintlabs/models/EgrunnervervJournalpostInstanceBody.java @@ -1,5 +1,6 @@ package no.fintlabs.models; + import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Builder; import lombok.EqualsAndHashCode; @@ -7,6 +8,7 @@ import lombok.extern.jackson.Jacksonized; import javax.validation.Valid; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.List; @@ -14,11 +16,11 @@ @Jacksonized @EqualsAndHashCode @Builder -public class EgrunnervervJournalpostInstanceDto { +public class EgrunnervervJournalpostInstanceBody { @NotNull @JsonProperty("sys_id") private final String sysId; - @NotNull + @NotBlank private final String table; @NotNull private final String tittel; diff --git a/src/main/java/no/fintlabs/models/EgrunnervervSakInstance.java b/src/main/java/no/fintlabs/models/EgrunnervervSakInstance.java index e5e64d7..33a73b9 100644 --- a/src/main/java/no/fintlabs/models/EgrunnervervSakInstance.java +++ b/src/main/java/no/fintlabs/models/EgrunnervervSakInstance.java @@ -1,17 +1,56 @@ package no.fintlabs.models; -import lombok.*; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.Builder; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.extern.jackson.Jacksonized; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; +import java.util.List; @Getter @Jacksonized -@EqualsAndHashCode(callSuper = false) +@EqualsAndHashCode @Builder public class EgrunnervervSakInstance { + + @NotBlank + @JsonProperty("sys_id") + private final String sysId; + @NotBlank + private final String table; + @NotNull + private final String knr; + @NotNull + private final String gnr; + @NotNull + private final String bnr; + @NotNull + private final String fnr; + @NotNull + private final String snr; + @NotNull + private final String takstnummer; @NotNull - private final EgrunnervervSakInstanceDto egrunnervervSakInstanceDto; + private final String tittel; @NotNull - private final String saksansvarlig; -} \ No newline at end of file + private final String saksansvarligEpost; + @NotNull + private final String eierforholdsnavn; + @NotNull + private final String eierforholdskode; + @NotNull + private final String prosjektnr; + @NotNull + private final String prosjektnavn; + @NotNull + private final String kommunenavn; + @NotNull + private final String adresse; + + private final List<@Valid @NotNull EgrunnervervSaksPart> saksparter; + private final List<@Valid @NotNull EgrunnervervSakKlassering> klasseringer; +} diff --git a/src/main/java/no/fintlabs/models/EgrunnervervSakInstanceDto.java b/src/main/java/no/fintlabs/models/EgrunnervervSakInstanceDto.java deleted file mode 100644 index 09ee1ec..0000000 --- a/src/main/java/no/fintlabs/models/EgrunnervervSakInstanceDto.java +++ /dev/null @@ -1,56 +0,0 @@ -package no.fintlabs.models; - -import com.fasterxml.jackson.annotation.JsonProperty; -import lombok.Builder; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.extern.jackson.Jacksonized; - -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.util.List; - -@Getter -@Jacksonized -@EqualsAndHashCode -@Builder -public class EgrunnervervSakInstanceDto { - - @NotBlank - @JsonProperty("sys_id") - private final String sysId; - @NotNull - private final String table; - @NotNull - private final String knr; - @NotNull - private final String gnr; - @NotNull - private final String bnr; - @NotNull - private final String fnr; - @NotNull - private final String snr; - @NotNull - private final String takstnummer; - @NotNull - private final String tittel; - @NotNull - private final String saksansvarligEpost; - @NotNull - private final String eierforholdsnavn; - @NotNull - private final String eierforholdskode; - @NotNull - private final String prosjektnr; - @NotNull - private final String prosjektnavn; - @NotNull - private final String kommunenavn; - @NotNull - private final String adresse; - - private final List<@Valid @NotNull EgrunnervervSaksPart> saksparter; - private final List<@Valid @NotNull EgrunnervervSakKlassering> klasseringer; -} diff --git a/src/test/groovy/no/fintlabs/mapping/EgrunnervervSakInstanceDtoMappingServiceSpec.groovy b/src/test/groovy/no/fintlabs/mapping/EgrunnervervSakInstanceMappingServiceSpec.groovy similarity index 94% rename from src/test/groovy/no/fintlabs/mapping/EgrunnervervSakInstanceDtoMappingServiceSpec.groovy rename to src/test/groovy/no/fintlabs/mapping/EgrunnervervSakInstanceMappingServiceSpec.groovy index cec3dc5..0a38247 100644 --- a/src/test/groovy/no/fintlabs/mapping/EgrunnervervSakInstanceDtoMappingServiceSpec.groovy +++ b/src/test/groovy/no/fintlabs/mapping/EgrunnervervSakInstanceMappingServiceSpec.groovy @@ -1,24 +1,27 @@ package no.fintlabs.mapping +import no.fintlabs.ResourceRepository import no.fintlabs.gateway.instance.model.instance.InstanceObject import no.fintlabs.models.EgrunnervervSakInstance -import no.fintlabs.models.EgrunnervervSakInstanceDto import no.fintlabs.models.EgrunnervervSakKlassering import no.fintlabs.models.EgrunnervervSaksPart import spock.lang.Specification -class EgrunnervervSakInstanceDtoMappingServiceSpec extends Specification { +class EgrunnervervSakInstanceMappingServiceSpec extends Specification { public static final int egrunnervervSourceApplicationId = 2 private EgrunnervervSakInstanceMappingService egrunnervervSakInstanceMappingService - private EgrunnervervSakInstanceDto egrunnervervSakInstanceDto private EgrunnervervSakInstance egrunnervervSakInstance private InstanceObject expectedInstance + private ResourceRepository resourceRepository def setup() { - egrunnervervSakInstanceMappingService = new EgrunnervervSakInstanceMappingService() + resourceRepository = Mock(ResourceRepository.class) + resourceRepository.getSaksansvarligHref("testSaksansvarligEpost") >> Optional.of("testSaksansvarlig") - egrunnervervSakInstanceDto = EgrunnervervSakInstanceDto + egrunnervervSakInstanceMappingService = new EgrunnervervSakInstanceMappingService(resourceRepository) + + egrunnervervSakInstance = EgrunnervervSakInstance .builder() .sysId("testSysId") .knr("testKnr") @@ -78,12 +81,6 @@ class EgrunnervervSakInstanceDtoMappingServiceSpec extends Specification { )) .build() - egrunnervervSakInstance = EgrunnervervSakInstance - .builder() - .egrunnervervSakInstanceDto(egrunnervervSakInstanceDto) - .saksansvarlig("testSaksansvarlig") - .build() - Map valuePerKey = new HashMap<>() valuePerKey.put("sys_id", "testSysId") valuePerKey.put("knr", "testKnr")