From ae8da39512f32f155392c9fd4708e205cae33b86 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@googlemail.com>
Date: Sun, 22 Jan 2023 10:38:17 +0100
Subject: [PATCH] Additional improvements for structure for publication
 im/exporters

---
 ...actPublicationWithPublisherImExporter.java | 82 +++++++++++++++++--
 .../AbstractUnPublishedImExporter.java        | 46 +++++++++++
 2 files changed, 123 insertions(+), 5 deletions(-)

diff --git a/sci-publications/src/main/java/org/scientificcms/publications/AbstractPublicationWithPublisherImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/AbstractPublicationWithPublisherImExporter.java
index 8456220..59533da 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/AbstractPublicationWithPublisherImExporter.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/AbstractPublicationWithPublisherImExporter.java
@@ -1,10 +1,8 @@
 package org.scientificcms.publications;
 
+import java.util.Objects;
 import java.util.Set;
 
-import javax.annotation.PostConstruct;
-
-
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
@@ -12,7 +10,7 @@ import javax.annotation.PostConstruct;
  */
 public abstract class AbstractPublicationWithPublisherImExporter<T extends PublicationWithPublisher>
     extends AbstractPublicationImExporter<T> {
-    
+
     @Override
     protected final void initPublicationImExporter() {
         addRequiredEntities(
@@ -22,7 +20,81 @@ public abstract class AbstractPublicationWithPublisherImExporter<T extends Publi
         );
         initPublicationWithPublisherImExporter();
     }
-    
+
     protected abstract void initPublicationWithPublisherImExporter();
 
+    @Override
+    protected final void updateExistingPublication(
+        final T existingPublication,
+        final T withImportedPublication
+    ) {
+        if (!Objects.equals(
+            existingPublication.getPublisher(),
+            withImportedPublication.getPublisher()
+        )) {
+            existingPublication.setPublisher(
+                withImportedPublication.getPublisher()
+            );
+        }
+
+        if (!Objects.equals(
+            existingPublication.getIsbn10(),
+            withImportedPublication.getIsbn10()
+        )) {
+            existingPublication.setIsbn10(withImportedPublication.getIsbn10());
+        }
+
+        if (!Objects.equals(
+            existingPublication.getIsbn13(),
+            withImportedPublication.getIsbn13()
+        )) {
+            existingPublication.setIsbn13(withImportedPublication.getIsbn13());
+        }
+
+        if (!Objects.equals(
+            existingPublication.getVolume(),
+            withImportedPublication.getVolume()
+        )) {
+            existingPublication.setVolume(withImportedPublication.getVolume());
+        }
+
+        if (!Objects.equals(
+            existingPublication.getNumberOfVolumes(),
+            withImportedPublication.getNumberOfVolumes()
+        )) {
+            existingPublication.setNumberOfVolumes(
+                withImportedPublication.getNumberOfVolumes()
+            );
+        }
+
+        if (!Objects.equals(
+            existingPublication.getNumberOfPages(),
+            withImportedPublication.getNumberOfPages()
+        )) {
+            existingPublication.setNumberOfPages(
+                withImportedPublication.getNumberOfPages()
+            );
+        }
+
+        if (!Objects.equals(
+            existingPublication.getEdition(),
+            withImportedPublication.getEdition()
+        )) {
+            syncLocalizedStrings(
+                withImportedPublication.getEdition(),
+                existingPublication.getEdition()
+            );
+        }
+
+        updateExistingPublicationWithPublisher(
+            existingPublication,
+            withImportedPublication
+        );
+    }
+
+    protected abstract void updateExistingPublicationWithPublisher(
+        final T existingPublication,
+        final T withImportedPublication
+    );
+
 }
diff --git a/sci-publications/src/main/java/org/scientificcms/publications/AbstractUnPublishedImExporter.java b/sci-publications/src/main/java/org/scientificcms/publications/AbstractUnPublishedImExporter.java
index d07c7e9..fe7cf80 100644
--- a/sci-publications/src/main/java/org/scientificcms/publications/AbstractUnPublishedImExporter.java
+++ b/sci-publications/src/main/java/org/scientificcms/publications/AbstractUnPublishedImExporter.java
@@ -2,6 +2,7 @@ package org.scientificcms.publications;
 
 import org.librecms.assets.Organization;
 
+import java.util.Objects;
 import java.util.Set;
 
 /**
@@ -23,4 +24,49 @@ public abstract class AbstractUnPublishedImExporter<T extends UnPublished>
 
     protected abstract void initUnPublishedImExporter();
 
+    @Override
+    protected final void updateExistingPublication(
+        final T existingPublication,
+        final T withImportedPublication
+    ) {
+        if (!Objects.equals(
+            existingPublication.getPlace(),
+            withImportedPublication.getPlace()
+        )) {
+            existingPublication.setPlace(withImportedPublication.getPlace());
+        }
+
+        if (!Objects.equals(
+            existingPublication.getNumber(),
+            withImportedPublication.getNumber()
+        )) {
+            existingPublication.setNumber(
+                withImportedPublication.getNumber()
+            );
+        }
+
+        if (existingPublication.getNumberOfPages() != withImportedPublication
+            .getNumberOfPages()) {
+            existingPublication.setNumberOfPages(
+                withImportedPublication.getNumberOfPages()
+            );
+        }
+
+        if (!Objects.equals(
+            existingPublication.getOrganization(),
+            withImportedPublication.getOrganization()
+        )) {
+            existingPublication.setOrganization(
+                withImportedPublication.getOrganization()
+            );
+        }
+
+        updateExistingUnPublished(existingPublication, withImportedPublication);
+    }
+
+    protected abstract void updateExistingUnPublished(
+        final T existingPublication,
+        final T withImportedPublication
+    );
+
 }