- Timestamp:
- 02/02/22 14:15:35 (2 years ago)
- Branches:
- master
- Children:
- df4089c
- Parents:
- 9ff45d6
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sources/app/src/main/java/parkup/controllers/VrabotenController.java
r9ff45d6 r9dd526f 3 3 import java.util.List; 4 4 import java.util.Optional; 5 import java.util.stream.Collectors;6 5 7 6 import org.springframework.beans.factory.annotation.Autowired; 8 7 import org.springframework.web.bind.annotation.*; 9 import parkup.configs.RegistrationRequest;10 8 //import parkup.configs.RegistrationServiceW; 11 import parkup.data.AddUpdate Vraboten;12 import parkup.data. enumarations.EmployeeStatus;13 import parkup.entities. Vraboten;14 import parkup.services. VrabotenService;15 import parkup.data. VrabotenDemo;9 import parkup.data.AddUpdateWorker; 10 import parkup.data.WorkerDemoParkingZones; 11 import parkup.entities.Worker; 12 import parkup.services.WorkerService; 13 import parkup.data.WorkerDemo; 16 14 17 15 @RestController 18 16 public class VrabotenController { 19 private final VrabotenService vrabotenService;17 private final WorkerService workerService; 20 18 // private final RegistrationServiceW registrationServiceW; 21 19 22 20 @Autowired 23 public VrabotenController( VrabotenService vrabotenService) {24 this. vrabotenService = vrabotenService;21 public VrabotenController(WorkerService workerService) { 22 this.workerService = workerService; 25 23 } 26 24 27 25 @GetMapping({"/vraboten"}) 28 public List< Vraboten> getAllVraboten() {29 return this. vrabotenService.getVraboteni();26 public List<Worker> getAllVraboten() { 27 return this.workerService.getWorkers(); 30 28 } 31 29 32 30 @GetMapping({"/vraboten/{vrabotenId}"}) 33 public VrabotengetVraboten(@PathVariable int vrabotenId) {34 Vraboten vraboten = this.vrabotenService.findById(vrabotenId);31 public WorkerDemoParkingZones getVraboten(@PathVariable int vrabotenId) { 32 WorkerDemoParkingZones vraboten = this.workerService.findById(vrabotenId); 35 33 if (vraboten != null) { 36 34 return vraboten; … … 41 39 42 40 @GetMapping({"/vraboten/vrabotenDemo"}) 43 public List< VrabotenDemo> getVraboteniDemos(){44 return this. vrabotenService.getAllVraboteniDemos();41 public List<WorkerDemo> getVraboteniDemos(){ 42 return this.workerService.getAllVraboteniDemos(); 45 43 } 46 44 47 45 @PostMapping({"/vraboten"}) 48 public Optional< Vraboten> addVraboten(@RequestBody AddUpdateVrabotenvraboten) {49 return this. vrabotenService.addVraboten(vraboten.getPassword(), vraboten.getConfirmPass(), vraboten.isLocked(),vraboten.getFirstName(), vraboten.getLastName(),46 public Optional<Worker> addVraboten(@RequestBody AddUpdateWorker vraboten) { 47 return this.workerService.addWorker(vraboten.getPassword(), vraboten.getConfirmPass(), vraboten.isLocked(),vraboten.getFirstName(), vraboten.getLastName(), 50 48 vraboten.getMobileNumber(), vraboten.getEmail(), vraboten.getStatus(),vraboten.getParkingZones()); 51 49 } … … 53 51 @PutMapping({"/vraboten/lock/{vrabotenId}"}) 54 52 public void lockVraboten(@PathVariable int vrabotenId) { 55 this. vrabotenService.lockVrabotenAcc(vrabotenId);53 this.workerService.lockWorkerAcc(vrabotenId); 56 54 } 57 55 … … 62 60 63 61 @PutMapping({"/vraboten/{vrabotenId}"}) 64 public Vraboten updateVraboten(@PathVariable int vrabotenId, @RequestBody AddUpdateVrabotenvraboten) {65 return this. vrabotenService.updateVraboten(vrabotenId,vraboten.getPassword(), vraboten.getConfirmPass(), vraboten.isLocked(),vraboten.getFirstName(), vraboten.getLastName(),62 public WorkerDemoParkingZones updateVraboten(@PathVariable int vrabotenId, @RequestBody AddUpdateWorker vraboten) { 63 return this.workerService.updateWorker(vrabotenId,vraboten.getPassword(), vraboten.getConfirmPass(), vraboten.isLocked(),vraboten.getFirstName(), vraboten.getLastName(), 66 64 vraboten.getMobileNumber(), vraboten.getEmail(), vraboten.getStatus(),vraboten.getParkingZones()); 67 65 } 68 66 69 67 @DeleteMapping({"/vraboten/{vrabotenId}"}) 70 public Optional< Vraboten> deleteVraboten(@PathVariable int vrabotenId) {71 return this. vrabotenService.deleteVraboten(vrabotenId);68 public Optional<Worker> deleteVraboten(@PathVariable int vrabotenId) { 69 return this.workerService.deleteWorker(vrabotenId); 72 70 } 73 71
Note:
See TracChangeset
for help on using the changeset viewer.