Changeset ae042f4 for src/main/java/com/example/autopartz/model

Timestamp:

01/04/23 02:49:26 (21 months ago)

Author:

andrejtodorovski <82031894+andrejtodorovski@…>

Branches:

main

Children:

ab952ab

Parents:

6832924

Message:

Configured spring security, changed spring version

Location:

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

Files:

• Administrator.java (modified) (2 diffs)
• Car.java (modified) (2 diffs)
• CarManufacturer.java (modified) (2 diffs)
• CarSample.java (modified) (1 diff)
• Category.java (modified) (2 diffs)
• Client.java (modified) (2 diffs)
• Delivery.java (modified) (2 diffs)
• Deliveryman.java (modified) (2 diffs)
• Order.java (modified) (2 diffs)
• Part.java (modified) (3 diffs)
• PartManufacturer.java (modified) (2 diffs)
• Price.java (modified) (2 diffs)
• Repair.java (modified) (2 diffs)
• RepairShop.java (modified) (2 diffs)
• Review.java (modified) (2 diffs)
• Role.java (added)
• ServiceBook.java (modified) (2 diffs)
• User.java (modified) (3 diffs)
• Warehouse.java (modified) (2 diffs)
• Warehouseman.java (modified) (2 diffs)
• views/OrdersForUser.java (modified) (2 diffs)
• views/OrdersForUserId.java (modified) (1 diff)
• views/PartsForCarTypeAndCategory.java (modified) (2 diffs)
• views/RepairShopReviewsSummary.java (modified) (2 diffs)
• views/RepairsForUser.java (modified) (3 diffs)
• views/ReviewsForUser.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.*;
-import lombok.*;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
+import org.springframework.security.core.GrantedAuthority;
 
+import javax.persistence.Entity;
 import java.time.LocalDate;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Objects;
 
@@ -29 +34 @@
         return getClass().hashCode();
     }
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return Collections.singletonList(Role.ROLE_ADMIN);
+    }
 }

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.*;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
 
+import javax.persistence.*;
 import java.util.Objects;
 
@@ -15 +18 @@
 public class Car {
     @Id
-    Long ID_car;
+    Integer ID_car;
     Integer in_production_since;
     Integer in_production_till;

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Objects;
 
@@ -17 +20 @@
 public class CarManufacturer {
     @Id
-    Long ID_car_manufacturer;
+    Integer ID_car_manufacturer;
     String cm_name;
     String cm_country;

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.*;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
 
+import javax.persistence.*;
 import java.util.Objects;
 

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.*;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
 
+import javax.persistence.*;
 import java.util.Objects;
 
@@ -14 +17 @@
 public class Category {
     @Id
-    Long ID_category;
+    Integer ID_category;
     @Column(name = "category_name")
     String cname;

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.Entity;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
+import org.springframework.security.core.GrantedAuthority;
 
+import javax.persistence.Entity;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Objects;
 
@@ -25 +31 @@
         return getClass().hashCode();
     }
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return Collections.singletonList(Role.ROLE_CLIENT);
+    }
 }

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.*;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
 
+import javax.persistence.*;
 import java.util.Objects;
 
@@ -14 +17 @@
 public class Delivery {
     @Id
-    Long ID_delivery;
+    Integer ID_delivery;
     String delivery_status;
     String delivery_address;

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
+import org.springframework.security.core.GrantedAuthority;
 
+import javax.persistence.Entity;
+import javax.persistence.Table;
 import java.time.LocalDate;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Objects;
 
@@ -30 +36 @@
         return getClass().hashCode();
     }
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return Collections.singletonList(Role.ROLE_DELIVERYMAN);
+    }
 }

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.*;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
 
