Changeset 9ff45d6 for sources/app/src/main/java/parkup/controllers/VrabotenController.java

Timestamp:

12/24/21 23:31:23 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

9dd526f

Parents:

8588fcb

Message:

Fixed some functionalities related to parkingSessions and parkingZones

File:

• sources/app/src/main/java/parkup/controllers/VrabotenController.java (modified) (4 diffs)

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.configs.RegistrationServiceW;
+import parkup.data.AddUpdateVraboten;
+import parkup.data.enumarations.EmployeeStatus;
 import parkup.entities.Vraboten;
 import parkup.services.VrabotenService;
@@ -15 +18 @@
 public class VrabotenController {
     private final VrabotenService vrabotenService;
-    private final RegistrationServiceW registrationServiceW;
+//    private final RegistrationServiceW registrationServiceW;
 
     @Autowired
-    public VrabotenController(VrabotenService vrabotenService, RegistrationServiceW registrationServiceW) {
+    public VrabotenController(VrabotenService vrabotenService) {
         this.vrabotenService = vrabotenService;
-        this.registrationServiceW = registrationServiceW;
     }
 
@@ -44 +46 @@
 
     @PostMapping({"/vraboten"})
-    public Optional<Vraboten> addVraboten(@RequestBody Vraboten vraboten) {
-        return this.vrabotenService.addVraboten(vraboten);
+    public Optional<Vraboten> addVraboten(@RequestBody AddUpdateVraboten vraboten) {
+        return this.vrabotenService.addVraboten(vraboten.getPassword(), vraboten.getConfirmPass(), vraboten.isLocked(),vraboten.getFirstName(), vraboten.getLastName(),
+                vraboten.getMobileNumber(), vraboten.getEmail(), vraboten.getStatus(),vraboten.getParkingZones());
     }
 
-    @PostMapping({"/vraboten/{vrabotenId}"})
+    @PutMapping({"/vraboten/lock/{vrabotenId}"})
     public void lockVraboten(@PathVariable int vrabotenId) {
         this.vrabotenService.lockVrabotenAcc(vrabotenId);
     }
 
+//    @PostMapping({"/vraboten/setStatus/{vrabotenId}"})
+//    public void setVrabotenStatus(@PathVariable int vrabotenId,@RequestParam String vrabotenStatus){
+//        this.vrabotenService.setVrabotenStatus(vrabotenId,vrabotenStatus);
+//    }
+
     @PutMapping({"/vraboten/{vrabotenId}"})
-    public Vraboten updateVraboten(@PathVariable int vrabotenId, @RequestBody Vraboten vraboten) {
-        return this.vrabotenService.updateVraboten(vrabotenId, vraboten.getFirstName(), vraboten.getLastName(),
-                vraboten.getMobile(), vraboten.getEmail(), vraboten.getStatus());
+    public Vraboten updateVraboten(@PathVariable int vrabotenId, @RequestBody AddUpdateVraboten vraboten) {
+        return this.vrabotenService.updateVraboten(vrabotenId,vraboten.getPassword(), vraboten.getConfirmPass(), vraboten.isLocked(),vraboten.getFirstName(), vraboten.getLastName(),
+                vraboten.getMobileNumber(), vraboten.getEmail(), vraboten.getStatus(),vraboten.getParkingZones());
     }
 
@@ -64 +72 @@
     }
 
-    @PostMapping({"/vraboten/registration"})
-    public String register(@RequestBody RegistrationRequest request){
-        return registrationServiceW.register(request);
-    }
-
-    @GetMapping(path = "/vraboten/registration/confirm")
-    public String confirm(@RequestParam("token") String token) {
-        return registrationServiceW.confirmToken(token);
-    }
+//    @PostMapping({"/vraboten/registration"})
+//    public String register(@RequestBody RegistrationRequest request){
+//        return registrationServiceW.register(request);
+//    }
+//
+//    @GetMapping(path = "/vraboten/registration/confirm")
+//    public String confirm(@RequestParam("token") String token) {
+//        return registrationServiceW.confirmToken(token);
+//    }
 }