Changeset be26658

Timestamp:

01/23/25 19:48:46 (3 months ago)

Author:

Nikola Jordanoski <nikolaj_koko@…>

Branches:

master

Children:

d10a9aa

Parents:

a0e93df

Message:

Removed lombok in ceratin classes

Location:

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

Files:

• model/Admin.java (modified) (1 diff)
• model/Customer.java (modified) (2 diffs)
• model/Local.java (modified) (1 diff)
• model/LocalManager.java (modified) (1 diff)
• model/LocalWorker.java (modified) (2 diffs)
• model/User.java (modified) (4 diffs)
• service/impl/AuthServiceImpl.java (modified) (1 diff)

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

@@ -9 +9 @@
 
 @EqualsAndHashCode(callSuper = true)
-@Data
 @Entity
-@NoArgsConstructor
 public class Admin extends User {
     public Admin(String email, String password, Role userRole) {
         super(null, null, email, password, null, userRole);
     }
+
+    public Admin() {
+    }
 }

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

@@ -12 +12 @@
 import java.util.List;
 
-
 @EqualsAndHashCode(callSuper = true)
-
 @Entity
 public class Customer extends User {
@@ -22 +20 @@
 
     public Customer() {
-    }
-
-    public Customer(List<Reservation> reservations, List<Local> favouriteLocals) {
-        this.reservations = reservations;
-        this.favouriteLocals = favouriteLocals;
     }
 

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

@@ -31 +31 @@
 
     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;
-        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;
     }
 

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

@@ -10 +10 @@
 
 @EqualsAndHashCode(callSuper = true)
-@Data
 @Entity
-@NoArgsConstructor
 public class LocalManager extends LocalWorker {
     public LocalManager(String firstName, String lastName, String email, String password, String phoneNumber, Role userRole) {
         super(firstName, lastName, email, password, phoneNumber, userRole);
     }
+
+    public LocalManager() {
+    }
 }

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

@@ -10 +10 @@
 
 @EqualsAndHashCode(callSuper = true)
-@Data
 @Entity
-@AllArgsConstructor
-@NoArgsConstructor
 public class LocalWorker extends User {
     public LocalWorker(String firstName, String lastName, String email, String password, String phoneNumber, Role userRole) {
         super(firstName, lastName, email, password, phoneNumber, userRole);
+    }
+
+    public LocalWorker() {
     }
 
@@ -24 +24 @@
     @Enumerated(EnumType.STRING)
     private Position position;
+
+    public Local getLocal() {
+        return local;
+    }
+
+    public Position getPosition() {
+        return position;
+    }
 }

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

@@ -14 +14 @@
 import java.util.List;
 
-
 @Entity
 @Inheritance(strategy = InheritanceType.JOINED)
@@ -26 +25 @@
         this.phoneNumber = phoneNumber;
         this.userRole = userRole;
+    }
+
+    public User() {
     }
 
@@ -48 +50 @@
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
-        return List.of(new SimpleGrantedAuthority(userRole.name())); //check here:IMPORTANT
-    }
-
-    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;
+        return List.of(new SimpleGrantedAuthority(userRole.name()));
     }
 
@@ -116 +106 @@
         return userRole;
     }
-
-//    @Override
-//    public String toString() {
-//        return "User{" +
-//                "id=" + id +
-//                ", firstName='" + firstName + '\'' +
-//                ", lastName='" + lastName + '\'' +
-//                ", email='" + email + '\'' +
-//                ", password='" + password + '\'' +
-//                ", phoneNumber='" + phoneNumber + '\'' +
-//                ", userRole=" + userRole +
-//                '}';
-//    }
 }

ReserveNGo-backend/src/main/java/mk/ukim/finki/it/reservengo/service/impl/AuthServiceImpl.java

@@ -104 +104 @@
                 jwt);
     }
-
 }