Changeset 0e407de for sources/app/src/main/java
- Timestamp:
- 02/12/22 13:31:55 (3 years ago)
- Branches:
- master
- Children:
- 3753356
- Parents:
- 52df867
- Location:
- sources/app/src/main/java/parkup
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/configs/webConfigs/WebSecurityConfig.java
r52df867 r0e407de 39 39 auth.userDetailsService(workerService).passwordEncoder(bCryptPasswordEncoder); 40 40 auth.userDetailsService(administratorService).passwordEncoder(bCryptPasswordEncoder); 41 41 42 } 42 43 -
sources/app/src/main/java/parkup/controllers/ParkingSessionController.java
r52df867 r0e407de 34 34 35 35 @PostMapping({"/parkingSession/{parkingZoneId}"}) 36 public Optional<ParkingSession> startParkingSession(@RequestParam String tablicka, @PathVariable int parkingZoneId) {37 return this.parkingSessionService.startParkingSession(tablicka,parkingZone Id);36 public Optional<ParkingSession> startParkingSession(@RequestParam String tablicka, @PathVariable String parkingZoneName) { 37 return this.parkingSessionService.startParkingSession(tablicka,parkingZoneName); 38 38 } 39 39 // TODO: vidi kako kje funkcionira update na sesija i nejzino plakjanje so frontot -
sources/app/src/main/java/parkup/controllers/RegisteredUserController.java
r52df867 r0e407de 8 8 import parkup.configs.RegistrationRequest; 9 9 import parkup.configs.RegistrationServiceRP; 10 import parkup.data.Plate; 10 11 import parkup.data.enumarations.SessionStatus; 11 12 import parkup.entities.RegisteredUser; … … 41 42 } 42 43 43 @GetMapping({"registriranParkirac/{regParkId}/session"}) 44 45 @GetMapping({"/registriranParkirac/{regParkId}/session"}) 44 46 public SessionStatus getStatusOnParkirac(@PathVariable int regParkId){ 45 47 return parkingSessionService.getStatusOfParkirac(regParkId); … … 53 55 @PutMapping({"/registriranParkirac/{regParkId}"}) 54 56 public RegisteredUser updateRegistriranParkirac(@PathVariable int regParkId, @RequestBody RegisteredUser regPark) { 55 return this.registeredUserService.updateRegPark(regParkId,regPark.getPassword(), regPark.getFirstName(), regPark.getLastName(), regPark.getMobile(), regPark.getEmail(),regPark.getPlates()); 57 return this.registeredUserService.updateRegPark(regParkId,regPark.getPassword(), regPark.getFirstName(), regPark.getLastName(), regPark.getMobile(), regPark.getEmail()); 58 } 59 @PutMapping({"/registriranParkirac/{regParkId}/tablici"}) 60 public RegisteredUser addTablicaToUser(@PathVariable int regParkId, @RequestBody Plate plate){ 61 return this.registeredUserService.addTablica(regParkId,plate); 62 } 63 64 @DeleteMapping({"/registriranParkirac/{regParkId}/tablici"}) 65 public RegisteredUser deleteTablicaFromUser(@PathVariable int regParkId, @RequestBody Plate plate){ 66 return this.registeredUserService.deleteTablica(regParkId,plate); 56 67 } 57 68 -
sources/app/src/main/java/parkup/data/Plate.java
r52df867 r0e407de 6 6 public class Plate { 7 7 @Id 8 @SequenceGenerator(9 name="plate_sequence_generator",10 sequenceName = "plate_sequence",11 allocationSize = 1,12 initialValue = 100013 )14 @GeneratedValue( //za postgres treba sequence da se namesti i ime na generator mi ga davamo kako od gore sto e15 strategy = GenerationType.SEQUENCE,16 generator = "plate_sequence_generator"17 )18 private int plateId;19 20 8 private String plate; 21 9 -
sources/app/src/main/java/parkup/services/ParkingSessionService.java
r52df867 r0e407de 72 72 73 73 @Transactional 74 public Optional<ParkingSession> startParkingSession(String tablica, int parkingZoneId) {75 ParkingZone parkingZone = parkingZoneRepository.findByPz Id(parkingZoneId);74 public Optional<ParkingSession> startParkingSession(String tablica, String parkingZoneName) { 75 ParkingZone parkingZone = parkingZoneRepository.findByPzName(parkingZoneName); 76 76 Plate plate = plateRepository.findByPlate(tablica); 77 77 if(plate ==null) { -
sources/app/src/main/java/parkup/services/RegisteredUserService.java
r52df867 r0e407de 55 55 56 56 @Transactional 57 public RegisteredUser updateRegPark(int regParkId,String password, String name, String surname, String mobile, String email , List<Plate> regTablicki) {57 public RegisteredUser updateRegPark(int regParkId,String password, String name, String surname, String mobile, String email) { 58 58 Optional<RegisteredUser> regParkOpt = Optional.ofNullable(this.registeredUserRepository.findByRegParkId(regParkId)); 59 59 if (regParkOpt.isPresent()) { … … 81 81 regParkNov.setMobile(mobile); 82 82 } 83 regParkNov.setPlates(regTablicki);84 83 return regParkNov; 85 84 }else{ … … 151 150 return registeredUserRepository.enableRegisteredUser(email); 152 151 } 152 153 @Transactional 154 public RegisteredUser addTablica(int regParkId, Plate plate) { 155 RegisteredUser user = registeredUserRepository.findByRegParkId(regParkId); 156 user.getPlates().add(plate); 157 return user; 158 } 159 @Transactional 160 public RegisteredUser deleteTablica(int regParkId, Plate plate) { 161 RegisteredUser user = registeredUserRepository.findByRegParkId(regParkId); 162 user.getPlates().remove(plate); 163 return user; 164 } 153 165 }
Note:
See TracChangeset
for help on using the changeset viewer.