Changeset 843a941


Ignore:
Timestamp:
02/12/22 15:51:16 (2 years ago)
Author:
andrejTavchioski <andrej.tavchioski@…>
Branches:
master
Children:
7bb19d4
Parents:
0707e4e
Message:

fix

Location:
sources/app
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r0707e4e r843a941  
    4343
    4444
    45     @GetMapping({"/registriranParkirac/{regParkId}/session"})
    46     public SessionStatus getStatusOnParkirac(@PathVariable int regParkId){
    47         return parkingSessionService.getStatusOfParkirac(regParkId);
     45    @GetMapping({"/registriranParkirac/session"})
     46    public SessionStatus getStatusOnParkirac(){
     47        return parkingSessionService.getStatusOfParkirac();
    4848    }
    4949

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

    r0707e4e r843a941  
    183183    }
    184184
    185     public SessionStatus getStatusOfParkirac(int regParkId){
    186         RegisteredUser registeredUser = registeredUserRepository.findByRegParkId(regParkId);
    187         List<String> plates =parkingSessionRepository.findAll().stream().filter(ps->registeredUser.getPlates().contains(ps.getPlate())).map(ps->ps.getPlate().getPlate()).collect(Collectors.toList());
    188         if(plates.size()>0)
    189         return parkingSessionRepository.findAll().stream().filter(ps->ps.getPlate().getPlate().equals(plates.get(0))).collect(Collectors.toList()).get(0).getStatus();
    190         return null;
     185    public SessionStatus getStatusOfParkirac(){
     186        ParkingSession session=getParkingSession();
     187        return session.getStatus();
    191188    }
    192189
Note: See TracChangeset for help on using the changeset viewer.