1 files changed, 16 insertions, 2 deletions
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java
index e722200c..3e38ca20 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/InitialSearchTask.java
@@ -99,7 +99,7 @@ public class InitialSearchTask extends AbstractAuthServletTask {
 
       ImmutableMap<AttributeDefinition<?>, ImmutableSet<? extends AttributeValue<?>>> aa =
           eidasResponse.getAttributes().getAttributeMap();
-      
+
       final Map<String, Object> simpleAttrMap = convertEidasAttrToSimpleMap(
           eidasResponse.getAttributes().getAttributeMap());
 
@@ -236,8 +236,22 @@ public class InitialSearchTask extends AbstractAuthServletTask {
                         SimpleEidasData eidData) throws TaskExecutionException {
     //TODO automerge
     log.debug("Automerge " + initialSearchResult + " with " + eidData + " " + countrySpecificDetailSearchResult);
-    //TODO
     try {
+      if (initialSearchResult.getResultCount() != 0) {
+        throw new WorkflowException("initialSearchResult.getResultCount() != 0");
+      }
+      if (countrySpecificDetailSearchResult.getResultCount() != 1) {
+        throw new WorkflowException("countrySpecificDetailSearchResult.getResultCount() != 1");
+      }
+      if (countrySpecificDetailSearchResult.getResultsZmr().size() == 1) {
+        //update ZMR
+        zmrClient.update(countrySpecificDetailSearchResult.getResultsZmr().get(0), eidData);
+      }
+      if (countrySpecificDetailSearchResult.getResultsErnb().size() == 1) {
+        //update ErnB
+        ernbClient.update(countrySpecificDetailSearchResult.getResultsErnb().get(0), eidData);
+      }
+
       String bpK = countrySpecificDetailSearchResult.getBpk();
       return bpK;
     } catch (WorkflowException e) {