Changeset 9dd526f for sources/app/src/main/java/parkup/controllers

Timestamp:

02/02/22 14:15:35 (2 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

df4089c

Parents:

9ff45d6

Message:

backend refactoring

Location:

sources/app/src/main/java/parkup/controllers

Files:

• ParkingSessionController.java (modified) (1 diff)
• ParkingZoneController.java (modified) (1 diff)
• RegistriranParkiracController.java (modified) (2 diffs)
• VrabotenController.java (modified) (4 diffs)

sources/app/src/main/java/parkup/controllers/ParkingSessionController.java

@@ -3 +3 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import parkup.data.Tablicka;
 import parkup.entities.ParkingSession;
 import parkup.services.ParkingSessionService;

sources/app/src/main/java/parkup/controllers/ParkingZoneController.java

@@ -53 +53 @@
         return this.parkingZoneService.updateParkingZone(parkingZoneId, parkingZone.getPzName(), parkingZone.getPrice(),
                 parkingZone.getAddress(), parkingZone.getTime_from(), parkingZone.getTime_to(), parkingZone.getColor(),
-                parkingZone.getParkingSpaces(), parkingZone.getParkingZoneLocation(),parkingZone.getOdgovorniLica());
+                parkingZone.getParkingSpaces(), parkingZone.getParkingZoneLocation(),parkingZone.getResponsibleWorkers());
 
     }

sources/app/src/main/java/parkup/controllers/RegistriranParkiracController.java

@@ -8 +8 @@
 import parkup.configs.RegistrationRequest;
 import parkup.configs.RegistrationServiceRP;
