[Tutti-commits] 93/98: add referential import result

16 Feb 2015

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository tutti.

See http://git.codelutin.com/tutti.git

commit 30aad201e2c52c51a8109478adf16a8bc485be86
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Mon Feb 16 09:58:37 2015 +0100

    add referential import result
---
 .../genericformat/GenericFormatImportService.java  | 13 ++++++++++
 .../GenericFormatReferentialImportResult.java      | 30 ++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java
index 0dbc1fc..f0d8d22 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportService.java
@@ -226,6 +226,9 @@ public class GenericFormatImportService extends AbstractTuttiService {
 
             GenericFormatReferentialImportResult<Gear, Integer> genericFormatReferentialImportResult = new GenericFormatReferentialImportResult<>(referentialImportRequest, referentialImportResult);
             importContext.getImportResult().setImportedGears(genericFormatReferentialImportResult);
+            if (log.isInfoEnabled()) {
+                log.info("Temporary gears import result: " + genericFormatReferentialImportResult.getReport());
+            }
 
         } else {
 
@@ -262,6 +265,9 @@ public class GenericFormatImportService extends AbstractTuttiService {
 
             GenericFormatReferentialImportResult<Person, Integer> genericFormatReferentialImportResult = new GenericFormatReferentialImportResult<>(referentialImportRequest, referentialImportResult);
             importContext.getImportResult().setImportedPersons(genericFormatReferentialImportResult);
+            if (log.isInfoEnabled()) {
+                log.info("Temporary persons import result: " + genericFormatReferentialImportResult.getReport());
+            }
 
         } else {
 
@@ -299,6 +305,9 @@ public class GenericFormatImportService extends AbstractTuttiService {
             GenericFormatReferentialImportResult<Species, Integer> genericFormatReferentialImportResult = new GenericFormatReferentialImportResult<>(referentialImportRequest, referentialImportResult);
             importContext.getImportResult().setImportedSpecies(genericFormatReferentialImportResult);
 
+            if (log.isInfoEnabled()) {
+                log.info("Temporary species import result: " + genericFormatReferentialImportResult.getReport());
+            }
         } else {
 
             if (log.isInfoEnabled()) {
@@ -335,6 +344,10 @@ public class GenericFormatImportService extends AbstractTuttiService {
             GenericFormatReferentialImportResult<Vessel, String> genericFormatReferentialImportResult = new GenericFormatReferentialImportResult<>(referentialImportRequest, referentialImportResult);
             importContext.getImportResult().setImportedVessels(genericFormatReferentialImportResult);
 
+            if (log.isInfoEnabled()) {
+                log.info("Temporary vessels import result: " + genericFormatReferentialImportResult.getReport());
+            }
+
         } else {
 
             if (log.isInfoEnabled()) {
diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialImportResult.java
index 2eab11e..19a0c7b 100644
--- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialImportResult.java
+++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatReferentialImportResult.java
@@ -1,10 +1,12 @@
 package fr.ifremer.tutti.service.genericformat;
 
 import com.google.common.base.Function;
+import com.google.common.base.Joiner;
 import fr.ifremer.tutti.persistence.entities.referential.TuttiReferentialEntity;
 import fr.ifremer.tutti.service.referential.ReferentialImportRequest;
 import fr.ifremer.tutti.service.referential.ReferentialImportResult;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -89,4 +91,32 @@ public class GenericFormatReferentialImportResult<E extends TuttiReferentialEnti
 
     }
 
+    public String getReport() {
+
+        StringBuilder builder = new StringBuilder();
+
+        List<String> added = getMapReport(entitiesAdded);
+        builder.append(String.format("%s entities added: \n%s", added.size(), Joiner.on("\n").join(added)));
+
+        List<String> linked = getMapReport(entitiesLinked);
+        builder.append(String.format("%s entities linked: \n%s", added.size(), Joiner.on("\n").join(linked)));
+
+        return builder.toString();
+
+    }
+
+    protected List<String> getMapReport(Map<String, E> map) {
+
+        List<String> list = new ArrayList<>();
+        for (Map.Entry<String, String> entry : idTranslationMap.entrySet()) {
+            String originalId = entry.getKey();
+            String targetId = entry.getValue();
+            if (map.containsKey(targetId)) {
+                list.add(String.format("original id: %s -> persist id: %s", originalId, targetId));
+            }
+
+        }
+        return list;
+
+    }
 }

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Tutti-commits] 93/98: add referential import result

codelutin.com scm