Changeset b67dfd3 for src/main/java/com/example/rezevirajmasa/demo/model

Timestamp:

05/06/25 00:44:02 (13 days ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

e48199a

Parents:

142c0f8

Message:

Normalization needed to continue, till here done

Location:

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

Files:

• Customer.java (deleted)
• Menu.java (modified) (2 diffs)
• MenuTag.java (modified) (1 diff)
• PreorderedItem.java (modified) (1 diff)
• Reservation.java (modified) (5 diffs)
• Restaurant.java (modified) (7 diffs)
• TableEntity.java (modified) (2 diffs)
• User.java (modified) (1 diff)

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

@@ -26 +26 @@
     private String itemName;
 
-    @Column(name = "category", length = 50)
-    private String category;
+    @Column(name = "menuCategory", length = 50)
+    private String menuCategory;
 
     @Column(name = "price", precision = 8, scale = 2)
@@ -45 +45 @@
         this.restaurant = restaurant;
         this.itemName = itemName;
-        this.category = category;
+        this.menuCategory = category;
         this.price = price;
         this.description = description;

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

@@ -11 +11 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private Long menuTagId;
 
     @ManyToOne(fetch = FetchType.LAZY)

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

@@ -20 +20 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private Long preorderedItemId;
 
-    private String name;
+    private String preorderedItemName;
 
     private Integer quantity;

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

@@ -48 +48 @@
 
     @Column(name = "Status", length = 20, nullable = false)
-    private String status;
+    private String reservationStatus;
 
     @Column(name = "CheckInTime")
@@ -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<>();
-    @OneToMany(mappedBy = "reservation", cascade = CascadeType.ALL, orphanRemoval = true)
+    @OneToMany(mappedBy = "reservation", cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY)
     private List<PreorderedItem> preOrderedItems = new ArrayList<>();
 
@@ -73 +69 @@
     @PrePersist
     private void prePersist() {
-        if (status == null) {
-            status = "Pending";
+        if (reservationStatus == null) {
+            reservationStatus = "Pending";
         }
         if (paymentStatus == null) {
@@ -88 +84 @@
         this.partySize = partySize;
         this.specialRequests = specialRequests;
-        this.status = status;
+        this.reservationStatus = status;
         this.checkInTime = checkInTime;
         this.checkOutTime = checkOutTime;
@@ -105 +101 @@
                 ", partySize=" + partySize +
                 ", specialRequests='" + specialRequests + '\'' +
-                ", status='" + status + '\'' +
+                ", status='" + reservationStatus + '\'' +
                 ", checkInTime=" + checkInTime +
                 ", checkOutTime=" + checkOutTime +

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

@@ -146 +146 @@
         @Id
         @GeneratedValue(strategy = GenerationType.IDENTITY)
-        private Long id;
+        private Long reservationHistoryId;
 
         @ManyToOne
@@ -170 +170 @@
 
         @Column(name = "status")
-        private String status;
+        private String reservationStatus;
 
         @Column(name = "cancellation_reason")
@@ -185 +185 @@
             this.partySize = partySize;
             this.specialRequests = specialRequests;
-            this.status = status;
+            this.reservationStatus = status;
             this.cancellationReason = cancellationReason;
             this.checkInDate = checkInDate;
@@ -194 +194 @@
 
         public Long getId() {
-            return id;
+            return reservationHistoryId;
         }
 
         public void setId(Long id) {
-            this.id = id;
+            this.reservationHistoryId = id;
         }
 
@@ -242 +242 @@
 
         public String getStatus() {
-            return status;
+            return reservationStatus;
         }
 
         public void setStatus(String status) {
-            this.status = status;
+            this.reservationStatus = status;
         }
 
@@ -276 +276 @@
         public String toString() {
             return "ReservationHistory{" +
-                    "id=" + id +
+                    "id=" + reservationHistoryId +
                     ", user=" + user +
                     ", table=" + table +
@@ -283 +283 @@
                     ", partySize=" + partySize +
                     ", specialRequests='" + specialRequests + '\'' +
-                    ", status='" + status + '\'' +
+                    ", status='" + reservationStatus + '\'' +
                     ", cancellationReason='" + cancellationReason + '\'' +
                     ", checkInDate=" + checkInDate +

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

@@ -36 +36 @@
     private int capacity;
 
-    @Column(name = "Location")
-    private String location;
+    @Column(name = "tableLocation")
+    private String tableLocation;
 
     @Column(name = "IsSmokingArea")
@@ -95 +95 @@
         this.restaurant = restaurant;
         this.capacity = capacity;
-        this.location = location;
+        this.tableLocation = location;
         this.isSmokingArea = isSmokingArea;
         this.description = description;

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

@@ -21 +21 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    private Long userId;
 
     @Column(name = "first_name")