Changeset f6bc52d for sources/app/src/main/java/parkup/controllers
- Timestamp:
- 11/04/21 16:59:49 (3 years ago)
- Branches:
- master
- Children:
- 9504a09
- Parents:
- ce6ad22
- Location:
- sources/app/src/main/java/parkup/controllers
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/controllers/AdministratorController.java
rce6ad22 rf6bc52d 2 2 3 3 import java.util.List; 4 import java.util.Optional; 5 4 6 import org.springframework.beans.factory.annotation.Autowired; 5 7 import org.springframework.web.bind.annotation.*; 6 8 import parkup.configs.RegistrationRequest; 7 import parkup.configs.RegistrationService ;9 import parkup.configs.RegistrationServiceRP; 8 10 import parkup.entities.Administrator; 9 11 import parkup.services.AdministratorService; … … 12 14 public class AdministratorController { 13 15 private final AdministratorService administratorService; 14 private final RegistrationService registrationService;16 private final RegistrationServiceRP registrationServiceRP; 15 17 16 18 @Autowired 17 public AdministratorController(AdministratorService administratorService, RegistrationService registrationService) {19 public AdministratorController(AdministratorService administratorService, RegistrationServiceRP registrationServiceRP) { 18 20 this.administratorService = administratorService; 19 this.registrationService = registrationService;21 this.registrationServiceRP = registrationServiceRP; 20 22 } 21 23 … … 36 38 37 39 @PostMapping({"/administrator"}) 38 public voidaddAdministrator(@RequestBody Administrator administrator) {39 this.administratorService.addAdministrator(administrator);40 public Optional<Administrator> addAdministrator(@RequestBody Administrator administrator) { 41 return this.administratorService.addAdministrator(administrator); 40 42 } 41 43 42 44 @PutMapping({"/administrator/{administratorId}"}) 43 public voidupdateAdministrator(@PathVariable int administratorId, @RequestBody Administrator administrator) {44 this.administratorService.updateAdministrator(administratorId, administrator.getFirstName(), administrator.getLastName(), administrator.getMobile(), administrator.getEmail());45 public Administrator updateAdministrator(@PathVariable int administratorId, @RequestBody Administrator administrator) { 46 return this.administratorService.updateAdministrator(administratorId, administrator.getFirstName(), administrator.getLastName(), administrator.getMobile(), administrator.getEmail()); 45 47 } 46 48 47 49 @DeleteMapping({"/administrator/{administratorId}"}) 48 public voiddeleteAdministrator(@PathVariable int administratorId) {49 this.administratorService.deleteAdministrator(administratorId);50 public Optional<Administrator> deleteAdministrator(@PathVariable int administratorId) { 51 return this.administratorService.deleteAdministrator(administratorId); 50 52 } 51 53 52 54 @PostMapping({"/administrator/registration"}) 53 55 public String register(@RequestBody RegistrationRequest request){ 54 return registrationService .register(request);56 return registrationServiceRP.register(request); 55 57 } 56 58 57 59 @GetMapping(path = "/administrator/registration/confirm") 58 60 public String confirm(@RequestParam("token") String token) { 59 return registrationService .confirmToken(token);61 return registrationServiceRP.confirmToken(token); 60 62 } 61 63 } -
sources/app/src/main/java/parkup/controllers/ParkingSessionController.java
rce6ad22 rf6bc52d 7 7 8 8 import java.util.List; 9 import java.util.Optional; 9 10 10 11 @RestController … … 33 34 34 35 @PostMapping({"/parkingSession"}) 35 public voidaddParkingSession(@RequestBody ParkingSession parkingSession) {36 public Optional<ParkingSession> addParkingSession(@RequestBody ParkingSession parkingSession) { 36 37 //System.out.println("???????"); 37 parkingSessionService.addParkingSession(parkingSession);38 return this.parkingSessionService.addParkingSession(parkingSession); 38 39 } 39 40 40 41 @PutMapping({"/parkingSession/{parkingSessionId}"}) 41 42 public void updateParkingSession(@PathVariable int parkingSessionId, @RequestBody ParkingSession parkingSession) { 42 parkingSessionService.updateParkingSession(parkingSessionId, parkingSession.getTimeStart(), parkingSession.getTimeEnd()); 43 parkingSessionService.updateParkingSession(parkingSessionId, 44 parkingSession.getTimeStart(), parkingSession.getTimeEnd(), parkingSession.getTablica()); 43 45 } 44 46 45 47 @DeleteMapping({"/parkingSession/{parkingSessionId}"}) 46 public voiddeleteParkingSession(@PathVariable int parkingSessionId) {47 parkingSessionService.deleteParkingSession(parkingSessionId);48 public Optional<ParkingSession> deleteParkingSession(@PathVariable int parkingSessionId) { 49 return this.parkingSessionService.deleteParkingSession(parkingSessionId); 48 50 } 49 51 } -
sources/app/src/main/java/parkup/controllers/ParkingSpaceController.java
rce6ad22 rf6bc52d 7 7 8 8 import java.util.List; 9 import java.util.Optional; 9 10 10 11 @RestController … … 33 34 34 35 @PostMapping({"/parkingSpace"}) 35 public voidaddParkingSpace(@RequestBody ParkingSpace parkingSpace) {36 public Optional<ParkingSpace> addParkingSpace(@RequestBody ParkingSpace parkingSpace) { 36 37 //System.out.println("???????"); 37 parkingSpaceService.addParkingSpace(parkingSpace);38 return this.parkingSpaceService.addParkingSpace(parkingSpace); 38 39 } 39 40 40 41 @PutMapping({"/parkingSpace/{parkingSpaceId}"}) 41 42 public void updateParkingSpace(@PathVariable int parkingSpaceId, @RequestBody ParkingSpace parkingSpace) { 42 parkingSpaceService.updateParkingSpace(parkingSpaceId, parkingSpace.getPsName(), parkingSpace.isTaken(), parkingSpace.isHandicaped()); 43 parkingSpaceService.updateParkingSpace(parkingSpaceId, parkingSpace.getPsName(), parkingSpace.isTaken(), 44 parkingSpace.isHandicaped(), parkingSpace.getLat(), parkingSpace.getLng()); 43 45 } 44 46 45 47 @DeleteMapping({"/parkingSpace/{parkingSpaceId}"}) 46 public voiddeleteParkingSpace(@PathVariable int parkingSpaceId) {47 parkingSpaceService.deleteParkingSpace(parkingSpaceId);48 public Optional<ParkingSpace> deleteParkingSpace(@PathVariable int parkingSpaceId) { 49 return this.parkingSpaceService.deleteParkingSpace(parkingSpaceId); 48 50 } 49 51 } -
sources/app/src/main/java/parkup/controllers/ParkingZoneController.java
rce6ad22 rf6bc52d 7 7 8 8 import java.util.List; 9 import java.util.Optional; 9 10 10 11 @RestController … … 32 33 } 33 34 35 @GetMapping({"parkingZone/parkingZoneNames"}) 36 public List<String> getParkingZoneNames(){ 37 return this.parkingZoneService.getAllParkingZoneNames(); 38 } 39 34 40 @PostMapping({"/parkingZone"}) 35 public void addParkingZone(@RequestBody ParkingZone parkingZone) { 36 //System.out.println("???????"); 37 parkingZoneService.addParkingZone(parkingZone); 41 public Optional<ParkingZone> addParkingZone(@RequestBody ParkingZone parkingZone) { 42 return this.parkingZoneService.addParkingZone(parkingZone); 43 } 44 45 @PostMapping("/parkingZoneName") 46 public ParkingZone addParkingZoneName(@RequestBody String name){ 47 return this.parkingZoneService.addParkingZoneNameOnly(name); 38 48 } 39 49 40 50 @PutMapping({"/parkingZone/{parkingZoneId}"}) 41 public void updateParkingZone(@PathVariable int parkingZoneId, @RequestBody ParkingZone parkingZone) { 42 parkingZoneService.updateParkingZone(parkingZoneId, parkingZone.getPzName(), parkingZone.getPrice(), parkingZone.getCapacity(), parkingZone.getWorkHours(),parkingZone.getLocation()); 51 public ParkingZone updateParkingZone(@PathVariable int parkingZoneId, @RequestBody ParkingZone parkingZone) { 52 return this.parkingZoneService.updateParkingZone(parkingZoneId, parkingZone.getPzName(), parkingZone.getPrice(), parkingZone.getCapacity(), 53 parkingZone.getLocation(), parkingZone.getFrom(), parkingZone.getTo(), parkingZone.getColor(), 54 parkingZone.getParkingSpaces(), parkingZone.getParkingZoneLocation()); 43 55 } 44 56 45 57 @DeleteMapping({"/parkingZone/{parkingZoneId}"}) 46 public voiddeleteParkingZone(@PathVariable int parkingZoneId) {47 parkingZoneService.deleteParkingZone(parkingZoneId);58 public Optional<ParkingZone> deleteParkingZone(@PathVariable int parkingZoneId) { 59 return this.parkingZoneService.deleteParkingZone(parkingZoneId); 48 60 } 49 61 } -
sources/app/src/main/java/parkup/controllers/RegistriranParkiracController.java
rce6ad22 rf6bc52d 2 2 3 3 import java.util.List; 4 import java.util.Optional; 5 4 6 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.web.bind.annotation.DeleteMapping; 6 import org.springframework.web.bind.annotation.GetMapping; 7 import org.springframework.web.bind.annotation.PathVariable; 8 import org.springframework.web.bind.annotation.PostMapping; 9 import org.springframework.web.bind.annotation.PutMapping; 10 import org.springframework.web.bind.annotation.RequestBody; 11 import org.springframework.web.bind.annotation.RestController; 7 import org.springframework.web.bind.annotation.*; 8 import parkup.configs.RegistrationRequest; 9 import parkup.configs.RegistrationServiceRP; 12 10 import parkup.entities.RegistriranParkirac; 13 11 import parkup.services.RegistriranParkiracService; … … 16 14 public class RegistriranParkiracController { 17 15 private final RegistriranParkiracService registriranParkiracService; 16 private final RegistrationServiceRP registrationServiceRP; 18 17 19 18 @Autowired 20 public RegistriranParkiracController(RegistriranParkiracService registriranParkiracService ) {19 public RegistriranParkiracController(RegistriranParkiracService registriranParkiracService, RegistrationServiceRP registrationServiceRP) { 21 20 this.registriranParkiracService = registriranParkiracService; 21 this.registrationServiceRP = registrationServiceRP; 22 22 } 23 23 … … 38 38 39 39 @PostMapping({"/registriranParkirac"}) 40 public voidaddRegistriranParkirac(@RequestBody RegistriranParkirac regPark) {41 this.registriranParkiracService.addRegPark(regPark);40 public Optional<RegistriranParkirac> addRegistriranParkirac(@RequestBody RegistriranParkirac regPark) { 41 return this.registriranParkiracService.addRegPark(regPark); 42 42 } 43 43 44 44 @PutMapping({"/registriranParkirac/{regParkId}"}) 45 public voidupdateRegistriranParkirac(@PathVariable int regParkId, @RequestBody RegistriranParkirac regPark) {46 this.registriranParkiracService.updateRegPark(regParkId, regPark.getName(), regPark.getSurname(), regPark.getMobile(), regPark.getEmail());45 public RegistriranParkirac updateRegistriranParkirac(@PathVariable int regParkId, @RequestBody RegistriranParkirac regPark) { 46 return this.registriranParkiracService.updateRegPark(regParkId, regPark.getName(), regPark.getSurname(), regPark.getMobile(), regPark.getEmail(),regPark.getRegTablicki()); 47 47 } 48 48 49 49 @DeleteMapping({"/registriranParkirac/{regParkId}"}) 50 public void deleteRegistriranParkirac(@PathVariable int regParkId) { 51 this.registriranParkiracService.deleteRegPark(regParkId); 50 public Optional<RegistriranParkirac> deleteRegistriranParkirac(@PathVariable int regParkId) { 51 return this.registriranParkiracService.deleteRegPark(regParkId); 52 } 53 54 @PostMapping({"/registriranParkirac/registration"}) 55 public String register(@RequestBody RegistrationRequest request){ 56 return registrationServiceRP.register(request); 57 } 58 59 @GetMapping(path = "/registriranParkirac/registration/confirm") 60 public String confirm(@RequestParam("token") String token) { 61 return registrationServiceRP.confirmToken(token); 52 62 } 53 63 } -
sources/app/src/main/java/parkup/controllers/VrabotenController.java
rce6ad22 rf6bc52d 2 2 3 3 import java.util.List; 4 import java.util.Optional; 5 4 6 import org.springframework.beans.factory.annotation.Autowired; 5 import org.springframework.web.bind.annotation.DeleteMapping; 6 import org.springframework.web.bind.annotation.GetMapping; 7 import org.springframework.web.bind.annotation.PathVariable; 8 import org.springframework.web.bind.annotation.PostMapping; 9 import org.springframework.web.bind.annotation.PutMapping; 10 import org.springframework.web.bind.annotation.RequestBody; 11 import org.springframework.web.bind.annotation.RestController; 7 import org.springframework.web.bind.annotation.*; 8 import parkup.configs.RegistrationRequest; 9 import parkup.configs.RegistrationServiceW; 12 10 import parkup.entities.Vraboten; 13 11 import parkup.services.VrabotenService; 12 import parkup.data.VrabotenDemo; 14 13 15 14 @RestController 16 15 public class VrabotenController { 17 16 private final VrabotenService vrabotenService; 17 private final RegistrationServiceW registrationServiceW; 18 18 19 19 @Autowired 20 public VrabotenController(VrabotenService vrabotenService ) {20 public VrabotenController(VrabotenService vrabotenService, RegistrationServiceW registrationServiceW) { 21 21 this.vrabotenService = vrabotenService; 22 this.registrationServiceW = registrationServiceW; 22 23 } 23 24 … … 37 38 } 38 39 40 @GetMapping({"/vraboten/vrabotenDemo"}) 41 public List<VrabotenDemo> getVraboteniDemos(){ 42 return this.vrabotenService.getAllVraboteniDemos(); 43 } 44 39 45 @PostMapping({"/vraboten"}) 40 public void addVraboten(@RequestBody Vraboten vraboten) { 41 this.vrabotenService.addVraboten(vraboten); 46 public Optional<Vraboten> addVraboten(@RequestBody Vraboten vraboten) { 47 return this.vrabotenService.addVraboten(vraboten); 48 } 49 50 @PostMapping({"/vraboten/{vrabotenId}"}) 51 public void lockVraboten(@PathVariable int vrabotenId) { 52 this.vrabotenService.lockVrabotenAcc(vrabotenId); 42 53 } 43 54 44 55 @PutMapping({"/vraboten/{vrabotenId}"}) 45 public void updateVraboten(@PathVariable int vrabotenId, @RequestBody Vraboten vraboten) { 46 this.vrabotenService.updateVraboten(vrabotenId, vraboten.getFirstName(), vraboten.getLastName(), vraboten.getMobile(), vraboten.getEmail()); 56 public Vraboten updateVraboten(@PathVariable int vrabotenId, @RequestBody Vraboten vraboten) { 57 return this.vrabotenService.updateVraboten(vrabotenId, vraboten.getFirstName(), vraboten.getLastName(), 58 vraboten.getMobile(), vraboten.getEmail(), vraboten.getStatus()); 47 59 } 48 60 49 61 @DeleteMapping({"/vraboten/{vrabotenId}"}) 50 public void deleteVraboten(@PathVariable int vrabotenId) { 51 this.vrabotenService.deleteVraboten(vrabotenId); 62 public Optional<Vraboten> deleteVraboten(@PathVariable int vrabotenId) { 63 return this.vrabotenService.deleteVraboten(vrabotenId); 64 } 65 66 @PostMapping({"/vraboten/registration"}) 67 public String register(@RequestBody RegistrationRequest request){ 68 return registrationServiceW.register(request); 69 } 70 71 @GetMapping(path = "/vraboten/registration/confirm") 72 public String confirm(@RequestParam("token") String token) { 73 return registrationServiceW.confirmToken(token); 52 74 } 53 75 }
Note:
See TracChangeset
for help on using the changeset viewer.