From 964b099c584f0df7e187fd9506983415d2399ca8 Mon Sep 17 00:00:00 2001 From: alisihab Date: Mon, 16 Sep 2024 11:41:45 +0200 Subject: [PATCH] move id fields to zaakservice --- .../emulate/GenereerDocumentIdentificatieEmulator.java | 6 +----- .../impl/emulate/GenereerZaakIdentificatieEmulator.java | 7 ++----- .../zdstozgw/translation/zds/services/ZaakService.java | 9 +++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/nl/haarlem/translations/zdstozgw/converter/impl/emulate/GenereerDocumentIdentificatieEmulator.java b/src/main/java/nl/haarlem/translations/zdstozgw/converter/impl/emulate/GenereerDocumentIdentificatieEmulator.java index 9ceb4ca5..fd7333f4 100644 --- a/src/main/java/nl/haarlem/translations/zdstozgw/converter/impl/emulate/GenereerDocumentIdentificatieEmulator.java +++ b/src/main/java/nl/haarlem/translations/zdstozgw/converter/impl/emulate/GenereerDocumentIdentificatieEmulator.java @@ -15,7 +15,6 @@ */ package nl.haarlem.translations.zdstozgw.converter.impl.emulate; -import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.server.ResponseStatusException; @@ -34,9 +33,6 @@ public class GenereerDocumentIdentificatieEmulator extends Converter { - @Value("${id.generatie.documentIdentificatiePrefix:1900}") - public String documentIdentificatiePrefix; - public GenereerDocumentIdentificatieEmulator(RequestResponseCycle session, Translation translation, ZaakService zaakService) { super(session, translation, zaakService); @@ -52,7 +48,7 @@ public void load() throws ResponseStatusException { public ResponseEntity execute() throws ConverterException { EmulateParameterRepository repository = SpringContext.getBean(EmulateParameterRepository.class); var identificatie = repository.getDocumentId(); - var did = documentIdentificatiePrefix + identificatie; + var did = zaakService.getDocumentIdentificatiePrefix() + identificatie; this.getSession().setFunctie("GenereerDocumentIdentificatie"); this.getSession().setKenmerk("documentidentificatie:" + did); diff --git a/src/main/java/nl/haarlem/translations/zdstozgw/converter/impl/emulate/GenereerZaakIdentificatieEmulator.java b/src/main/java/nl/haarlem/translations/zdstozgw/converter/impl/emulate/GenereerZaakIdentificatieEmulator.java index e67cfe7e..5556a87a 100644 --- a/src/main/java/nl/haarlem/translations/zdstozgw/converter/impl/emulate/GenereerZaakIdentificatieEmulator.java +++ b/src/main/java/nl/haarlem/translations/zdstozgw/converter/impl/emulate/GenereerZaakIdentificatieEmulator.java @@ -15,7 +15,6 @@ */ package nl.haarlem.translations.zdstozgw.converter.impl.emulate; -import org.springframework.beans.factory.annotation.Value; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.server.ResponseStatusException; @@ -32,10 +31,8 @@ import nl.haarlem.translations.zdstozgw.translation.zds.services.ZaakService; import nl.haarlem.translations.zdstozgw.utils.XmlUtils; -public class GenereerZaakIdentificatieEmulator extends Converter { - @Value("${id.generatie.zaakIdentificatiePrefix:1900}") - public String zaakIdentificatiePrefix; +public class GenereerZaakIdentificatieEmulator extends Converter { public GenereerZaakIdentificatieEmulator(RequestResponseCycle session, Translation translation, ZaakService zaakService) { @@ -57,7 +54,7 @@ zaakidentificatie, hiervoor gelden de volgende regels (genomen uit RGBZ): EmulateParameterRepository repository = SpringContext.getBean(EmulateParameterRepository.class); var identificatie = repository.getZaakId(); - var zid = zaakIdentificatiePrefix + identificatie; + var zid = zaakService.getZaakIdentificatiePrefix() + identificatie; this.getSession().setFunctie("GenereerZaakIdentificatie"); this.getSession().setKenmerk("zaakidentificatie:" + zid); diff --git a/src/main/java/nl/haarlem/translations/zdstozgw/translation/zds/services/ZaakService.java b/src/main/java/nl/haarlem/translations/zdstozgw/translation/zds/services/ZaakService.java index 66f4f7ea..8b22d731 100644 --- a/src/main/java/nl/haarlem/translations/zdstozgw/translation/zds/services/ZaakService.java +++ b/src/main/java/nl/haarlem/translations/zdstozgw/translation/zds/services/ZaakService.java @@ -29,8 +29,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import lombok.Getter; import nl.haarlem.translations.zdstozgw.config.ConfigService; import nl.haarlem.translations.zdstozgw.config.ModelMapperConfig; import nl.haarlem.translations.zdstozgw.config.model.Organisatie; @@ -82,6 +84,13 @@ public class ZaakService { private final ModelMapper modelMapper; public final ConfigService configService; + @Value("${id.generatie.documentIdentificatiePrefix:1900}") + private @Getter String documentIdentificatiePrefix; + + @Value("${id.generatie.zaakIdentificatiePrefix:1900}") + private @Getter String zaakIdentificatiePrefix; + + @Autowired public ZaakService(ZGWClient zgwClient, ModelMapper modelMapper, ConfigService configService) { this.zgwClient = zgwClient;