Changeset 52df867

Timestamp:

02/10/22 23:45:54 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

0e407de

Parents:

c45b67b

Message:

added new method to check users

Location:

sources/app

Files:

• src/main/java/parkup/controllers/RegisteredUserController.java (modified) (4 diffs)
• src/main/java/parkup/services/ParkingSessionService.java (modified) (3 diffs)
• src/main/java/parkup/services/RegisteredUserService.java (modified) (2 diffs)
• target/classes/parkup/controllers/RegisteredUserController.class (modified) ( previous)
• target/classes/parkup/services/ParkingSessionService.class (modified) ( previous)
• target/classes/parkup/services/RegisteredUserService.class (modified) ( previous)

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

@@ -8 +8 @@
 import parkup.configs.RegistrationRequest;
 import parkup.configs.RegistrationServiceRP;
+import parkup.data.enumarations.SessionStatus;
 import parkup.entities.RegisteredUser;
+import parkup.services.ParkingSessionService;
 import parkup.services.RegisteredUserService;
 
@@ -15 +17 @@
     private final RegisteredUserService registeredUserService;
     private final RegistrationServiceRP registrationServiceRP;
+    private final ParkingSessionService parkingSessionService;
 
     @Autowired
-    public RegisteredUserController(RegisteredUserService registeredUserService, RegistrationServiceRP registrationServiceRP) {
+    public RegisteredUserController(RegisteredUserService registeredUserService, RegistrationServiceRP registrationServiceRP, ParkingSessionService parkingSessionService) {
         this.registeredUserService = registeredUserService;
         this.registrationServiceRP = registrationServiceRP;
+        this.parkingSessionService = parkingSessionService;
     }
 
@@ -37 +41 @@
     }
 
+    @GetMapping({"registriranParkirac/{regParkId}/session"})
+    public SessionStatus getStatusOnParkirac(@PathVariable int regParkId){
+        return parkingSessionService.getStatusOfParkirac(regParkId);
+    }
+
     @PostMapping({"/registriranParkirac"})
     public Optional<RegisteredUser> addRegistriranParkirac(@RequestBody RegisteredUser regPark) {
@@ -44 +53 @@
     @PutMapping({"/registriranParkirac/{regParkId}"})
     public RegisteredUser updateRegistriranParkirac(@PathVariable int regParkId, @RequestBody RegisteredUser regPark) {
-        return this.registeredUserService.updateRegPark(regParkId, 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(),regPark.getPlates());
     }
 

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

@@ -8 +8 @@
 import parkup.entities.ParkingSpace;
 import parkup.entities.ParkingZone;
-import parkup.repositories.ParkingSessionRepository;
-import parkup.repositories.ParkingSpaceRepository;
-import parkup.repositories.ParkingZoneRepository;
-import parkup.repositories.PlateRepository;
+import parkup.entities.RegisteredUser;
+import parkup.repositories.*;
 
 import javax.transaction.Transactional;
@@ -25 +23 @@
     private final ParkingZoneRepository parkingZoneRepository;
     private final ParkingSpaceRepository parkingSpaceRepository;
+    private final RegisteredUserRepository registeredUserRepository;
     private final PlateRepository plateRepository;
 
     @Autowired
-    public ParkingSessionService(ParkingSessionRepository parkingSessionRepository, ParkingZoneRepository parkingZoneRepository, ParkingSpaceRepository parkingSpaceRepository, PlateRepository plateRepository) {
+    public ParkingSessionService(ParkingSessionRepository parkingSessionRepository, ParkingZoneRepository parkingZoneRepository, ParkingSpaceRepository parkingSpaceRepository, RegisteredUserRepository registeredUserRepository, PlateRepository plateRepository) {
         this.parkingSessionRepository = parkingSessionRepository;
         this.parkingZoneRepository = parkingZoneRepository;
         this.parkingSpaceRepository = parkingSpaceRepository;
+        this.registeredUserRepository = registeredUserRepository;
         this.plateRepository = plateRepository;
     }
@@ -174 +174 @@
         return true;
     }
+
+    public SessionStatus getStatusOfParkirac(int regParkId){
+        RegisteredUser registeredUser = registeredUserRepository.findByRegParkId(regParkId);
+        List<String> plates =parkingSessionRepository.findAll().stream().filter(ps->registeredUser.getPlates().contains(ps.getPlate())).map(ps->ps.getPlate().getPlate()).collect(Collectors.toList());
+        if(plates.size()>0)
+        return parkingSessionRepository.findAll().stream().filter(ps->ps.getPlate().getPlate().equals(plates.get(0))).collect(Collectors.toList()).get(0).getStatus();
+        return null;
+    }
 }

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

@@ -55 +55 @@
 
     @Transactional
-    public RegisteredUser updateRegPark(int regParkId, 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, List<Plate> regTablicki) {
         Optional<RegisteredUser> regParkOpt = Optional.ofNullable(this.registeredUserRepository.findByRegParkId(regParkId));
         if (regParkOpt.isPresent()) {
@@ -67 +67 @@
                 regParkNov.setEmail(email);
             }
-
+            if(!password.isEmpty()){
+                regParkNov.setPassword(bCryptPasswordEncoder.encode(password));
+            }
             if (name != null && name.length() > 1 && !Objects.equals(regParkNov.getFirstName(), name)) {
                 regParkNov.setFirstName(name);