From d139f1da33576c68c33772fc33dbdafb9616596e Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Tue, 7 Sep 2021 17:25:59 +0200
Subject: change ZMR Workflow identifier to String provided by BM.I

---
 .../auth/eidas/v2/clients/zmr/ZmrSoapClient.java   | 27 ++++++++++++++--------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrSoapClient.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrSoapClient.java
index 29914e21..baee2a58 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrSoapClient.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrSoapClient.java
@@ -79,15 +79,19 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient {
   private static final String LOGMSG_MISSING_CONFIG = "Missing configuration with key: {0}";
   
   private static final String LOGMSG_ZMR_ERROR =
-      "Receive an error from ZMR during '{}' operation with msg: {}";
+      "Receive an error from ZMR during '{0}' operation with msg: {1}";
   private static final String LOGMSG_ZMR_RESP_PROCESS =
       "Proces ZMR response during '{}' operation failes with msg: {}";
 
   private static final String LOGMSG_ZMR_SOAP_ERROR =
-      "ZMR anwser for transaction: {} with code: {} and message: {}";
+      "ZMR anwser for transaction: {0} with code: {1} and message: {2}";
 
-  private static final String PROCESS_GENERAL = "eIDAS_Matching";
-  private static final String PROCESS_SEARCH_PERSONAL_IDENTIFIER =
+  private static final String PROCESS_GENERAL = "GP_EIDAS";
+  private static final String PROCESS_TASK_SEARCH = "ZPR_VO_Person_suchen_Meldevorgang";
+  //private static final String PROCESS_TASK_ADD = "ZPR_VO_Person_anlegen";
+  private static final String PROCESS_TASK_UPDATE = "ZPR_VO_Person_aendern";
+  
+  private static final String PROCESS_SEARCH_PERSONAL_IDENTIFIER = 
       "Searching " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER;
   private static final String PROCESS_SEARCH_MDS_ONLY = "Searching with MDS only";
   private static final String PROCESS_SEARCH_COUNTRY_SPECIFIC = "Searching {} specific";
@@ -130,7 +134,7 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient {
       eidasInfos.setEidasWert(personPseudonym);
 
       // set work-flow client information
-      req.setWorkflowInfoClient(generateWorkFlowInfos(PROCESS_SEARCH_PERSONAL_IDENTIFIER, null));
+      req.setWorkflowInfoClient(generateWorkFlowInfos(PROCESS_TASK_SEARCH, null));
       req.setClientInfo(generateClientInfos());
 
       // set additionl search parameters
@@ -179,7 +183,7 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient {
       searchNatPerson.setGeburtsdatum(dateOfBirth);
 
       // set work-flow client information
-      req.setWorkflowInfoClient(generateWorkFlowInfos(PROCESS_SEARCH_MDS_ONLY, zmrProzessId));
+      req.setWorkflowInfoClient(generateWorkFlowInfos(PROCESS_TASK_SEARCH, zmrProzessId));
       req.setClientInfo(generateClientInfos());
 
       // set additionl search parameters
@@ -222,7 +226,7 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient {
       req.setPersonSuchenRequest(personSearchDao);
 
       // set work-flow client information
-      req.setWorkflowInfoClient(generateWorkFlowInfos(friendlyMsg, zmrProzessId));
+      req.setWorkflowInfoClient(generateWorkFlowInfos(PROCESS_TASK_SEARCH, zmrProzessId));
       req.setClientInfo(generateClientInfos());
 
       // set additionl search parameters
@@ -430,7 +434,7 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient {
   private String extractReasonFromError(ServiceFault e) {
     if (e.getFaultInfo() != null) {
       return MessageFormat.format(LOGMSG_ZMR_SOAP_ERROR,
-          e.getFaultInfo().getServerTransaktionNr(),
+          e.getFaultInfo().getServerTransaktionNr().toString(),
           e.getFaultInfo().getErrorCode(),
           e.getFaultInfo().getErrorMessage());
 
@@ -635,7 +639,7 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient {
     bpkInfo.setType(EaafConstants.URN_PREFIX_CDID + "ZP");
     
     // set work-flow client information
-    req.setWorkflowInfoClient(generateWorkFlowInfos(PROCESS_KITT_IDENITIES_GET, zmrProzessId));
+    req.setWorkflowInfoClient(generateWorkFlowInfos(PROCESS_TASK_UPDATE, zmrProzessId));
     req.setClientInfo(generateClientInfos());
 
     // set additionl search parameters
@@ -741,6 +745,11 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient {
       Collection<? extends EidasIdentitaetAnlageType> eidasDocumentToAdd, String citizenCountryCode) 
           throws ServiceFault {
     final RequestType req = new RequestType();
+        
+    // set work-flow client information
+    req.setWorkflowInfoClient(generateWorkFlowInfos(PROCESS_TASK_UPDATE, null));
+    req.setClientInfo(generateClientInfos());
+    
     PersonAendernRequest updateReq = new PersonAendernRequest();
     req.setPersonAendernRequest(updateReq);      
     
-- 
cgit v1.2.3