+import javax.persistence.*;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -17 +20 @@
 public class Order {
     @Id
-    Long ID_order;
+    Integer ID_order;
     String order_status;
     LocalDateTime order_date;

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -8 +7 @@
 import org.hibernate.Hibernate;
 
+import javax.persistence.*;
 import java.util.List;
 import java.util.Objects;
@@ -19 +19 @@
     @Id
     @Column(name = "ID_part")
-    Long id;
+    Integer id;
     @Column(name = "part_name")
     String name;

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
 
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.util.Objects;
 
@@ -18 +21 @@
 public class PartManufacturer {
     @Id
-    Long ID_part_manufacturer;
+    Integer ID_part_manufacturer;
     @Column(name = "pm_name")
     String name;

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import java.time.LocalDate;
 import java.util.Objects;
@@ -18 +21 @@
 public class Price {
     @Id
-    Long ID_price;
+    Integer ID_price;
     Integer amount;
     LocalDate price_from;

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import java.util.Objects;
 
@@ -17 +20 @@
 public class Repair {
     @Id
-    Long ID_repair;
+    Integer ID_repair;
     @ManyToOne
     @JoinColumn(name = "vin")

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.*;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
 
+import javax.persistence.*;
 import java.util.List;
 import java.util.Objects;
@@ -17 +20 @@
     @Id
     @Column(name = "ID_repair_shop")
-    Long id;
+    Integer id;
     @Column(name = "rs_name")
     String name;

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import java.util.Objects;
 
@@ -17 +20 @@
 public class Review {
     @Id
-    Long ID_review;
+    Integer ID_review;
     Integer review_rating;
     String review_comment;

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.*;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
 
+import javax.persistence.*;
 import java.time.LocalDateTime;
 import java.util.Objects;
@@ -16 +19 @@
 public class ServiceBook {
     @Id
-    Long ID_service_book;
+    Integer ID_service_book;
     LocalDateTime sb_created_on;
     @OneToOne

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.*;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
 
+import javax.persistence.*;
 import java.time.LocalDateTime;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Objects;
 
@@ -15 +22 @@
 @Table(name = "users_table")
 @Inheritance(strategy = InheritanceType.JOINED)
-public class User {
+public class User implements UserDetails {
     @Id
-    Long ID_user;
+    Integer ID_user;
     String username;
     String email;
@@ -50 +57 @@
         return getClass().hashCode();
     }
+
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return Collections.singletonList(Role.ROLE_USER);
+    }
+
+    @Override
+    public boolean isAccountNonExpired() {
+        return true;
+    }
+
+    @Override
+    public boolean isAccountNonLocked() {
+        return true;
+    }
+
+    @Override
+    public boolean isCredentialsNonExpired() {
+        return true;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
 }

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
 import java.util.Objects;
 
@@ -15 +18 @@
 public class Warehouse {
     @Id
-    Long ID_warehouse;
+    Integer ID_warehouse;
     String warehouse_location;
 

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

@@ -1 +1 @@
 package com.example.autopartz.model;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
+import org.springframework.security.core.GrantedAuthority;
 
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import java.time.LocalDate;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Objects;
 
@@ -33 +39 @@
         return getClass().hashCode();
     }
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return Collections.singletonList(Role.ROLE_WAREHOUSEMAN);
+    }
 }

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

@@ -1 +1 @@
 package com.example.autopartz.model.views;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.IdClass;
-import jakarta.persistence.Table;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.annotations.Immutable;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.Table;
 import java.io.Serial;
 import java.io.Serializable;
@@ -25 +28 @@
     private static final long serialVersionUID = 1L;
     @Id
-    Long userid;
+    Integer userid;
     @Id
     LocalDateTime orderdate;

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

@@ -8 +8 @@
 @Data
 public class OrdersForUserId implements Serializable {
-    Long userid;
+    Integer userid;
     LocalDateTime orderdate;
     String partname;

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

@@ -1 +1 @@
 package com.example.autopartz.model.views;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.annotations.Immutable;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serial;
 import java.io.Serializable;
@@ -21 +24 @@
     private static final long serialVersionUID = 1L;
     @Id
-    Long partid;
+    Integer partid;
     String partname;
     String cartype;

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

@@ -1 +1 @@
 package com.example.autopartz.model.views;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
-import lombok.*;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.Immutable;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serial;
 import java.io.Serializable;
@@ -24 +27 @@
     private static final long serialVersionUID = 1L;
     @Id
-    Long rsid;
+    Integer rsid;
     String rsname;
-    Integer reviewcount;
+    Long reviewcount;
     Float reviewaverage;
 

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

@@ -1 +1 @@
 package com.example.autopartz.model.views;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.IdClass;
-import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -11 +7 @@
 import org.hibernate.annotations.Immutable;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.IdClass;
+import javax.persistence.Table;
 import java.io.Serial;
 import java.io.Serializable;
@@ -28 +28 @@
     private static final long serialVersionUID = 1L;
     @Id
-    Long userid;
+    Integer userid;
     @Id
     LocalDateTime orderdate;

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

@@ -1 +1 @@
 package com.example.autopartz.model.views;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.Id;
-import jakarta.persistence.Table;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -10 +7 @@
 import org.hibernate.annotations.Immutable;
 
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import java.io.Serial;
 import java.io.Serializable;
@@ -25 +25 @@
     private static final long serialVersionUID = 1L;
     @Id
-    Long repairid;
-    Long userid;
+    Integer repairid;
+    Integer userid;
     Integer rating;
     String rcomment;