Changeset 8ca35dc for src/main/java/com/example/rezevirajmasa/demo/model

Timestamp:

01/19/25 23:18:37 (4 months ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

f5b256e

Parents:

db39d9e

Message:

Done with stupid timeslots

Location:

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

Files:

• Reservation.java (modified) (5 diffs)
• Restaurant.java (modified) (4 diffs)
• User.java (modified) (2 diffs)

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

@@ -16 +16 @@
 
     @ManyToOne
-    @JoinColumn(name = "CustomerID")
-    private Customer customer;
+    @JoinColumn(name = "UserID")
+    private User user;
 
     @ManyToOne
@@ -68 +68 @@
     }
 
-    public Reservation(Customer customer, TableEntity table, Restaurant restaurant, LocalDateTime reservationDateTime, int partySize, String specialRequests, String status, LocalDateTime checkInTime, LocalDateTime checkOutTime, String paymentStatus) {
+    public Reservation(User user, TableEntity table, Restaurant restaurant, LocalDateTime reservationDateTime, int partySize, String specialRequests, String status, LocalDateTime checkInTime, LocalDateTime checkOutTime, String paymentStatus) {
 //        this.customer = customer;
         this.table = table;
+        this.user = user;
         this.restaurant = restaurant;
         this.reservationDateTime = reservationDateTime;
@@ -81 +82 @@
     }
 
+    public User getUser() {
+        return user;
+    }
+
+    public void setUser(User user) {
+        this.user = user;
+    }
+
     public Long getReservationID() {
         return reservationID;
@@ -89 +98 @@
     }
 
-    public Customer getCustomer() {
-        return customer;
-    }
-
-    public void setCustomer(Customer customer) {
-        this.customer = customer;
-    }
 
     public TableEntity getTable() {
@@ -173 +175 @@
         return "Reservation{" +
                 "reservationID=" + reservationID +
-                ", customer=" + customer +
+                ", customer=" + user +
                 ", table=" + table +
                 ", restaurant=" + restaurant +

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

@@ -151 +151 @@
         @ManyToOne
         @JoinColumn(name = "customer_id")
-        private Customer customer;
+        private User user;
 
         @ManyToOne
@@ -179 +179 @@
         private LocalDateTime checkInDate;
 
-        public ReservationHistory(Customer customer, TableEntity table, Restaurant restaurant, LocalDateTime reservationDateTime, int partySize, String specialRequests, String status, String cancellationReason, LocalDateTime checkInDate) {
-            this.customer = customer;
+        public ReservationHistory(User user, TableEntity table, Restaurant restaurant, LocalDateTime reservationDateTime, int partySize, String specialRequests, String status, String cancellationReason, LocalDateTime checkInDate) {
+            this.user = user;
             this.table = table;
             this.restaurant = restaurant;
@@ -202 +202 @@
         }
 
-        public Customer getCustomer() {
-            return customer;
-        }
-
-        public void setCustomer(Customer customer) {
-            this.customer = customer;
+        public User getUser() {
+            return user;
+        }
+
+        public void setUser(User user) {
+            this.user = user;
         }
 
@@ -278 +278 @@
             return "ReservationHistory{" +
                     "id=" + id +
-                    ", customer=" + customer +
+                    ", user=" + user +
                     ", table=" + table +
                     ", restaurant=" + restaurant +

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

@@ -7 +7 @@
 import lombok.NoArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
+
+import java.util.Date;
 
 @AllArgsConstructor
@@ -31 +33 @@
     @Column(nullable = false)
     private String password;
+
+    @Enumerated(EnumType.STRING)
+    private Role role;
+
+    @Column(name = "Phone", length = 20)
+    private String phone;
+
+    @Column(name = "Address", columnDefinition = "TEXT")
+    private String address;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "MembershipLevel", length = 20)
+    private MembershipLevel membershipLevel;
+
+    @Column(name = "RegistrationDate", columnDefinition = "TIMESTAMP DEFAULT CURRENT_TIMESTAMP")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date registrationDate;
 }