Changeset 0e407de for sources/app/src/main/java/parkup/services

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/app/src/main/java/parkup/services

Files:

• ParkingSessionService.java (modified) (1 diff)
• RegisteredUserService.java (modified) (3 diffs)

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;
+    }
 }