Changeset 3f0bf09

Timestamp:

02/12/22 15:30:06 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

b6e52e1

Parents:

8f153ca

Message:

change in parkingSessionService

Location:

sources/app/src/main/java/parkup

Files:

• controllers/ParkingSessionController.java (modified) (1 diff)
• entities/ParkingSession.java (modified) (1 diff)
• services/ParkingSessionService.java (modified) (7 diffs)

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

@@ -23 +23 @@
     }
 
-//    @GetMapping({"/parkingSession/{parkingSessionId}"})
-//    public ParkingSession getParkingSession(@PathVariable int parkingSessionId) {
-//        ParkingSession parkingSession = parkingSessionService.findById(parkingSessionId);
-//        if (parkingSession != null) {
-//            return parkingSession;
-//        } else {
-//            throw new RuntimeException("ParkingSession not found");
-//        }
-//    }
-
-    @PostMapping({"/parkingSession/{parkingZoneId}"})
+    @PostMapping({"/parkingSession/{parkingZoneName}"})
     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
 
-//    @PutMapping({"/parkingSession/{parkingSessionId}"})
-//    public void updateParkingSession(@PathVariable int parkingSessionId, @RequestBody ParkingSession parkingSession) {
-//        parkingSessionService.updateParkingSession(parkingSessionId,
-//                parkingSession.getTimeStart(), parkingSession.getTimeEnd(), parkingSession.getTablica());
-//    }
-//    @PutMapping({"/parkingSession/pay/{parkingSessionId"})
-//    public void payParkingSession(@PathVariable int parkingSessionId){
-//        parkingSessionService.paySession
-//    }
     @PutMapping("/parkingSession/end/{parkingSessionId}")
     public ParkingSession endParkingSession(@PathVariable int parkingSessionId){

sources/app/src/main/java/parkup/entities/ParkingSession.java

@@ -47 +47 @@
 
 
-//    public ParkingSpace getParkingSpace() {
-//        return parkingSpace;
-//    }
-//
-//    public void setParkingSpace(ParkingSpace parkingSpace) {
-//        this.parkingSpace = parkingSpace;
-//    }
 
     public ParkingSession() {

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

@@ -2 +2 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
 import org.springframework.stereotype.Service;
+import parkup.ParkUpApplication;
 import parkup.data.Plate;
 import parkup.data.enumarations.SessionStatus;
-import parkup.entities.ParkingSession;
-import parkup.entities.ParkingSpace;
-import parkup.entities.ParkingZone;
-import parkup.entities.RegisteredUser;
+import parkup.entities.*;
 import parkup.repositories.*;
 
@@ -25 +24 @@
     private final RegisteredUserRepository registeredUserRepository;
     private final PlateRepository plateRepository;
+    private final GuestRepository guestRepository;
 
     @Autowired
-    public ParkingSessionService(ParkingSessionRepository parkingSessionRepository, ParkingZoneRepository parkingZoneRepository, ParkingSpaceRepository parkingSpaceRepository, RegisteredUserRepository registeredUserRepository, PlateRepository plateRepository) {
+    public ParkingSessionService(ParkingSessionRepository parkingSessionRepository, ParkingZoneRepository parkingZoneRepository, ParkingSpaceRepository parkingSpaceRepository, RegisteredUserRepository registeredUserRepository, PlateRepository plateRepository, GuestRepository guestRepository) {
         this.parkingSessionRepository = parkingSessionRepository;
         this.parkingZoneRepository = parkingZoneRepository;
@@ -33 +33 @@
         this.registeredUserRepository = registeredUserRepository;
         this.plateRepository = plateRepository;
+        this.guestRepository = guestRepository;
     }
 
@@ -74 +75 @@
     public Optional<ParkingSession> startParkingSession(String tablica, String parkingZoneName) {
         ParkingZone parkingZone = parkingZoneRepository.findByPzName(parkingZoneName);
+        Authentication token = ParkUpApplication.getToken();
         Plate plate = plateRepository.findByPlate(tablica);
         if(plate ==null) {
@@ -82 +84 @@
         sessionToAdd.setParkingZone(parkingZone);
         parkingSessionRepository.save(sessionToAdd);
+        String role =token.getAuthorities().stream().findFirst().get().getAuthority();
+        String email =token.getName();
+        if(role.equals("ROLE_REG_USER")){
+            RegisteredUser user = registeredUserRepository.findRegisteredUserByEmail(email).get();
+            user.setSession(sessionToAdd);
+        }
+        else{
+            Guest user = guestRepository.findGuestByEmail(email).get();
+            user.setSession(sessionToAdd);
+        }
         return Optional.of(sessionToAdd);
 
@@ -132 +144 @@
     }
     @Transactional
-    public ParkingSession endParkingSession(int id){
-        ParkingSession parkingSession = parkingSessionRepository.findByPssId(id);
-        if(parkingSession==null){
-            throw new IllegalStateException("No such session exists");
-        }
-        else if(parkingSession.getStatus()==SessionStatus.ENDED_UNPAID){
+    public ParkingSession endParkingSession(){
+        Authentication token = ParkUpApplication.getToken();
+        String role =token.getAuthorities().stream().findFirst().get().getAuthority();
+        String email =token.getName();
+        ParkingSession session;
+        if(role.equals("ROLE_REG_USER")){
+            RegisteredUser user = registeredUserRepository.findRegisteredUserByEmail(email).get();
+            session=user.getSession();
+        }
+        else{
+            Guest user = guestRepository.findGuestByEmail(email).get();
+            session=user.getSession();
+        }
+        if(session==null){
+            throw new IllegalStateException("No such session exists");
+        }
+        else if(session.getStatus()==SessionStatus.ENDED_UNPAID){
             throw new IllegalStateException("The session you are trying to end has already been ended");
         }
-        parkingSession.setStatus(SessionStatus.ENDED_UNPAID);
-        parkingSession.setTimeEnd(LocalDateTime.now());
-        return parkingSession;
+        session.setStatus(SessionStatus.ENDED_UNPAID);
+        session.setTimeEnd(LocalDateTime.now());
+        return session;
+//        ParkingSession parkingSession = parkingSessionRepository.findByPssId(id);
+//        if(parkingSession==null){
+//            throw new IllegalStateException("No such session exists");
+//        }
+//        else if(parkingSession.getStatus()==SessionStatus.ENDED_UNPAID){
+//            throw new IllegalStateException("The session you are trying to end has already been ended");
+//        }
+//        parkingSession.setStatus(SessionStatus.ENDED_UNPAID);
+//        parkingSession.setTimeEnd(LocalDateTime.now());
+//        return parkingSession;
     }
     @Transactional
     public boolean payParkingSession(int id,String date){
-        ParkingSession parkingSession = parkingSessionRepository.findByPssId(id);
         String expMonthString=date.split("/")[0];
         String expYearString=date.split("/")[1];
@@ -164 +196 @@
                 throw new IllegalStateException("Your card has expired or the date that you have entered is incorrect");
         }
+        Authentication token = ParkUpApplication.getToken();
+        String role =token.getAuthorities().stream().findFirst().get().getAuthority();
+        String email =token.getName();
+        ParkingSession parkingSession;
+        if(role.equals("ROLE_REG_USER")){
+            RegisteredUser user = registeredUserRepository.findRegisteredUserByEmail(email).get();
+            parkingSession=user.getSession();
+        }
+        else{
+            Guest user = guestRepository.findGuestByEmail(email).get();
+            parkingSession=user.getSession();
+        }
         if(parkingSession==null){
             throw new IllegalStateException("No such session exists");