- Timestamp:
- 02/12/22 14:49:26 (2 years ago)
- Branches:
- master
- Children:
- 3f0bf09
- Parents:
- 2b65789
- Location:
- sources/app/src/main/java/parkup
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/controllers/RegisteredUserController.java
r2b65789 r8f153ca 58 58 } 59 59 @PutMapping({"/registriranParkirac/{regParkId}/tablici"}) 60 public RegisteredUseraddTablicaToUser(@PathVariable int regParkId, @RequestBody Plate plate){60 public String addTablicaToUser(@PathVariable int regParkId, @RequestBody Plate plate){ 61 61 return this.registeredUserService.addTablica(regParkId,plate); 62 62 } … … 66 66 } 67 67 @DeleteMapping({"/registriranParkirac/{regParkId}/tablici/{plate}"}) 68 public RegisteredUserdeleteTablicaFromUser(@PathVariable int regParkId, @PathVariable String plate){68 public String deleteTablicaFromUser(@PathVariable int regParkId, @PathVariable String plate){ 69 69 return this.registeredUserService.deleteTablica(regParkId,plate); 70 70 } -
sources/app/src/main/java/parkup/services/RegisteredUserService.java
r2b65789 r8f153ca 22 22 import parkup.data.Plate; 23 23 import parkup.entities.RegisteredUser; 24 import parkup.repositories.PlateRepository; 24 25 import parkup.repositories.RegisteredUserRepository; 25 26 … … 30 31 private final ConfirmationTokenService confirmationTokenService; 31 32 private final EmailValidator emailValidator; 33 private final PlateRepository plateRepository; 32 34 @Autowired 33 public RegisteredUserService(RegisteredUserRepository registeredUserRepository, BCryptPasswordEncoder bCryptPasswordEncoder, ConfirmationTokenService confirmationTokenService, EmailValidator emailValidator ) {35 public RegisteredUserService(RegisteredUserRepository registeredUserRepository, BCryptPasswordEncoder bCryptPasswordEncoder, ConfirmationTokenService confirmationTokenService, EmailValidator emailValidator, PlateRepository plateRepository) { 34 36 this.registeredUserRepository = registeredUserRepository; 35 37 this.bCryptPasswordEncoder = bCryptPasswordEncoder; 36 38 this.confirmationTokenService = confirmationTokenService; 37 39 this.emailValidator = emailValidator; 40 this.plateRepository = plateRepository; 38 41 } 39 42 … … 155 158 156 159 @Transactional 157 public RegisteredUseraddTablica(int regParkId, Plate plate) {160 public String addTablica(int regParkId, Plate plate) { 158 161 RegisteredUser user = registeredUserRepository.findByRegParkId(regParkId); 159 162 user.getPlates().add(plate); 160 return user;163 return plate.getPlate(); 161 164 } 162 165 @Transactional 163 public RegisteredUserdeleteTablica(int regParkId, String plate) {166 public String deleteTablica(int regParkId, String plate) { 164 167 RegisteredUser user = registeredUserRepository.findByRegParkId(regParkId); 165 user.getPlates().remove(new Plate(plate)); 166 return user; 168 Plate p =plateRepository.findByPlate(plate); 169 user.getPlates().remove(p); 170 return plate; 167 171 } 168 172
Note:
See TracChangeset
for help on using the changeset viewer.