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

Timestamp:

01/04/23 02:49:26 (23 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

Files:

• AutoPartzApplication.java (modified) (2 diffs)
• config/CustomUsernamePasswordAuthenticationProvider.java (added)
• config/WebSecurityConfig.java (added)
• controller/HomeController.java (modified) (2 diffs)
• controller/PartController.java (modified) (3 diffs)
• controller/UserController.java (modified) (3 diffs)
• model/Administrator.java (modified) (2 diffs)
• model/Car.java (modified) (2 diffs)
• model/CarManufacturer.java (modified) (2 diffs)
• model/CarSample.java (modified) (1 diff)
• model/Category.java (modified) (2 diffs)
• model/Client.java (modified) (2 diffs)
• model/Delivery.java (modified) (2 diffs)
• model/Deliveryman.java (modified) (2 diffs)
• model/Order.java (modified) (2 diffs)
• model/Part.java (modified) (3 diffs)
• model/PartManufacturer.java (modified) (2 diffs)
• model/Price.java (modified) (2 diffs)
• model/Repair.java (modified) (2 diffs)
• model/RepairShop.java (modified) (2 diffs)
• model/Review.java (modified) (2 diffs)
• model/Role.java (added)
• model/ServiceBook.java (modified) (2 diffs)
• model/User.java (modified) (3 diffs)
• model/Warehouse.java (modified) (2 diffs)
• model/Warehouseman.java (modified) (2 diffs)
• model/views/OrdersForUser.java (modified) (2 diffs)
• model/views/OrdersForUserId.java (modified) (1 diff)
• model/views/PartsForCarTypeAndCategory.java (modified) (2 diffs)
• model/views/RepairShopReviewsSummary.java (modified) (2 diffs)
• model/views/RepairsForUser.java (modified) (3 diffs)
• model/views/ReviewsForUser.java (modified) (3 diffs)
• repository/CarRepository.java (modified) (1 diff)
• repository/CategoryRepository.java (modified) (1 diff)
• repository/OrdersForUserRepository.java (modified) (2 diffs)
• repository/PartRepository.java (modified) (1 diff)
• repository/PartsForCarTypeAndCategoryRepository.java (modified) (1 diff)
• repository/PriceRepository.java (modified) (1 diff)
• repository/RepairShopRepository.java (modified) (1 diff)
• repository/RepairShopReviewSummaryRepository.java (modified) (1 diff)
• repository/RepairsForUserRepository.java (modified) (1 diff)
• repository/ReviewsForUserRepository.java (modified) (1 diff)
• repository/UserRepository.java (modified) (1 diff)
• service/LoginService.java (modified) (1 diff)
• service/PartService.java (modified) (1 diff)
• service/UserService.java (modified) (1 diff)
• service/impl/PartServiceImpl.java (modified) (1 diff)
• service/impl/UserServiceImpl.java (modified) (1 diff)

src/main/java/com/example/autopartz/AutoPartzApplication.java

@@ -3 +3 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 
 @SpringBootApplication
@@ -10 +13 @@
         SpringApplication.run(AutoPartzApplication.class, args);
     }
+    @Bean
+    PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder(10);
+    }
+
 
 }

src/main/java/com/example/autopartz/controller/HomeController.java

@@ -14 +14 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+
+import javax.servlet.http.HttpServletRequest;
 
 @Controller
@@ -35 +37 @@
 
     @GetMapping()
-    public String getHomePage(Model model){
+    public String getHomePage(Model model, HttpServletRequest request){
         model.addAttribute("bodyContent","home");
+        model.addAttribute("user",request.getRemoteUser());
         return "master-template";
     }

src/main/java/com/example/autopartz/controller/PartController.java

@@ -5 +5 @@
 import com.example.autopartz.service.PriceService;
 import com.example.autopartz.service.RepairShopService;
-import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
@@ -24 +24 @@
     }
     @GetMapping("/{id}")
