adding configuration for #284

Sudwest-Fryslan · Dec 14, 2021 · 51e1c13 · 51e1c13
1 parent bf83eae
commit 51e1c13
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 4 deletions.
diff --git a/src/main/java/nl/haarlem/translations/zdstozgw/config/ConfigService.java b/src/main/java/nl/haarlem/translations/zdstozgw/config/ConfigService.java
@@ -29,7 +29,7 @@
 import com.google.gson.Gson;
 
 import lombok.Data;
-import nl.haarlem.translations.zdstozgw.config.model.BeeindigZaakWanneerEinddatum;
+import nl.haarlem.translations.zdstozgw.config.model.ZaaktypeMetCoalesceResultaat;
 import nl.haarlem.translations.zdstozgw.config.model.Configuration;
 import nl.haarlem.translations.zdstozgw.config.model.Organisatie;
 import nl.haarlem.translations.zdstozgw.config.model.Translation;
@@ -85,11 +85,18 @@ private void validateConfiguration() throws Exception {
 
 			section = "beeindigZaakWanneerEinddatum";
 			log.debug("=== " + section + " #" + this.configuration.getBeeindigZaakWanneerEinddatum().size() + " ===");			
-			for (BeeindigZaakWanneerEinddatum beeindigZaakWanneerEinddatum : this.configuration.getBeeindigZaakWanneerEinddatum()) {
+			for (ZaaktypeMetCoalesceResultaat beeindigZaakWanneerEinddatum : this.configuration.getBeeindigZaakWanneerEinddatum()) {
 				log.debug("\t===>\tzaakType:" + beeindigZaakWanneerEinddatum.getZaakType());
 				log.debug("\t\tcoalesceResultaat:" + beeindigZaakWanneerEinddatum.getCoalesceResultaat());
 			}
 
+			section = "einddatumEnResultaatWanneerLastStatus";
+			log.debug("=== " + section + " #" + this.configuration.getEinddatumEnResultaatWanneerLastStatus().size() + " ===");			
+			for (ZaaktypeMetCoalesceResultaat beeindigZaakWanneerEinddatum : this.configuration.getEinddatumEnResultaatWanneerLastStatus()) {
+				log.debug("\t===>\tzaakType:" + beeindigZaakWanneerEinddatum.getZaakType());
+				log.debug("\t\tcoalesceResultaat:" + beeindigZaakWanneerEinddatum.getCoalesceResultaat());
+			}
+
 			section = "replicatie";
 			log.debug("=== " + section + " ===");
 			var replicatie = this.configuration.getReplication();

diff --git a/src/main/java/nl/haarlem/translations/zdstozgw/config/model/Configuration.java b/src/main/java/nl/haarlem/translations/zdstozgw/config/model/Configuration.java
@@ -31,7 +31,9 @@ public class Configuration {
 	@Expose
 	public ZgwRolOmschrijving zgwRolOmschrijving = null;
 	@Expose
-	public List<BeeindigZaakWanneerEinddatum> beeindigZaakWanneerEinddatum = null;	
+	public List<ZaaktypeMetCoalesceResultaat> beeindigZaakWanneerEinddatum = null;	
+	@Expose
+	public List<ZaaktypeMetCoalesceResultaat> einddatumEnResultaatWanneerLastStatus = null;	
 	@Expose
 	public Replication replication = null;
 	@Expose

diff --git a/...g/model/BeeindigZaakWanneerEinddatum.java → ...g/model/ZaaktypeMetCoalesceResultaat.java b/...g/model/BeeindigZaakWanneerEinddatum.java → ...g/model/ZaaktypeMetCoalesceResultaat.java
@@ -21,7 +21,7 @@
 import lombok.Data;
 
 @Data
-public class BeeindigZaakWanneerEinddatum {
+public class ZaaktypeMetCoalesceResultaat {
 	@Expose
 	public String zaakType;
 	@Expose

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
@@ -490,6 +490,42 @@ public boolean setResultaatAndStatus(ZdsZaak zdsZaak, ZgwZaak zgwZaak, ZgwZaakTy
 				}
 			}
 		}		
+
+		// einddatumEnResultaatWanneerLastStatus logica
+		/*
+		if(zdsZaak.einddatum != null && zdsZaak.einddatum.length() > 0 && !beeindigd) {
+			for(var beeindig : this.configService.getConfiguration().getBeeindigZaakWanneerEinddatum() ) {
+				if(beeindig.zaakType.equals(zgwZaakType.getIdentificatie())) {
+					// is the result also missing?
+					var resultaten = this.zgwClient.getResultatenByZaakUrl(zgwZaak.url);
+					if(resultaten.size() == 0) {
+						var zgwResultaatType = this.zgwClient.getResultaatTypeByZaakTypeAndOmschrijving(zgwZaakType, beeindig.coalesceResultaat);
+						if(zgwResultaatType == null) {
+							throw new ConverterException("Resultaattype: '" + beeindig.coalesceResultaat + "' niet gevonden bij Zaaktype:'" + zgwZaakType.identificatie + "'");							
+						}
+						ZgwResultaat zgwResultaat = new ZgwResultaat();
+						zgwResultaat.zaak = zgwZaak.url;
+						zgwResultaat.resultaattype = zgwResultaatType.url;
+						zgwResultaat.toelichting = zgwResultaatType.omschrijving;
+						debugWarning("BeeindigZaakWanneerEinddatum was defined for zaaktype:'" + zgwZaakType.identificatie + "' and an einddatum was provided, no resultaat, zaak will get resultaat:'" + zgwResultaatType.getOmschrijving() + "'");
+						this.zgwClient.addZaakResultaat(zgwResultaat);						
+					}
+								
+					var zgwStatusType = this.zgwClient.getLastStatusTypeByZaakType(zgwZaakType);					
+					ZgwStatus zgwStatus = new ZgwStatus();
+					zgwStatus.zaak = zgwZaak.url;
+					zgwStatus.statustype = zgwStatusType.url;
+					zgwStatus.statustoelichting = zgwStatusType.omschrijving;
+					zgwStatus.setDatumStatusGezet(convertZdsStatusDatumtoZgwDateTime(zgwZaak, zdsZaak.einddatum));
+					debugWarning("BeeindigZaakWanneerEinddatum was defined for zaaktype:'" + zgwZaakType.identificatie + "' and an einddatum was provided, no eindstatus, zaak will get status:'" + zgwStatusType.getOmschrijving() + "' with time:" + zgwStatus.getDatumStatusGezet());
+					this.zgwClient.addZaakStatus(zgwStatus);
+					beeindigd = true;
+					changed = true;
+				}
+			}
+		}		
+		*/
+
 		return changed;
 	}