Changeset 676144b for src/main/java/com/example/autopartz/model

Timestamp:

01/05/23 04:11:40 (21 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Children:

1bd8d1e

Parents:

7d43957

Message:

Added admin view of pending roles and approve functionality

Location:

src/main/java/com/example/autopartz/model

Files:

• Administrator.java (modified) (1 diff)
• Client.java (modified) (1 diff)
• Deliveryman.java (modified) (1 diff)
• User.java (modified) (3 diffs)
• Warehouseman.java (modified) (2 diffs)
• views/ReviewsForUser.java (modified) (1 diff)

src/main/java/com/example/autopartz/model/Administrator.java

@@ -27 +27 @@
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         Administrator that = (Administrator) o;
-        return ID_user != null && Objects.equals(ID_user, that.ID_user);
+        return id != null && Objects.equals(id, that.id);
     }
 

src/main/java/com/example/autopartz/model/Client.java

@@ -28 +28 @@
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         Client client = (Client) o;
-        return ID_user != null && Objects.equals(ID_user, client.ID_user);
+        return id != null && Objects.equals(id, client.id);
     }
 

src/main/java/com/example/autopartz/model/Deliveryman.java

@@ -35 +35 @@
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         Deliveryman that = (Deliveryman) o;
-        return ID_user != null && Objects.equals(ID_user, that.ID_user);
+        return id != null && Objects.equals(id, that.id);
     }
 

src/main/java/com/example/autopartz/model/User.java

@@ -25 +25 @@
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    Integer ID_user;
+    @Column(name = "ID_user")
+    Integer id;
     String username;
     String email;
-    String name_user;
+    @Column(name = "name_user")
+    String name;
     @Column(name = "password_user")
     String password;
@@ -39 +41 @@
     public User(String username, String name, String email, String password, String number) {
         this.username = username;
-        this.name_user = name;
+        this.name = name;
         this.email = email;
         this.password = password;
@@ -51 +53 @@
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         User user = (User) o;
-        return ID_user != null && Objects.equals(ID_user, user.ID_user);
+        return id != null && Objects.equals(id, user.id);
     }
 

src/main/java/com/example/autopartz/model/Warehouseman.java

@@ -39 +39 @@
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         Warehouseman that = (Warehouseman) o;
-        return ID_user != null && Objects.equals(ID_user, that.ID_user);
+        return id != null && Objects.equals(id, that.id);
     }
 
@@ -48 +48 @@
     @Override
     public Collection<? extends GrantedAuthority> getAuthorities() {
-        if(employed_from==defaultEmployedFrom)
+        if(Objects.equals(employed_from, defaultEmployedFrom))
             return Collections.singletonList(Role.ROLE_PENDING_WAREHOUSEMAN);
         else

src/main/java/com/example/autopartz/model/views/ReviewsForUser.java

@@ -28 +28 @@
     Integer userid;
     Integer rating;
+    Integer orderid;
     String rcomment;
     String rsname;