Changeset 97fbc67 for sources/app/src/main/java/parkup/controllers/VrabotenController.java

Timestamp:

11/11/21 11:55:43 (3 years ago)

Author:

andrejTavchioski <andrej.tavchioski@…>

Branches:

master

Children:

2ace8f0

Parents:

3a58bd6

Message:

fixed deleteVraboten and deleteRegistriranParkirac

File:

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

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

@@ -2 +2 @@
 
 import java.util.List;
+import java.util.Optional;
+
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import parkup.configs.RegistrationRequest;
+import parkup.configs.RegistrationServiceW;
 import parkup.entities.Vraboten;
 import parkup.services.VrabotenService;
+import parkup.data.VrabotenDemo;
 
 @RestController
 public class VrabotenController {
     private final VrabotenService vrabotenService;
+    private final RegistrationServiceW registrationServiceW;
 
     @Autowired
-    public VrabotenController(VrabotenService vrabotenService) {
+    public VrabotenController(VrabotenService vrabotenService, RegistrationServiceW registrationServiceW) {
         this.vrabotenService = vrabotenService;
+        this.registrationServiceW = registrationServiceW;
     }
 
@@ -37 +38 @@
     }
 
+    @GetMapping({"/vraboten/vrabotenDemo"})
+    public List<VrabotenDemo> getVraboteniDemos(){
+        return this.vrabotenService.getAllVraboteniDemos();
+    }
+
     @PostMapping({"/vraboten"})
-    public void addVraboten(@RequestBody Vraboten vraboten) {
-        this.vrabotenService.addVraboten(vraboten);
+    public Optional<Vraboten> addVraboten(@RequestBody Vraboten vraboten) {
+        return this.vrabotenService.addVraboten(vraboten);
+    }
+
+    @PostMapping({"/vraboten/{vrabotenId}"})
+    public void lockVraboten(@PathVariable int vrabotenId) {
+        this.vrabotenService.lockVrabotenAcc(vrabotenId);
     }
 
     @PutMapping({"/vraboten/{vrabotenId}"})
-    public void updateVraboten(@PathVariable int vrabotenId, @RequestBody Vraboten vraboten) {
-        this.vrabotenService.updateVraboten(vrabotenId, vraboten.getFirstName(), vraboten.getLastName(), vraboten.getMobile(), vraboten.getEmail());
+    public Vraboten updateVraboten(@PathVariable int vrabotenId, @RequestBody Vraboten vraboten) {
+        return this.vrabotenService.updateVraboten(vrabotenId, vraboten.getFirstName(), vraboten.getLastName(),
+                vraboten.getMobile(), vraboten.getEmail(), vraboten.getStatus());
     }
 
     @DeleteMapping({"/vraboten/{vrabotenId}"})
-    public void deleteVraboten(@PathVariable int vrabotenId) {
-        this.vrabotenService.deleteVraboten(vrabotenId);
+    public Optional<Vraboten> deleteVraboten(@PathVariable int vrabotenId) {
+        return this.vrabotenService.deleteVraboten(vrabotenId);
+    }
+
+    @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);
     }
 }