Changeset 8f153ca

Timestamp:

02/12/22 14:49:26 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

3f0bf09

Parents:

2b65789

Message:

fix

Location:

sources/app/src/main/java/parkup

Files:

• controllers/RegisteredUserController.java (modified) (2 diffs)
• services/RegisteredUserService.java (modified) (3 diffs)

sources/app/src/main/java/parkup/controllers/RegisteredUserController.java

@@ -58 +58 @@
     }
     @PutMapping({"/registriranParkirac/{regParkId}/tablici"})
-    public RegisteredUser addTablicaToUser(@PathVariable int regParkId, @RequestBody Plate plate){
+    public String addTablicaToUser(@PathVariable int regParkId, @RequestBody Plate plate){
         return this.registeredUserService.addTablica(regParkId,plate);
     }
@@ -66 +66 @@
     }
     @DeleteMapping({"/registriranParkirac/{regParkId}/tablici/{plate}"})
-    public RegisteredUser deleteTablicaFromUser(@PathVariable int regParkId, @PathVariable String plate){
+    public String deleteTablicaFromUser(@PathVariable int regParkId, @PathVariable String plate){
         return this.registeredUserService.deleteTablica(regParkId,plate);
     }

sources/app/src/main/java/parkup/services/RegisteredUserService.java

@@ -22 +22 @@
 import parkup.data.Plate;
 import parkup.entities.RegisteredUser;
+import parkup.repositories.PlateRepository;
 import parkup.repositories.RegisteredUserRepository;
 
@@ -30 +31 @@
     private final ConfirmationTokenService confirmationTokenService;
     private final EmailValidator emailValidator;
+    private final PlateRepository plateRepository;
     @Autowired
-    public RegisteredUserService(RegisteredUserRepository registeredUserRepository, BCryptPasswordEncoder bCryptPasswordEncoder, ConfirmationTokenService confirmationTokenService, EmailValidator emailValidator) {
+    public RegisteredUserService(RegisteredUserRepository registeredUserRepository, BCryptPasswordEncoder bCryptPasswordEncoder, ConfirmationTokenService confirmationTokenService, EmailValidator emailValidator, PlateRepository plateRepository) {
         this.registeredUserRepository = registeredUserRepository;
         this.bCryptPasswordEncoder = bCryptPasswordEncoder;
         this.confirmationTokenService = confirmationTokenService;
         this.emailValidator = emailValidator;
+        this.plateRepository = plateRepository;
     }
 
@@ -155 +158 @@
 
     @Transactional
-    public RegisteredUser addTablica(int regParkId, Plate plate) {
+    public String addTablica(int regParkId, Plate plate) {
         RegisteredUser user = registeredUserRepository.findByRegParkId(regParkId);
         user.getPlates().add(plate);
-        return user;
+        return plate.getPlate();
     }
     @Transactional
-    public RegisteredUser deleteTablica(int regParkId, String plate) {
+    public String deleteTablica(int regParkId, String plate) {
         RegisteredUser user = registeredUserRepository.findByRegParkId(regParkId);
-        user.getPlates().remove(new Plate(plate));
-        return user;
+        Plate p =plateRepository.findByPlate(plate);
+        user.getPlates().remove(p);
+        return plate;
     }