From 94ad99ee24aec3153f110c83b76b87295d20bc0c Mon Sep 17 00:00:00 2001 From: Nour Eldien Ayman Date: Mon, 19 May 2025 19:28:32 +0300 Subject: [PATCH] Refactor relationships in AssignedOrders and Stock models --- .../com/podzilla/warehouse/Models/AssignedOrders.java | 2 +- src/main/java/com/podzilla/warehouse/Models/Stock.java | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/podzilla/warehouse/Models/AssignedOrders.java b/src/main/java/com/podzilla/warehouse/Models/AssignedOrders.java index 148a7fa..8ac3121 100644 --- a/src/main/java/com/podzilla/warehouse/Models/AssignedOrders.java +++ b/src/main/java/com/podzilla/warehouse/Models/AssignedOrders.java @@ -33,7 +33,7 @@ public class AssignedOrders { private LocalDateTime assignedAt; @Column(nullable = false) - @OneToMany(mappedBy = "packagedOrder") + @OneToMany(mappedBy = "assignedOrder") private List items; @Column(nullable = false) diff --git a/src/main/java/com/podzilla/warehouse/Models/Stock.java b/src/main/java/com/podzilla/warehouse/Models/Stock.java index a3c0331..7344f0d 100644 --- a/src/main/java/com/podzilla/warehouse/Models/Stock.java +++ b/src/main/java/com/podzilla/warehouse/Models/Stock.java @@ -34,8 +34,14 @@ public class Stock { @Column(nullable = false) private String category; + + // Add a new ManyToOne relationship back to AssignedOrders + @ManyToOne + @JoinColumn(name = "assigned_order_id", nullable = true) // Use a different join column name + private AssignedOrders assignedOrder; // Use a different field name + @ManyToOne - @JoinColumn(name = "order_id", nullable = true) + @JoinColumn(name = "packaged_order_id", nullable = true) private PackagedOrders packagedOrder; @CreationTimestamp @Column(updatable = false)