From e4907494bbaedd81dccd7283e56ef34d00b86c46 Mon Sep 17 00:00:00 2001
From: Eliza Kalata <ekalata@man.poznan.pl>
Date: Wed, 6 Apr 2022 14:54:21 +0200
Subject: [PATCH 1/2] Fixing issue with conflict-at-source.

---
 .../services/items/ItemCrudService.java       |  6 ++----
 .../services/items/ItemsComparator.java       | 19 ++++++-------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemCrudService.java b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemCrudService.java
index 1059d64f..2705e242 100644
--- a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemCrudService.java
+++ b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemCrudService.java
@@ -251,15 +251,13 @@ abstract class ItemCrudService<I extends Item, D extends ItemDto, P extends Pagi
 
     private Item getLastItemBySource(@NonNull I currentItem, @NonNull Long sourceId, @NonNull String sourceItemId) {
         List<Item> history = loadItemHistory(currentItem);
-        for (Item historicalItem : history) {
+        for (Item historicalItem : history)
             if (historicalItem.getSource() != null) {
                 if (sourceId.equals(historicalItem.getSource().getId()) && sourceItemId.equals(
-                        historicalItem.getSourceItemId())) {
-                    // FIX ME whether check also an information contributor - System importer ?
+                        historicalItem.getSourceItemId()) && historicalItem.getInformationContributor().isSystemContributor()) {
                     return historicalItem;
                 }
             }
-        }
         return null;
     }
 
diff --git a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemsComparator.java b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemsComparator.java
index 94084702..63468274 100644
--- a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemsComparator.java
+++ b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemsComparator.java
@@ -16,14 +16,8 @@ import eu.sshopencloud.marketplace.mappers.tools.ToolMapper;
 import eu.sshopencloud.marketplace.mappers.trainings.TrainingMaterialMapper;
 import eu.sshopencloud.marketplace.mappers.workflows.StepMapper;
 import eu.sshopencloud.marketplace.mappers.workflows.WorkflowMapper;
-import eu.sshopencloud.marketplace.model.datasets.Dataset;
 import eu.sshopencloud.marketplace.model.items.Item;
 import eu.sshopencloud.marketplace.model.items.ItemCategory;
-import eu.sshopencloud.marketplace.model.publications.Publication;
-import eu.sshopencloud.marketplace.model.tools.Tool;
-import eu.sshopencloud.marketplace.model.trainings.TrainingMaterial;
-import eu.sshopencloud.marketplace.model.workflows.Step;
-import eu.sshopencloud.marketplace.model.workflows.Workflow;
 import lombok.experimental.UtilityClass;
 
 import java.time.ZoneId;
@@ -576,21 +570,20 @@ public class ItemsComparator {
         return itemsDifferencesCore;
     }
 
-
     public ItemDto toDto(Item item) {
         switch (item.getCategory()) {
             case TOOL_OR_SERVICE:
-                return ToolMapper.INSTANCE.toDto((Tool) item);
+                return ToolMapper.INSTANCE.toDto(item);
             case TRAINING_MATERIAL:
-                return TrainingMaterialMapper.INSTANCE.toDto((TrainingMaterial) item);
+                return TrainingMaterialMapper.INSTANCE.toDto(item);
             case PUBLICATION:
-                return PublicationMapper.INSTANCE.toDto((Publication) item);
+                return PublicationMapper.INSTANCE.toDto(item);
             case DATASET:
-                return DatasetMapper.INSTANCE.toDto((Dataset) item);
+                return DatasetMapper.INSTANCE.toDto(item);
             case WORKFLOW:
-                return WorkflowMapper.INSTANCE.toDto((Workflow) item);
+                return WorkflowMapper.INSTANCE.toDto(item);
             case STEP:
-                return StepMapper.INSTANCE.toDto((Step) item);
+                return StepMapper.INSTANCE.toDto(item);
             default:
                 return null;
         }
-- 
GitLab


From aa9a3738a08ce2bc61a829ef3f4197552b491a80 Mon Sep 17 00:00:00 2001
From: Eliza Kalata <ekalata@man.poznan.pl>
Date: Wed, 6 Apr 2022 15:51:53 +0200
Subject: [PATCH 2/2] Fixing issue with conflict-at-source.

---
 .../services/items/ItemCrudService.java       |  2 +-
 .../services/items/ItemsComparator.java       | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemCrudService.java b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemCrudService.java
index 2705e242..6be9660b 100644
--- a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemCrudService.java
+++ b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemCrudService.java
@@ -217,7 +217,7 @@ abstract class ItemCrudService<I extends Item, D extends ItemDto, P extends Pagi
             Item itemFromSource = getLastItemBySource(currentItem, itemCore.getSource().getId(),
                     itemCore.getSourceItemId());
             if (itemFromSource != null) {
-                itemDtoFromSource = ItemsComparator.toDto(itemFromSource);
+                itemDtoFromSource = ItemsComparator.toDtoSource(itemFromSource);
                 itemDtoFromSource.setRelatedItems(itemRelatedItemService.getItemRelatedItems(itemFromSource));
                 complete(itemDtoFromSource, itemFromSource);
             }
diff --git a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemsComparator.java b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemsComparator.java
index 63468274..de07fa6d 100644
--- a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemsComparator.java
+++ b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemsComparator.java
@@ -16,8 +16,14 @@ import eu.sshopencloud.marketplace.mappers.tools.ToolMapper;
 import eu.sshopencloud.marketplace.mappers.trainings.TrainingMaterialMapper;
 import eu.sshopencloud.marketplace.mappers.workflows.StepMapper;
 import eu.sshopencloud.marketplace.mappers.workflows.WorkflowMapper;
+import eu.sshopencloud.marketplace.model.datasets.Dataset;
 import eu.sshopencloud.marketplace.model.items.Item;
 import eu.sshopencloud.marketplace.model.items.ItemCategory;
+import eu.sshopencloud.marketplace.model.publications.Publication;
+import eu.sshopencloud.marketplace.model.tools.Tool;
+import eu.sshopencloud.marketplace.model.trainings.TrainingMaterial;
+import eu.sshopencloud.marketplace.model.workflows.Step;
+import eu.sshopencloud.marketplace.model.workflows.Workflow;
 import lombok.experimental.UtilityClass;
 
 import java.time.ZoneId;
@@ -571,6 +577,25 @@ public class ItemsComparator {
     }
 
     public ItemDto toDto(Item item) {
+        switch (item.getCategory()) {
+            case TOOL_OR_SERVICE:
+                return ToolMapper.INSTANCE.toDto((Tool) item);
+            case TRAINING_MATERIAL:
+                return TrainingMaterialMapper.INSTANCE.toDto( (TrainingMaterial) item);
+            case PUBLICATION:
+                return PublicationMapper.INSTANCE.toDto((Publication) item);
+            case DATASET:
+                return DatasetMapper.INSTANCE.toDto((Dataset) item);
+            case WORKFLOW:
+                return WorkflowMapper.INSTANCE.toDto((Workflow) item);
+            case STEP:
+                return StepMapper.INSTANCE.toDto((Step) item);
+            default:
+                return null;
+        }
+    }
+
+    public ItemDto toDtoSource(Item item) {
         switch (item.getCategory()) {
             case TOOL_OR_SERVICE:
                 return ToolMapper.INSTANCE.toDto(item);
-- 
GitLab