-import parkup.entities.RegistriranParkirac;
-import parkup.services.RegistriranParkiracService;
+import parkup.entities.RegisteredUser;
+import parkup.services.RegisteredUserService;
 
 @RestController
 public class RegistriranParkiracController {
-    private final RegistriranParkiracService registriranParkiracService;
+    private final RegisteredUserService registeredUserService;
     private final RegistrationServiceRP registrationServiceRP;
 
     @Autowired
-    public RegistriranParkiracController(RegistriranParkiracService registriranParkiracService, RegistrationServiceRP registrationServiceRP) {
-        this.registriranParkiracService = registriranParkiracService;
+    public RegistriranParkiracController(RegisteredUserService registeredUserService, RegistrationServiceRP registrationServiceRP) {
+        this.registeredUserService = registeredUserService;
         this.registrationServiceRP = registrationServiceRP;
     }
 
     @GetMapping({"/registriranParkirac"})
-    public List<RegistriranParkirac> getAllRegistriraniParkiraci() {
-        return this.registriranParkiracService.getRegPark();
+    public List<RegisteredUser> getAllRegistriraniParkiraci() {
+        return this.registeredUserService.getRegPark();
     }
 
     @GetMapping({"/registriranParkirac/{regParkId}"})
-    public RegistriranParkirac getRegistriranParkirac(@PathVariable int regParkId) {
-        RegistriranParkirac regPark = this.registriranParkiracService.findById(regParkId);
+    public RegisteredUser getRegistriranParkirac(@PathVariable int regParkId) {
+        RegisteredUser regPark = this.registeredUserService.findById(regParkId);
         if (regPark != null) {
             return regPark;
@@ -38 +38 @@
 
     @PostMapping({"/registriranParkirac"})
-    public Optional<RegistriranParkirac> addRegistriranParkirac(@RequestBody RegistriranParkirac regPark) {
-        return this.registriranParkiracService.addRegPark(regPark);
+    public Optional<RegisteredUser> addRegistriranParkirac(@RequestBody RegisteredUser regPark) {
+        return this.registeredUserService.addRegPark(regPark);
     }
 
     @PutMapping({"/registriranParkirac/{regParkId}"})
-    public RegistriranParkirac updateRegistriranParkirac(@PathVariable int regParkId, @RequestBody RegistriranParkirac regPark) {
-        return this.registriranParkiracService.updateRegPark(regParkId, regPark.getName(), regPark.getSurname(), regPark.getMobile(), regPark.getEmail(),regPark.getRegTablicki());
+    public RegisteredUser updateRegistriranParkirac(@PathVariable int regParkId, @RequestBody RegisteredUser regPark) {
+        return this.registeredUserService.updateRegPark(regParkId, regPark.getName(), regPark.getSurname(), regPark.getMobile(), regPark.getEmail(),regPark.getPlates());
     }
 
     @DeleteMapping({"/registriranParkirac/{regParkId}"})
-    public Optional<RegistriranParkirac> deleteRegistriranParkirac(@PathVariable int regParkId) {
-        return this.registriranParkiracService.deleteRegPark(regParkId);
+    public Optional<RegisteredUser> deleteRegistriranParkirac(@PathVariable int regParkId) {
+        return this.registeredUserService.deleteRegPark(regParkId);
     }
 

sources/app/src/main/java/parkup/controllers/VrabotenController.java

@@ -3 +3 @@
 import java.util.List;
 import java.util.Optional;
-import java.util.stream.Collectors;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import parkup.configs.RegistrationRequest;
 //import parkup.configs.RegistrationServiceW;
-import parkup.data.AddUpdateVraboten;
-import parkup.data.enumarations.EmployeeStatus;
-import parkup.entities.Vraboten;
-import parkup.services.VrabotenService;
-import parkup.data.VrabotenDemo;
+import parkup.data.AddUpdateWorker;
+import parkup.data.WorkerDemoParkingZones;
+import parkup.entities.Worker;
+import parkup.services.WorkerService;
+import parkup.data.WorkerDemo;
 
 @RestController
 public class VrabotenController {
-    private final VrabotenService vrabotenService;
+    private final WorkerService workerService;
 //    private final RegistrationServiceW registrationServiceW;
 
     @Autowired
-    public VrabotenController(VrabotenService vrabotenService) {
-        this.vrabotenService = vrabotenService;
+    public VrabotenController(WorkerService workerService) {
+        this.workerService = workerService;
     }
 
     @GetMapping({"/vraboten"})
-    public List<Vraboten> getAllVraboten() {
-        return this.vrabotenService.getVraboteni();
+    public List<Worker> getAllVraboten() {
+        return this.workerService.getWorkers();
     }
 
     @GetMapping({"/vraboten/{vrabotenId}"})
-    public Vraboten getVraboten(@PathVariable int vrabotenId) {
-        Vraboten vraboten = this.vrabotenService.findById(vrabotenId);
+    public WorkerDemoParkingZones getVraboten(@PathVariable int vrabotenId) {
+        WorkerDemoParkingZones vraboten = this.workerService.findById(vrabotenId);
         if (vraboten != null) {
             return vraboten;
@@ -41 +39 @@
 
     @GetMapping({"/vraboten/vrabotenDemo"})
-    public List<VrabotenDemo> getVraboteniDemos(){
-        return this.vrabotenService.getAllVraboteniDemos();
+    public List<WorkerDemo> getVraboteniDemos(){
+        return this.workerService.getAllVraboteniDemos();
     }
 
     @PostMapping({"/vraboten"})
-    public Optional<Vraboten> addVraboten(@RequestBody AddUpdateVraboten vraboten) {
-        return this.vrabotenService.addVraboten(vraboten.getPassword(), vraboten.getConfirmPass(), vraboten.isLocked(),vraboten.getFirstName(), vraboten.getLastName(),
+    public Optional<Worker> addVraboten(@RequestBody AddUpdateWorker vraboten) {
+        return this.workerService.addWorker(vraboten.getPassword(), vraboten.getConfirmPass(), vraboten.isLocked(),vraboten.getFirstName(), vraboten.getLastName(),
                 vraboten.getMobileNumber(), vraboten.getEmail(), vraboten.getStatus(),vraboten.getParkingZones());
     }
@@ -53 +51 @@
     @PutMapping({"/vraboten/lock/{vrabotenId}"})
     public void lockVraboten(@PathVariable int vrabotenId) {
-        this.vrabotenService.lockVrabotenAcc(vrabotenId);
+        this.workerService.lockWorkerAcc(vrabotenId);
     }
 
@@ -62 +60 @@
 
     @PutMapping({"/vraboten/{vrabotenId}"})
-    public Vraboten updateVraboten(@PathVariable int vrabotenId, @RequestBody AddUpdateVraboten vraboten) {
-        return this.vrabotenService.updateVraboten(vrabotenId,vraboten.getPassword(), vraboten.getConfirmPass(), vraboten.isLocked(),vraboten.getFirstName(), vraboten.getLastName(),
+    public WorkerDemoParkingZones updateVraboten(@PathVariable int vrabotenId, @RequestBody AddUpdateWorker vraboten) {
+        return this.workerService.updateWorker(vrabotenId,vraboten.getPassword(), vraboten.getConfirmPass(), vraboten.isLocked(),vraboten.getFirstName(), vraboten.getLastName(),
                 vraboten.getMobileNumber(), vraboten.getEmail(), vraboten.getStatus(),vraboten.getParkingZones());
     }
 
     @DeleteMapping({"/vraboten/{vrabotenId}"})
-    public Optional<Vraboten> deleteVraboten(@PathVariable int vrabotenId) {
-        return this.vrabotenService.deleteVraboten(vrabotenId);
+    public Optional<Worker> deleteVraboten(@PathVariable int vrabotenId) {
+        return this.workerService.deleteWorker(vrabotenId);
     }