Changeset 2518b3a for src/main/java/com/example/rezevirajmasa/demo/model

Timestamp:

05/02/25 00:37:10 (3 weeks ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

c44c5ed

Parents:

e15e8d9

Message:

Added menu tag

succesfull testing and implemnation

Location:

src/main/java/com/example/rezevirajmasa/demo/model

Files:

• Menu.java (modified) (3 diffs)
• MenuTag.java (added)
• PreorderedItem.java (added)
• Reservation.java (modified) (2 diffs)
• Restaurant.java (modified) (1 diff)
• TableEntity.java (modified) (1 diff)

src/main/java/com/example/rezevirajmasa/demo/model/Menu.java

@@ -6 +6 @@
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
 
 @Entity
@@ -13 +15 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "MenuID")
+    @Column(name = "menu_id")
     private Long menuID;
 
     @ManyToOne
-    @JoinColumn(name = "RestaurantID", nullable = false)
+    @JoinColumn(name = "restaurant_id", nullable = false)
     @JsonIgnore
     private Restaurant restaurant;
 
-    @Column(name = "ItemName", length = 100)
+    @Column(name = "item_name", length = 100)
     private String itemName;
 
-    @Column(name = "Category", length = 50)
+    @Column(name = "category", length = 50)
     private String category;
 
-    @Column(name = "Price", precision = 8, scale = 2)
+    @Column(name = "price", precision = 8, scale = 2)
     private BigDecimal price;
 
-    @Column(name = "Description")
+    @Column(name = "description")
     private String description;
 
-    @Column(name = "DietaryInformation", columnDefinition = "JSONB")
-    private String dietaryInformation;
+    @OneToMany(mappedBy = "menu", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
+    private List<MenuTag> tags = new ArrayList<>();
 
     public Menu() {
     }
 
-    public Menu(Restaurant restaurant, String itemName, String category, BigDecimal price, String description, String dietaryInformation) {
+    public Menu(Long menuID, Restaurant restaurant, String itemName, String category, BigDecimal price, String description, List<MenuTag> tags) {
+        this.menuID = menuID;
         this.restaurant = restaurant;
         this.itemName = itemName;
@@ -45 +48 @@
         this.price = price;
         this.description = description;
-        this.dietaryInformation = dietaryInformation;
+        this.tags = tags;
     }
 }

src/main/java/com/example/rezevirajmasa/demo/model/Reservation.java

@@ -26 +26 @@
     @ManyToOne
     @JoinColumn(name = "UserID")
-    @JsonManagedReference
+    @JsonBackReference(value = "user-reservations")
     private User user;
 
@@ -57 +57 @@
     private LocalDateTime checkOutTime;
 
-    @ElementCollection
-    @CollectionTable(name = "reservation_preordered_items", joinColumns = @JoinColumn(name = "reservation_id"))
-    @Column(name = "item")
-    private List<String> preOrderedItems = new ArrayList<>();
+//    @ElementCollection
+//    @CollectionTable(name = "reservation_preordered_items", joinColumns = @JoinColumn(name = "reservation_id"))
+//    @Column(name = "item")
+//    private List<String> preOrderedItems = new ArrayList<>();
+    @OneToMany(mappedBy = "reservation", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<PreorderedItem> preOrderedItems = new ArrayList<>();
 
     @Column(name = "PaymentStatus", length = 20, nullable = false, columnDefinition = "VARCHAR default 'Unpaid'")

src/main/java/com/example/rezevirajmasa/demo/model/Restaurant.java

@@ -41 +41 @@
     private BigDecimal rating;
 
-    @JsonIgnore
+    @JsonManagedReference
     @OneToMany(mappedBy = "restaurant", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private List<TableEntity> tablesList;

src/main/java/com/example/rezevirajmasa/demo/model/TableEntity.java

@@ -29 +29 @@
 
     @JsonBackReference
-    @ManyToOne(fetch = FetchType.EAGER)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "RestaurantID")
     private Restaurant restaurant;