-    public String getPartPage(@PathVariable Long id, Model model){
+    public String getPartPage(@PathVariable Integer id, Model model){
         Part temp = partService.findById(id);
         Integer amount = priceService.findPriceForPart(temp).stream().findFirst().orElseThrow(RuntimeException::new).getAmount();
@@ -33 +33 @@
     }
     @GetMapping("/delivery/{id}")
-    public String getDeliveryPage(@PathVariable Long id, Model model){
+    public String getDeliveryPage(@PathVariable Integer id, Model model){
         model.addAttribute("repairShops",repairShopService.findAll());
         model.addAttribute("partId",id);

src/main/java/com/example/autopartz/controller/UserController.java

@@ -1 +1 @@
 package com.example.autopartz.controller;
 
-import com.example.autopartz.model.*;
-import com.example.autopartz.model.views.*;
-import com.example.autopartz.repository.*;
-import com.example.autopartz.service.UserService;
+import com.example.autopartz.repository.OrdersForUserRepository;
+import com.example.autopartz.repository.RepairsForUserRepository;
+import com.example.autopartz.repository.ReviewsForUserRepository;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
 
 @Controller
 @RequestMapping("/")
 public class UserController {
-    private final UserService userService;
     private final OrdersForUserRepository ordersForUserRepository;
     private final RepairsForUserRepository repairsForUserRepository;
     private final ReviewsForUserRepository reviewsForUserRepository;
-    public UserController(UserService userService, OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository) {
-        this.userService = userService;
+    public UserController(OrdersForUserRepository ordersForUserRepository, RepairsForUserRepository repairsForUserRepository, ReviewsForUserRepository reviewsForUserRepository) {
         this.ordersForUserRepository = ordersForUserRepository;
         this.repairsForUserRepository = repairsForUserRepository;
         this.reviewsForUserRepository = reviewsForUserRepository;
     }
-    @GetMapping("usersTest")
-    public List<User> getAllUsers(){
-        return userService.findAllUsers();
-    }
     @GetMapping("orders/{id}")
-    public String getOrdersForUser(@PathVariable Long id, Model model){
+    public String getOrdersForUser(@PathVariable Integer id, Model model){
         model.addAttribute("userOrders",ordersForUserRepository.findAllByUserid(id));
         model.addAttribute("bodyContent","ordersForUser");
@@ -35 +28 @@
     }
     @GetMapping("repairs/{id}")
-    public String getRepairsForUser(@PathVariable Long id,Model model){
+    public String getRepairsForUser(@PathVariable Integer id,Model model){
         model.addAttribute("userRepairs",repairsForUserRepository.findAllByUserid(id));
         model.addAttribute("bodyContent","repairsForUser");
@@ -41 +34 @@
     }
     @GetMapping("reviews/{id}")
-    public String getReviewsForUser(@PathVariable Long id, Model model){
+    public String getReviewsForUser(@PathVariable Integer id, Model model){
         model.addAttribute("userReviews",reviewsForUserRepository.findAllByUserid(id));
         model.addAttribute("bodyContent","reviewsForUser");

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;

src/main/java/com/example/autopartz/repository/CarRepository.java

@@ -6 +6 @@
 
 @Repository
-public interface CarRepository extends JpaRepository<Car,Long> {
+public interface CarRepository extends JpaRepository<Car,Integer> {
 }

src/main/java/com/example/autopartz/repository/CategoryRepository.java

@@ -6 +6 @@
 
 @Repository
-public interface CategoryRepository extends JpaRepository<Category,Long> {
+public interface CategoryRepository extends JpaRepository<Category,Integer> {
 }

src/main/java/com/example/autopartz/repository/OrdersForUserRepository.java

@@ -3 +3 @@
 import com.example.autopartz.model.views.OrdersForUser;
 import com.example.autopartz.model.views.OrdersForUserId;
-import jakarta.transaction.Transactional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
@@ -12 +12 @@
 @Transactional
 public interface OrdersForUserRepository extends JpaRepository<OrdersForUser, OrdersForUserId> {
-    List<OrdersForUser> findAllByUserid(Long userid);
+    List<OrdersForUser> findAllByUserid(Integer userid);
 }

src/main/java/com/example/autopartz/repository/PartRepository.java

@@ -6 +6 @@
 
 @Repository
-public interface PartRepository extends JpaRepository<Part,Long> {
+public interface PartRepository extends JpaRepository<Part,Integer> {
 }

src/main/java/com/example/autopartz/repository/PartsForCarTypeAndCategoryRepository.java

@@ -2 +2 @@
 
 import com.example.autopartz.model.views.PartsForCarTypeAndCategory;
-import jakarta.transaction.Transactional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import javax.transaction.Transactional;
 import java.util.List;
 
 @Repository
 @Transactional
-public interface PartsForCarTypeAndCategoryRepository extends JpaRepository<PartsForCarTypeAndCategory,Long> {
+public interface PartsForCarTypeAndCategoryRepository extends JpaRepository<PartsForCarTypeAndCategory,Integer> {
     List<PartsForCarTypeAndCategory> findAllByCartypeAndCategory(String cartype, String category);
 }

src/main/java/com/example/autopartz/repository/PriceRepository.java

@@ -7 +7 @@
 import java.util.List;
 
-public interface PriceRepository extends JpaRepository<Price,Long> {
+public interface PriceRepository extends JpaRepository<Price,Integer> {
     List<Price> findAllByPart(Part part);
 }

src/main/java/com/example/autopartz/repository/RepairShopRepository.java

@@ -6 +6 @@
 
 @Repository
-public interface RepairShopRepository extends JpaRepository<RepairShop,Long> {
+public interface RepairShopRepository extends JpaRepository<RepairShop,Integer> {
 
 }

src/main/java/com/example/autopartz/repository/RepairShopReviewSummaryRepository.java

@@ -2 +2 @@
 
 import com.example.autopartz.model.views.RepairShopReviewsSummary;
-import jakarta.transaction.Transactional;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
+
+import javax.transaction.Transactional;
 
 // извештај за сите сервиси и за сите број на reviews и avg рејтинг
 @Repository
 @Transactional
-public interface RepairShopReviewSummaryRepository extends JpaRepository<RepairShopReviewsSummary,Long> {
-    // List<RepairShopReviewsSummary> findAllByRsid(Long rsid);
+public interface RepairShopReviewSummaryRepository extends JpaRepository<RepairShopReviewsSummary,Integer> {
+    // List<RepairShopReviewsSummary> findAllByRsid(Integer rsid);
 }

src/main/java/com/example/autopartz/repository/RepairsForUserRepository.java

@@ -10 +10 @@
 @Repository
 public interface RepairsForUserRepository extends JpaRepository<RepairsForUser, OrdersForUserId> {
-    List<RepairsForUser> findAllByUserid(Long userid);
+    List<RepairsForUser> findAllByUserid(Integer userid);
 }

src/main/java/com/example/autopartz/repository/ReviewsForUserRepository.java

@@ -8 +8 @@
 
 @Repository
-public interface ReviewsForUserRepository extends JpaRepository<ReviewsForUser,Long> {
-    List<ReviewsForUser> findAllByUserid(Long id);
+public interface ReviewsForUserRepository extends JpaRepository<ReviewsForUser,Integer> {
+    List<ReviewsForUser> findAllByUserid(Integer id);
 }

src/main/java/com/example/autopartz/repository/UserRepository.java

@@ -10 +10 @@
 
 @Repository
-public interface UserRepository extends JpaRepository<User,Long> {
-     // List<User> findAllByUsername(String username);
+public interface UserRepository extends JpaRepository<User,Integer> {
+     List<User> findAllByUsername(String username);
      List<User> findAllByUsernameAndPassword(String username, String password);
 }

src/main/java/com/example/autopartz/service/LoginService.java

@@ -6 +6 @@
     User register(String name, String username, String email, String number, String password);
     User login(String username, String password);
-    // User findByUsername(String username);
-
 }

src/main/java/com/example/autopartz/service/PartService.java

@@ -7 +7 @@
 public interface PartService {
     List<Part> findAll();
-    Part findById(Long id);
+    Part findById(Integer id);
 }

src/main/java/com/example/autopartz/service/UserService.java

@@ -7 +7 @@
 public interface UserService {
     List<User> findAllUsers();
+    User findByUsername(String username);
+
 }

src/main/java/com/example/autopartz/service/impl/PartServiceImpl.java

@@ -22 +22 @@
 
     @Override
-    public Part findById(Long id) {
+    public Part findById(Integer id) {
         return partRepository.findById(id).orElseThrow(RuntimeException::new);
     }

src/main/java/com/example/autopartz/service/impl/UserServiceImpl.java

@@ -20 +20 @@
         return userRepository.findAll();
     }
+
+    @Override
+    public User findByUsername(String username) {
+        return userRepository.findAllByUsername(username).stream().findFirst().orElseThrow(RuntimeException::new);
+    }
 }