Changeset a0e93df

Timestamp:

01/23/25 19:37:29 (3 months ago)

Author:

Ljubomir Ilievski <ilievski.ljubomir@…>

Branches:

master

Children:

be26658

Parents:

f9ef3e8

Message:

removed partial lombok

Location:

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model

Files:

• Customer.java (modified) (2 diffs)
• JWTAuthenticationResponse.java (modified) (2 diffs)
• Local.java (modified) (2 diffs)
• User.java (modified) (3 diffs)

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/Customer.java

@@ -14 +14 @@
 
 @EqualsAndHashCode(callSuper = true)
-@Data
+
 @Entity
-@AllArgsConstructor
-@NoArgsConstructor
 public class Customer extends User {
     public Customer(String firstName, String lastName, String email, String password, String phoneNumber, Role userRole) {
         super(firstName, lastName, email, password, phoneNumber, userRole);
+    }
+
+    public Customer() {
+    }
+
+    public Customer(List<Reservation> reservations, List<Local> favouriteLocals) {
+        this.reservations = reservations;
+        this.favouriteLocals = favouriteLocals;
     }
 
@@ -29 +35 @@
     private List<Local> favouriteLocals;
 
+    public List<Reservation> getReservations() {
+        return reservations;
+    }
+
+    public List<Local> getFavouriteLocals() {
+        return favouriteLocals;
+    }
 
 }

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/JWTAuthenticationResponse.java

@@ -6 +6 @@
 import mk.ukim.finki.it.reservengo.model.enumerations.Role;
 
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
+
 public class JWTAuthenticationResponse {
     private Long id;
@@ -17 +15 @@
     private Role role;
     private String token;
+
+    public JWTAuthenticationResponse(Long id, String firstName, String lastName, String email, String phoneNumber, Role role, String token) {
+        this.id = id;
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.email = email;
+        this.phoneNumber = phoneNumber;
+        this.role = role;
+        this.token = token;
+    }
+
+    public JWTAuthenticationResponse() {}
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public Role getRole() {
+        return role;
+    }
+
+    public String getToken() {
+        return token;
+    }
 }

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/Local.java

@@ -10 +10 @@
 import java.util.Map;
 
-@Data
+
 @Entity
-@AllArgsConstructor
-@NoArgsConstructor
 @Table(name = "local_")
 public class Local {
     public Local(String name, String description, String address, String workingHours, List<Service> availableServices, Map<Long, Integer> ratings, List<Event> events, List<String> localPhotos, String menuPhoto, String menuLink, Contact contact, List<Reservation> reservations, List<LocalWorker> workers) {
+        this.name = name;
+        this.description = description;
+        this.address = address;
+        this.workingHours = workingHours;
+        this.availableServices = availableServices;
+        this.ratings = ratings;
+        this.events = events;
+        this.localPhotos = localPhotos;
+        this.menuPhoto = menuPhoto;
+        this.menuLink = menuLink;
+        this.contact = contact;
+        this.reservations = reservations;
+        this.workers = workers;
+    }
+
+    public Local() {
+    }
+
+    public Local(Long id, String name, String description, String address, String workingHours, List<Service> availableServices, Map<Long, Integer> ratings, List<Event> events, List<String> localPhotos, String menuPhoto, String menuLink, Contact contact, List<Reservation> reservations, List<LocalWorker> workers) {
+        this.id = id;
         this.name = name;
         this.description = description;
@@ -70 +88 @@
     @OneToMany(mappedBy = "local")
     private List<LocalWorker> workers;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public String getWorkingHours() {
+        return workingHours;
+    }
+
+    public List<Service> getAvailableServices() {
+        return availableServices;
+    }
+
+    public Map<Long, Integer> getRatings() {
+        return ratings;
+    }
+
+    public List<Event> getEvents() {
+        return events;
+    }
+
+    public List<String> getLocalPhotos() {
+        return localPhotos;
+    }
+
+    public String getMenuPhoto() {
+        return menuPhoto;
+    }
+
+    public String getMenuLink() {
+        return menuLink;
+    }
+
+    public Contact getContact() {
+        return contact;
+    }
+
+    public List<Reservation> getReservations() {
+        return reservations;
+    }
+
+    public List<LocalWorker> getWorkers() {
+        return workers;
+    }
 }

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/model/User.java

@@ -14 +14 @@
 import java.util.List;
 
-@Data
+
 @Entity
-@AllArgsConstructor
-@NoArgsConstructor
 @Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "app_user")
@@ -53 +51 @@
     }
 
+    public User() {}
+
+    public User(Long id, String firstName, String lastName, String email, String password, String phoneNumber, Role userRole) {
+        this.id = id;
+        this.firstName = firstName;
+        this.lastName = lastName;
+        this.email = email;
+        this.password = password;
+        this.phoneNumber = phoneNumber;
+        this.userRole = userRole;
+    }
+
     @Override
     public String getPassword() {
@@ -83 +93 @@
     }
 
-//    public Long getId() {
-//        return id;
-//    }
-//
-//    public String getFirstName() {
-//        return firstName;
-//    }
-//
-//    public String getLastName() {
-//        return lastName;
-//    }
-//
-//    public String getEmail() {
-//        return email;
-//    }
-//
-//    public String getPhoneNumber() {
-//        return phoneNumber;
-//    }
-//
-//    public Role getUserRole() {
-//        return userRole;
-//    }
+    public Long getId() {
+        return id;
+    }
+
+    public String getFirstName() {
+        return firstName;
+    }
+
+    public String getLastName() {
+        return lastName;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public Role getUserRole() {
+        return userRole;
+    }
 
 //    @Override