Fix fusions loosing relations (#48)

* Cleaning and stack friendly fixes * Cleaning * Fix fusions * Finally fix Fusion dropping relations, aka. "Neo4j fix your shit" commit.
AlexPresso · Jan 18, 2025 · 9ad6df8 · 9ad6df8
1 parent 02540b7
commit 9ad6df8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/src/main/java/me/alexpresso/zuninja/domain/base/BaseGraphObject.java b/src/main/java/me/alexpresso/zuninja/domain/base/BaseGraphObject.java
@@ -18,4 +18,8 @@ public String getGraphObjectId() {
     public String getId() {
         return this.id;
     }
+    public BaseGraphObject setId(String id) {
+        this.id = id;
+        return this;
+    }
 }
diff --git a/src/main/java/me/alexpresso/zuninja/domain/nodes/item/Fusion.java b/src/main/java/me/alexpresso/zuninja/domain/nodes/item/Fusion.java
@@ -18,7 +18,6 @@
 public class Fusion extends BaseGraphObject {
     @Relationship(type = "FUSION_INPUT", direction = Relationship.Direction.INCOMING)
     private Set<FusionToInput> inputs = new HashSet<>();
-    @JsonProperty("item")
     @Relationship(type = "FUSION_RESULT", direction = Relationship.Direction.OUTGOING)
     private Item result;
 
@@ -58,4 +57,10 @@ public Fusion setResult(final Item item) {
         this.result = item;
         return this;
     }
+
+    @JsonProperty("item")
+    public void unpackResultItem(final Item item) {
+        this.result = item;
+        this.setId(item.getId());
+    }
 }
diff --git a/src/main/java/me/alexpresso/zuninja/services/item/ItemServiceImpl.java b/src/main/java/me/alexpresso/zuninja/services/item/ItemServiceImpl.java
@@ -110,10 +110,10 @@ public void updateFusions(final Map<String, Item> items) throws IOException, Int
 
         final var fusions = this.fetchFusions();
         final var dbFusions = this.getFusions().stream()
-            .collect(Collectors.toMap(f -> f.getResult().getId(), Function.identity()));
+            .collect(Collectors.toMap(Fusion::getId, Function.identity()));
 
-        fusions.forEach(f -> dbFusions.put(f.getResult().getId(), dbFusions.getOrDefault(f.getResult().getId(), f)
-            .setResult(items.getOrDefault(f.getResult().getId(), f.getResult()))
+        fusions.forEach(f -> dbFusions.put(f.getId(), dbFusions.getOrDefault(f.getId(), f)
+            .setResult(items.get(f.getId()))
             .setInputs(f.getInputs().stream()
                 .collect(Collectors.toMap(in -> items.get(in.getItem().getId()), FusionToInput::getQuantity))
             )