Changeset 0e407de

Timestamp:

02/12/22 13:31:55 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

3753356

Parents:

52df867

Message:

plates fix

Location:

sources

Files:

• app.zip (deleted)
• app/src/main/java/parkup/configs/webConfigs/WebSecurityConfig.java (modified) (1 diff)
• app/src/main/java/parkup/controllers/ParkingSessionController.java (modified) (1 diff)
• app/src/main/java/parkup/controllers/RegisteredUserController.java (modified) (3 diffs)
• app/src/main/java/parkup/data/Plate.java (modified) (1 diff)
• app/src/main/java/parkup/services/ParkingSessionService.java (modified) (1 diff)
• app/src/main/java/parkup/services/RegisteredUserService.java (modified) (3 diffs)
• app/target/classes/parkup/configs/webConfigs/WebSecurityConfig.class (modified) ( previous)
• app/target/classes/parkup/controllers/ParkingSessionController.class (modified) ( previous)
• app/target/classes/parkup/controllers/RegisteredUserController.class (modified) ( previous)
• app/target/classes/parkup/data/Plate.class (modified) ( previous)
• app/target/classes/parkup/services/ParkingSessionService.class (modified) ( previous)
• app/target/classes/parkup/services/RegisteredUserService.class (modified) ( previous)

sources/app/src/main/java/parkup/configs/webConfigs/WebSecurityConfig.java

@@ -39 +39 @@
             auth.userDetailsService(workerService).passwordEncoder(bCryptPasswordEncoder);
             auth.userDetailsService(administratorService).passwordEncoder(bCryptPasswordEncoder);
+
         }
 

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

@@ -34 +34 @@
 
     @PostMapping({"/parkingSession/{parkingZoneId}"})
-    public Optional<ParkingSession> startParkingSession(@RequestParam String tablicka, @PathVariable int parkingZoneId) {
-        return this.parkingSessionService.startParkingSession(tablicka,parkingZoneId);
+    public Optional<ParkingSession> startParkingSession(@RequestParam String tablicka, @PathVariable String parkingZoneName) {
+        return this.parkingSessionService.startParkingSession(tablicka,parkingZoneName);
     }
 // TODO: vidi kako kje funkcionira update na sesija i nejzino plakjanje so frontot

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

@@ -8 +8 @@
 import parkup.configs.RegistrationRequest;
 import parkup.configs.RegistrationServiceRP;
+import parkup.data.Plate;
 import parkup.data.enumarations.SessionStatus;
 import parkup.entities.RegisteredUser;
@@ -41 +42 @@
     }
 
-    @GetMapping({"registriranParkirac/{regParkId}/session"})
+
+    @GetMapping({"/registriranParkirac/{regParkId}/session"})
     public SessionStatus getStatusOnParkirac(@PathVariable int regParkId){
         return parkingSessionService.getStatusOfParkirac(regParkId);
@@ -53 +55 @@
     @PutMapping({"/registriranParkirac/{regParkId}"})
     public RegisteredUser updateRegistriranParkirac(@PathVariable int regParkId, @RequestBody RegisteredUser regPark) {
-        return this.registeredUserService.updateRegPark(regParkId,regPark.getPassword(), regPark.getFirstName(), regPark.getLastName(), regPark.getMobile(), regPark.getEmail(),regPark.getPlates());
+        return this.registeredUserService.updateRegPark(regParkId,regPark.getPassword(), regPark.getFirstName(), regPark.getLastName(), regPark.getMobile(), regPark.getEmail());
+    }
+    @PutMapping({"/registriranParkirac/{regParkId}/tablici"})
+    public RegisteredUser addTablicaToUser(@PathVariable int regParkId, @RequestBody Plate plate){
+        return this.registeredUserService.addTablica(regParkId,plate);
+    }
+
+    @DeleteMapping({"/registriranParkirac/{regParkId}/tablici"})
+    public RegisteredUser deleteTablicaFromUser(@PathVariable int regParkId, @RequestBody Plate plate){
+        return this.registeredUserService.deleteTablica(regParkId,plate);
     }
 

sources/app/src/main/java/parkup/data/Plate.java

@@ -6 +6 @@
 public class Plate {
     @Id
-    @SequenceGenerator(
-            name="plate_sequence_generator",
-            sequenceName = "plate_sequence",
-            allocationSize = 1,
-            initialValue = 1000
-    )
-    @GeneratedValue(    //za postgres treba sequence da se namesti i ime na generator mi ga davamo kako od gore sto e
-            strategy = GenerationType.SEQUENCE,
-            generator = "plate_sequence_generator"
-    )
-    private int plateId;
-
     private String plate;
 

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

@@ -72 +72 @@
 
     @Transactional
-    public Optional<ParkingSession> startParkingSession(String tablica, int parkingZoneId) {
-        ParkingZone parkingZone = parkingZoneRepository.findByPzId(parkingZoneId);
+    public Optional<ParkingSession> startParkingSession(String tablica, String parkingZoneName) {
+        ParkingZone parkingZone = parkingZoneRepository.findByPzName(parkingZoneName);
         Plate plate = plateRepository.findByPlate(tablica);
         if(plate ==null) {

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

@@ -55 +55 @@
 
     @Transactional
-    public RegisteredUser updateRegPark(int regParkId,String password, String name, String surname, String mobile, String email, List<Plate> regTablicki) {
+    public RegisteredUser updateRegPark(int regParkId,String password, String name, String surname, String mobile, String email) {
         Optional<RegisteredUser> regParkOpt = Optional.ofNullable(this.registeredUserRepository.findByRegParkId(regParkId));
         if (regParkOpt.isPresent()) {
@@ -81 +81 @@
                 regParkNov.setMobile(mobile);
             }
-            regParkNov.setPlates(regTablicki);
             return regParkNov;
         }else{
@@ -151 +150 @@
         return registeredUserRepository.enableRegisteredUser(email);
     }
+
+    @Transactional
+    public RegisteredUser addTablica(int regParkId, Plate plate) {
+        RegisteredUser user = registeredUserRepository.findByRegParkId(regParkId);
+        user.getPlates().add(plate);
+        return user;
+    }
+    @Transactional
+    public RegisteredUser deleteTablica(int regParkId, Plate plate) {
+        RegisteredUser user = registeredUserRepository.findByRegParkId(regParkId);
+        user.getPlates().remove(plate);
+        return user;
+    }
 }