Changeset 9ff45d6 for sources/app/src/main/java/parkup/controllers
- Timestamp:
- 12/24/21 23:31:23 (3 years ago)
- Branches:
- master
- Children:
- 9dd526f
- Parents:
- 8588fcb
- Location:
- sources/app/src/main/java/parkup/controllers
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/controllers/ParkingSessionController.java
r8588fcb r9ff45d6 3 3 import org.springframework.beans.factory.annotation.Autowired; 4 4 import org.springframework.web.bind.annotation.*; 5 import parkup.data.Tablicka; 5 6 import parkup.entities.ParkingSession; 6 7 import parkup.services.ParkingSessionService; … … 33 34 } 34 35 35 @PostMapping({"/parkingSession"}) 36 public Optional<ParkingSession> addParkingSession(@RequestBody ParkingSession parkingSession) { 37 //System.out.println("???????"); 38 return this.parkingSessionService.addParkingSession(parkingSession); 36 @PostMapping({"/parkingSession/{parkingZoneId}"}) 37 public Optional<ParkingSession> startParkingSession(@RequestParam String tablicka, @PathVariable int parkingZoneId) { 38 return this.parkingSessionService.startParkingSession(tablicka,parkingZoneId); 39 39 } 40 // TODO: vidi kako kje funkcionira update na sesija i nejzino plakjanje so frontot 40 41 41 @PutMapping({"/parkingSession/{parkingSessionId}"}) 42 public void updateParkingSession(@PathVariable int parkingSessionId, @RequestBody ParkingSession parkingSession) { 43 parkingSessionService.updateParkingSession(parkingSessionId, 44 parkingSession.getTimeStart(), parkingSession.getTimeEnd(), parkingSession.getTablica()); 42 // @PutMapping({"/parkingSession/{parkingSessionId}"}) 43 // public void updateParkingSession(@PathVariable int parkingSessionId, @RequestBody ParkingSession parkingSession) { 44 // parkingSessionService.updateParkingSession(parkingSessionId, 45 // parkingSession.getTimeStart(), parkingSession.getTimeEnd(), parkingSession.getTablica()); 46 // } 47 // @PutMapping({"/parkingSession/pay/{parkingSessionId"}) 48 // public void payParkingSession(@PathVariable int parkingSessionId){ 49 // parkingSessionService.paySession 50 // } 51 @PutMapping("/parkingSession/end/{parkingSessionId}") 52 public ParkingSession endParkingSession(@PathVariable int parkingSessionId){ 53 return this.parkingSessionService.endParkingSession(parkingSessionId); 54 } 55 @PutMapping("/parkingSession/verify/{parkingSessionId}") 56 public ParkingSession verifyParkingSession(@PathVariable int parkingSessionId,@RequestParam String parkingSpaceName,@RequestParam int parkingZoneId){ 57 return this.parkingSessionService.verifyParkingSession(parkingSessionId,parkingSpaceName,parkingZoneId); 58 } 59 @GetMapping("/parkingSession/calculate/{parkingSessionId}") 60 public int calculateParkingSession(@PathVariable int parkingSessionId){ 61 return this.parkingSessionService.calculatePayment(parkingSessionId); 62 } 63 @PutMapping("/parkingSession/pay/{parkingSessionId}") 64 public boolean payParkingSession(@PathVariable int parkingSessionId,@RequestParam String expireDate){ 65 return this.parkingSessionService.payParkingSession(parkingSessionId,expireDate); 45 66 } 46 67 -
sources/app/src/main/java/parkup/controllers/ParkingSpaceController.java
r8588fcb r9ff45d6 33 33 } 34 34 35 @PostMapping({"/parkingSpace"}) 36 public Optional<ParkingSpace> addParkingSpace(@RequestBody ParkingSpace parkingSpace) { 37 <<<<<<< HEAD 38 System.out.println("???????"); 39 ======= 40 //System.out.println("???????"); 41 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939 42 return this.parkingSpaceService.addParkingSpace(parkingSpace); 35 @PostMapping({"/parkingSpace/add/{parkingZoneId}"}) 36 public Optional<ParkingSpace> addParkingSpace(@RequestBody ParkingSpace parkingSpace,@PathVariable int parkingZoneId) { 37 return this.parkingSpaceService.addParkingSpace(parkingSpace,parkingZoneId); 43 38 } 44 39 45 40 @PutMapping({"/parkingSpace/{parkingSpaceId}"}) 46 41 public void updateParkingSpace(@PathVariable int parkingSpaceId, @RequestBody ParkingSpace parkingSpace) { 47 parkingSpaceService.updateParkingSpace(parkingSpaceId, parkingSpace.getPsName(), parkingSpace.isTaken(), 48 parkingSpace.isHandicaped(), parkingSpace.getLat(), parkingSpace.getLng()); 42 parkingSpaceService.updateParkingSpace(parkingSpaceId, parkingSpace.getPsName(), parkingSpace.isTaken(), parkingSpace.getLat(), parkingSpace.getLng()); 49 43 } 50 44 -
sources/app/src/main/java/parkup/controllers/ParkingZoneController.java
r8588fcb r9ff45d6 3 3 import org.springframework.beans.factory.annotation.Autowired; 4 4 import org.springframework.web.bind.annotation.*; 5 import parkup.data.ParkingZoneAdminView; 5 6 import parkup.entities.ParkingZone; 6 7 import parkup.services.ParkingZoneService; … … 49 50 50 51 @PutMapping({"/parkingZone/{parkingZoneId}"}) 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 <<<<<<< HEAD 52 public ParkingZone updateParkingZone(@PathVariable int parkingZoneId, @RequestBody ParkingZoneAdminView parkingZone) { 53 return this.parkingZoneService.updateParkingZone(parkingZoneId, parkingZone.getPzName(), parkingZone.getPrice(), 54 parkingZone.getAddress(), parkingZone.getTime_from(), parkingZone.getTime_to(), parkingZone.getColor(), 55 55 parkingZone.getParkingSpaces(), parkingZone.getParkingZoneLocation(),parkingZone.getOdgovorniLica()); 56 ======= 57 parkingZone.getParkingSpaces(), parkingZone.getParkingZoneLocation()); 58 >>>>>>> 9504a097ce80831ea7e7130dff7215d5fbf8e939 56 59 57 } 60 58 -
sources/app/src/main/java/parkup/controllers/VrabotenController.java
r8588fcb r9ff45d6 3 3 import java.util.List; 4 4 import java.util.Optional; 5 import java.util.stream.Collectors; 5 6 6 7 import org.springframework.beans.factory.annotation.Autowired; 7 8 import org.springframework.web.bind.annotation.*; 8 9 import parkup.configs.RegistrationRequest; 9 import parkup.configs.RegistrationServiceW; 10 //import parkup.configs.RegistrationServiceW; 11 import parkup.data.AddUpdateVraboten; 12 import parkup.data.enumarations.EmployeeStatus; 10 13 import parkup.entities.Vraboten; 11 14 import parkup.services.VrabotenService; … … 15 18 public class VrabotenController { 16 19 private final VrabotenService vrabotenService; 17 private final RegistrationServiceW registrationServiceW;20 // private final RegistrationServiceW registrationServiceW; 18 21 19 22 @Autowired 20 public VrabotenController(VrabotenService vrabotenService , RegistrationServiceW registrationServiceW) {23 public VrabotenController(VrabotenService vrabotenService) { 21 24 this.vrabotenService = vrabotenService; 22 this.registrationServiceW = registrationServiceW;23 25 } 24 26 … … 44 46 45 47 @PostMapping({"/vraboten"}) 46 public Optional<Vraboten> addVraboten(@RequestBody Vraboten vraboten) { 47 return this.vrabotenService.addVraboten(vraboten); 48 public Optional<Vraboten> addVraboten(@RequestBody AddUpdateVraboten vraboten) { 49 return this.vrabotenService.addVraboten(vraboten.getPassword(), vraboten.getConfirmPass(), vraboten.isLocked(),vraboten.getFirstName(), vraboten.getLastName(), 50 vraboten.getMobileNumber(), vraboten.getEmail(), vraboten.getStatus(),vraboten.getParkingZones()); 48 51 } 49 52 50 @P ostMapping({"/vraboten/{vrabotenId}"})53 @PutMapping({"/vraboten/lock/{vrabotenId}"}) 51 54 public void lockVraboten(@PathVariable int vrabotenId) { 52 55 this.vrabotenService.lockVrabotenAcc(vrabotenId); 53 56 } 54 57 58 // @PostMapping({"/vraboten/setStatus/{vrabotenId}"}) 59 // public void setVrabotenStatus(@PathVariable int vrabotenId,@RequestParam String vrabotenStatus){ 60 // this.vrabotenService.setVrabotenStatus(vrabotenId,vrabotenStatus); 61 // } 62 55 63 @PutMapping({"/vraboten/{vrabotenId}"}) 56 public Vraboten updateVraboten(@PathVariable int vrabotenId, @RequestBody Vraboten vraboten) {57 return this.vrabotenService.updateVraboten(vrabotenId, 58 vraboten.getMobile (), vraboten.getEmail(), vraboten.getStatus());64 public Vraboten updateVraboten(@PathVariable int vrabotenId, @RequestBody AddUpdateVraboten vraboten) { 65 return this.vrabotenService.updateVraboten(vrabotenId,vraboten.getPassword(), vraboten.getConfirmPass(), vraboten.isLocked(),vraboten.getFirstName(), vraboten.getLastName(), 66 vraboten.getMobileNumber(), vraboten.getEmail(), vraboten.getStatus(),vraboten.getParkingZones()); 59 67 } 60 68 … … 64 72 } 65 73 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);74 }74 // @PostMapping({"/vraboten/registration"}) 75 // public String register(@RequestBody RegistrationRequest request){ 76 // return registrationServiceW.register(request); 77 // } 78 // 79 // @GetMapping(path = "/vraboten/registration/confirm") 80 // public String confirm(@RequestParam("token") String token) { 81 // return registrationServiceW.confirmToken(token); 82 // } 75 83 }
Note:
See TracChangeset
for help on using the changeset viewer.