Changeset 98f448a


Ignore:
Timestamp:
02/02/22 19:35:14 (2 years ago)
Author:
andrejTavchioski <andrej.tavchioski@…>
Branches:
master
Children:
80ddcae, c71fa06
Parents:
df4089c
Message:

parkingZone and parkingSession services fix

Location:
sources
Files:
22 edited

Legend:

Unmodified
Added
Removed

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

    rdf4089c r98f448a  
    2424
    2525    @GetMapping({"/vraboten"})
    26     public List<WorkerDemo> getAllVraboten() {
     26    public List<Worker> getAllVraboten() {
    2727        return this.workerService.getWorkers();
    2828    }
    … …  
    4646    public Optional<Worker> addVraboten(@RequestBody AddUpdateWorker vraboten) {
    4747        return this.workerService.addWorker(vraboten.getPassword(), vraboten.getConfirmPass(), vraboten.isLocked(),vraboten.getFirstName(), vraboten.getLastName(),
    48                 vraboten.getMobileNumber(), vraboten.getEmail(), vraboten.getStatus(),vraboten.getParkingZones());
     48                vraboten.getMobile(), vraboten.getEmail(), vraboten.getStatus(),vraboten.getParkingZones());
    4949    }
    5050
    … …  
    6262    public WorkerDemoParkingZones updateVraboten(@PathVariable int vrabotenId, @RequestBody AddUpdateWorker vraboten) {
    6363        return this.workerService.updateWorker(vrabotenId,vraboten.getPassword(), vraboten.getConfirmPass(), vraboten.isLocked(),vraboten.getFirstName(), vraboten.getLastName(),
    64                 vraboten.getMobileNumber(), vraboten.getEmail(), vraboten.getStatus(),vraboten.getParkingZones());
     64                vraboten.getMobile(), vraboten.getEmail(), vraboten.getStatus(),vraboten.getParkingZones());
    6565    }
    6666

  • sources/app/src/main/java/parkup/data/AddUpdateWorker.java

    rdf4089c r98f448a  
    1313    List<String> parkingZones;
    1414    EmployeeStatus status;
    15     String mobileNumber;
     15    String mobile;
    1616    boolean locked;
    1717
    18     public AddUpdateWorker(String firstName, String lastName, String email, String password, String confirmPass, List<String> parkingZones, EmployeeStatus status, String mobileNumber, boolean locked) {
     18    public AddUpdateWorker(String firstName, String lastName, String email, String password, String confirmPass, List<String> parkingZones, EmployeeStatus status, String mobile, boolean locked) {
    1919        this.firstName = firstName;
    2020        this.lastName = lastName;
    … …  
    2424        this.parkingZones = parkingZones;
    2525        this.status = status;
    26         this.mobileNumber = mobileNumber;
     26        this.mobile = mobile;
    2727        this.locked = locked;
    2828    }
    … …  
    8484    }
    8585
    86     public String getMobileNumber() {
    87         return mobileNumber;
     86    public String getMobile() {
     87        return mobile;
    8888    }
    8989
    90     public void setMobileNumber(String mobileNumber) {
    91         this.mobileNumber = mobileNumber;
     90    public void setMobile(String mobile) {
     91        this.mobile = mobile;
    9292    }
    9393

  • sources/app/src/main/java/parkup/data/WorkerDemoParkingZones.java

    rdf4089c r98f448a  
    1515    private String lastName;
    1616    private String email;
    17     private String password;
    1817    private String mobile;
    1918    private UserRole role;
     19    private boolean locked;
     20
     21    public boolean isLocked() {
     22        return locked;
     23    }
     24
     25    public void setLocked(boolean locked) {
     26        this.locked = locked;
     27    }
     28
    2029    private EmployeeStatus status;
    2130    private List<String> pzNames;
    22     private PasswordEncoder passwordEncoder;
    2331
    2432    public WorkerDemoParkingZones(Worker v){
    … …  
    2735        this.lastName = v.getLastName();
    2836        this.email = v.getEmail();
    29         this.password = v.getPassword();
    3037        this.mobile = v.getMobile();
    3138        this.role = v.getRole();
    3239        this.status = v.getStatus();
     40        this.locked=v.isEnabled();
    3341        this.pzNames = v.getParkingZones().stream().map(ParkingZone::getPzName).collect(Collectors.toList());
    3442    }
    … …  
    6674    }
    6775
    68     public String getPassword() {
    69         return password;
    70     }
    71 
    72     public void setPassword(String password) {
    73         this.password = password;
    74     }
    75 
    7676    public String getMobile() {
    7777        return mobile;

  • sources/app/src/main/java/parkup/data/enumarations/UserRole.java

    rdf4089c r98f448a  
    44
    55public enum UserRole implements GrantedAuthority {
    6     GUEST,
    7     REG_USER,
    8     WORKER,
    9     ADMIN;
     6    ROLE_USER,
     7    ROLE_REG_USER,
     8    ROLE_WORKER,
     9    ROLE_ADMIN;
    1010
    1111    @Override

  • sources/app/src/main/java/parkup/entities/Administrator.java

    rdf4089c r98f448a  
    5151
    5252    public Administrator(){
    53         this.role = UserRole.ADMIN;
     53        this.role = UserRole.ROLE_ADMIN;
    5454        this.enabled=true;
    5555    }
    … …  
    6363        this.mobile = mobile;
    6464        this.enabled=true;
    65         this.role = UserRole.ADMIN;
     65        this.role = UserRole.ROLE_ADMIN;
    6666    }
    6767
    … …  
    7272        this.password = password;
    7373        this.mobile = mobile;
    74         this.role = UserRole.ADMIN;
     74        this.role = UserRole.ROLE_ADMIN;
    7575        this.enabled=true;
    7676    }
    … …  
    8282        this.password = password;
    8383        this.mobile = mobile;
    84         this.role = UserRole.ADMIN;
     84        this.role = UserRole.ROLE_ADMIN;
    8585        this.enabled=true;
    8686    }

  • sources/app/src/main/java/parkup/entities/Guest.java

    rdf4089c r98f448a  
    4747
    4848
    49     public Guest() {this.role=UserRole.GUEST;}
     49    public Guest() {this.role=UserRole.ROLE_USER;}
    5050
    5151    public Guest(int guestId, Plate plate, String email, String mobile) {
    … …  
    5454        this.email = email;
    5555        this.mobile = mobile;
    56         this.role=UserRole.GUEST;
     56        this.role=UserRole.ROLE_USER;
    5757    }
    5858
    … …  
    6161        this.email = email;
    6262        this.mobile = mobile;
    63         this.role=UserRole.GUEST;
     63        this.role=UserRole.ROLE_USER;
    6464    }
    6565

  • sources/app/src/main/java/parkup/entities/RegisteredUser.java

    rdf4089c r98f448a  
    6262    public RegisteredUser() {
    6363        this.plates = new ArrayList<Plate>();
    64         this.role = UserRole.REG_USER;
     64        this.role = UserRole.ROLE_REG_USER;
    6565        session=null;
    6666    }
    … …  
    7474        this.email = email;
    7575        this.mobile = mobile;
    76         this.role = UserRole.REG_USER;
     76        this.role = UserRole.ROLE_REG_USER;
    7777        session=null;
    7878    }
    … …  
    8585        this.email = email;
    8686        this.mobile = mobile;
    87         this.role = UserRole.REG_USER;
     87        this.role = UserRole.ROLE_REG_USER;
    8888        session=null;
    8989    }
    … …  
    9595        this.email = email;
    9696        this.mobile = mobile;
    97         this.role = UserRole.REG_USER;
     97        this.role = UserRole.ROLE_REG_USER;
    9898        session=null;
    9999    }

  • sources/app/src/main/java/parkup/entities/Worker.java

    rdf4089c r98f448a  
    6060    private UserRole role;
    6161
    62     @ManyToMany(cascade = {CascadeType.ALL})
     62    @ManyToMany
    6363    private List<ParkingZone> parkingZones;
    6464
    … …  
    7878
    7979    public Worker() {
    80         this.role = UserRole.WORKER;
     80        this.role = UserRole.ROLE_WORKER;
    8181        this.parkingZones = new ArrayList<ParkingZone>();
    8282        this.enabled = true;
    … …  
    9292        this.mobile = mobile;
    9393        this.parkingZones = parkingZones;
    94         this.role = UserRole.WORKER;
     94        this.role = UserRole.ROLE_WORKER;
    9595        this.enabled = true;
    9696        this.status = EmployeeStatus.NOT_WORKING;
    … …  
    104104        this.mobile = mobile;
    105105        this.parkingZones = parkingZones;
    106         this.role = UserRole.WORKER;
     106        this.role = UserRole.ROLE_WORKER;
    107107        this.enabled = true;
    108108        this.status = EmployeeStatus.NOT_WORKING;
    … …  
    116116        this.mobile=mobile;
    117117        this.parkingZones=new ArrayList<>();
    118         this.role = UserRole.WORKER;
     118        this.role = UserRole.ROLE_WORKER;
    119119        this.enabled=true;
    120120        this.status = EmployeeStatus.NOT_WORKING;

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

    rdf4089c r98f448a  
    55import java.util.Optional;
    66import java.util.UUID;
     7import java.util.stream.Collectors;
    78import javax.transaction.Transactional;
    89import org.springframework.beans.factory.annotation.Autowired;
    … …  
    5960        if (administratorOpt.isPresent()) {
    6061            Administrator administratorNov = this.administratorRepository.findByAdministratorId(administratorId);
    61             if (email != null && email.length() > 1 && email.contains("@") && !Objects.equals(administratorNov.getEmail(), email)) {
    62                 Optional<Administrator> userOpt1 = this.administratorRepository.findAdministratorByEmail(email);
    63                 if (userOpt1.isPresent()) {
    64                     throw new IllegalStateException("email taken");
    65                 }
    66                 administratorNov.setEmail(email);
     62            if (email != null && email.length() > 1 && email.contains("@")) {
     63                List<String> emails = administratorRepository.findAll().stream().map(Administrator::getEmail).collect(Collectors.toList());
     64                for(String mailToCheck :emails)
     65                    if (email.equals(mailToCheck) && administratorNov.getAdministratorId()!=administratorId) {
     66                        throw new IllegalStateException("email taken");
     67                    }
    6768            }else{
    6869                throw new IllegalStateException("email not valid");

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

    rdf4089c r98f448a  
    4949    }
    5050
    51    /* @Transactional
    52     public void updateParkingSession(int parkingSessionId, String timeStart, String timeEnd, Tablicka tablicka) {
    53         Optional<ParkingSession> parkingSessionOpt = Optional.ofNullable(parkingSessionRepository.findByPssId(parkingSessionId));
    54         if (parkingSessionOpt.isPresent()) {
    55             ParkingSession parkingSessionNov = parkingSessionRepository.findByPssId(parkingSessionId);
    56 
    57             if(!parkingSessionNov.getTimeStart().equals(timeStart) && !parkingSessionNov.getTimeStart().equals(timeEnd))
    58                 parkingSessionNov.setTimeStart(timeStart);
    59 
    60             if(!parkingSessionNov.getTimeEnd().equals(timeEnd) && !parkingSessionNov.getTimeEnd().equals(timeStart))
    61                 parkingSessionNov.setTimeEnd(timeEnd);
    62 
    63             if(tablicka!=null && !Objects.equals(parkingSessionNov.getTablica(),tablicka)){
    64                 parkingSessionNov.setTablica(tablicka);
    65             }
    66         }else{
    67             throw new IllegalStateException("The ParkingSession does not exist");
    68         }
    69     }*/
    7051    @Transactional
    7152    public Optional<ParkingSession> deleteParkingSession(int parkingSessionId) {
    … …  
    156137        String expYearString=date.split("/")[1];
    157138        if(expMonthString.startsWith("0"))
    158             expMonthString=expYearString.substring(1);
     139            expMonthString=expMonthString.substring(1);
    159140        if(expYearString.startsWith("0"))
    160141            expYearString=expYearString.substring(1);

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

    rdf4089c r98f448a  
    9191
    9292        //TODO prati niza od objekti ParkingSpaces i prati objekt ParkingZoneLocation
    93 
     93        ParkingZone parkingZone = parkingZoneRepository.findByPzId(parkingZoneId);
    9494            ParkingZone parkingZoneNov = parkingZoneRepository.findByPzId(parkingZoneId);
    9595            if (parkingZoneNov!=null) {
    … …  
    132132                        parkingZoneNov.getParkingSpaces().add(ps);
    133133                    }
     134                }else{
     135                    parkingZoneNov.setParkingSpaces(null);
    134136                }
    135137                if (!responsibleWorkers.isEmpty()) {
    136                     ParkingZone parkingZone = parkingZoneRepository.findByPzId(parkingZoneId);
     138
     139                    for(Integer workerId: getResponsibleWorkers(parkingZoneId).stream().map(WorkerDemo::getWorkerId).collect(Collectors.toList())){
     140                        workerRepository.findByWorkerId(workerId).getParkingZones().remove(parkingZone);
     141                    }
    137142                    for (Integer workerId : responsibleWorkers.stream().map(WorkerDemo::getWorkerId).collect(Collectors.toList())) {
    138143                        Worker workerToAdd = workerRepository.findByWorkerId(workerId);
    … …  
    140145                        workerToAdd.getParkingZones().add(parkingZone);
    141146                    }
     147                }else{
     148                    workerRepository.findAll().stream().filter(w->w.getParkingZones().contains(parkingZone)).forEach(w->w.getParkingZones().remove(parkingZone));
    142149                }
    143150
    … …  
    156163                parkingZoneOpt.get().setParkingSpaces(null);
    157164                parkingZoneOpt.get().setParkingZoneLocation(null);
     165                workerRepository.findAll().stream().filter(w->w.getParkingZones().contains(parkingZoneOpt.get())).forEach(w->w.getParkingZones().remove(parkingZoneOpt.get()));
    158166                parkingZoneRepository.deleteByPzId(parkingZoneId);
    159167            } else {

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

    rdf4089c r98f448a  
    3131    }
    3232
    33     public List<WorkerDemo> getWorkers() {
    34         return this.workerRepository.findAll().stream().map(WorkerDemo::new).collect(Collectors.toList());
     33    public List<Worker> getWorkers() {
     34        return this.workerRepository.findAll();
    3535    }
    3636
    3737    public WorkerDemoParkingZones findById(int workerId) {
    3838        Worker worker = this.workerRepository.findByWorkerId(workerId);
    39         WorkerDemoParkingZones workerToReturn = new WorkerDemoParkingZones(worker);
    40         return workerToReturn;
     39        return new WorkerDemoParkingZones(worker);
    4140    }
    4241
    … …  
    103102        Optional<Worker> workerOpt = Optional.ofNullable(this.workerRepository.findByWorkerId(workerId));
    104103        if (workerOpt.isPresent()) {
    105 
    106104            if (email != null && email.length() > 1 && email.contains("@") ) {
    107105                List<String> emails = workerRepository.findAll().stream().map(Worker::getEmail).collect(Collectors.toList());
    … …  
    117115                workerOpt.get().setPassword(bCryptPasswordEncoder.encode(password));
    118116            }
    119             workerOpt.get().setLocked(locked);
     117            workerOpt.get().setAccount(locked);
    120118
    121119            if (firstName != null && firstName.length() > 1 && !Objects.equals(workerOpt.get().getFirstName(), firstName)) {
Note: See TracChangeset for help on using the changeset viewer.