fixing merge-conflict

ADPRO-C11 · May 25, 2024 · 860d6b1 · 860d6b1
1 parent 76b767f
commit 860d6b1
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/main/java/id/ac/ui/cs/advprog/snackscription_subscriptionbox/model/Item.java b/src/main/java/id/ac/ui/cs/advprog/snackscription_subscriptionbox/model/Item.java
@@ -1,5 +1,6 @@
 package id.ac.ui.cs.advprog.snackscription_subscriptionbox.model;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -19,15 +20,15 @@ public class Item {
     private int quantity;
 
     @ManyToMany(mappedBy = "items")
+    @JsonBackReference
     private List<SubscriptionBox> subscriptionBoxes;
 
-    // Konstruktor default
-    public Item() {}
-
-    // Konstruktor dengan parameter
     public Item(String id, String name, int quantity) {
         this.id = id;
         this.name = name;
         this.quantity = quantity;
     }
+
+    public Item() {
+    }
 }