From ab5ac3d5bbf9feeb1a6492e9a6de06049d5a6eac Mon Sep 17 00:00:00 2001
From: Eliza Kalata <ekalata@man.poznan.pl>
Date: Thu, 10 Mar 2022 12:58:41 +0100
Subject: [PATCH] Refactoring for compose of.

---
 .../marketplace/services/items/ItemVisibilityService.java     | 4 +---
 .../marketplace/services/items/ItemsComparator.java           | 3 ++-
 .../marketplace/services/items/WorkflowService.java           | 2 --
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemVisibilityService.java b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemVisibilityService.java
index ec34d57a..50e5ebae 100644
--- a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemVisibilityService.java
+++ b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemVisibilityService.java
@@ -74,12 +74,10 @@ class ItemVisibilityService {
     public boolean shouldSeeItem(Item item, User user) {
         if (item.getStatus().equals(ItemStatus.DEPRECATED))
             return false;
-
-        System.out.println("Eliza " + hasAccessToVersion(item, user));
         return hasAccessToVersion(item, user);
     }
 
-    //Eliza
+
     public boolean hasAccessToVersion(Item version, User user) {
 
         ItemStatus itemStatus = version.getStatus();
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 3a8529fc..94084702 100644
--- a/src/main/java/eu/sshopencloud/marketplace/services/items/ItemsComparator.java
+++ b/src/main/java/eu/sshopencloud/marketplace/services/items/ItemsComparator.java
@@ -596,7 +596,6 @@ public class ItemsComparator {
         }
     }
 
-    //Eliza
     public ItemsDifferencesDto differentiateComposedOf(WorkflowDto item, WorkflowDto other, ItemsDifferencesDto differences) {
 
         int itemSize = item.getComposedOf() != null ? item.getComposedOf().size() : 0;
@@ -614,6 +613,8 @@ public class ItemsComparator {
                     differences.setEqual(false);
                 }
             }
+            if (itemSize != otherSize)
+                differences.setEqual(false);
         } else {
             if (other.getComposedOf() != null) {
                 differences.setEqual(false);
diff --git a/src/main/java/eu/sshopencloud/marketplace/services/items/WorkflowService.java b/src/main/java/eu/sshopencloud/marketplace/services/items/WorkflowService.java
index 1d81a416..ca47e0c3 100644
--- a/src/main/java/eu/sshopencloud/marketplace/services/items/WorkflowService.java
+++ b/src/main/java/eu/sshopencloud/marketplace/services/items/WorkflowService.java
@@ -408,8 +408,6 @@ public class WorkflowService extends ItemCrudService<Workflow, WorkflowDto, Pagi
                 collectSteps((WorkflowDto) differencesDto.getOther(), super.loadItemVersion(otherPersistentId, otherVersionId));
             collectSteps((WorkflowDto) differencesDto.getOther(), super.loadCurrentItem(otherPersistentId));
 
-            System.out.println("Eliza in " + ((WorkflowDto) differencesDto.getOther()).getComposedOf());
-            System.out.println("Eliza in " + ((WorkflowDto) differencesDto.getItem()).getComposedOf());
             return super.differentiateComposedOf((WorkflowDto) differencesDto.getItem(), (WorkflowDto) differencesDto.getOther(), differencesDto);
         } else return differencesDto;
     }
-- 
GitLab