Changeset 97fbc67 for sources/app/src/main/java/parkup/controllers/RegistriranParkiracController.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/RegistriranParkiracController.java (modified) (3 diffs)

sources/app/src/main/java/parkup/controllers/RegistriranParkiracController.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.RegistrationServiceRP;
 import parkup.entities.RegistriranParkirac;
 import parkup.services.RegistriranParkiracService;
@@ -16 +14 @@
 public class RegistriranParkiracController {
     private final RegistriranParkiracService registriranParkiracService;
+    private final RegistrationServiceRP registrationServiceRP;
 
     @Autowired
-    public RegistriranParkiracController(RegistriranParkiracService registriranParkiracService) {
+    public RegistriranParkiracController(RegistriranParkiracService registriranParkiracService, RegistrationServiceRP registrationServiceRP) {
         this.registriranParkiracService = registriranParkiracService;
+        this.registrationServiceRP = registrationServiceRP;
     }
 
@@ -38 +38 @@
 
     @PostMapping({"/registriranParkirac"})
-    public void addRegistriranParkirac(@RequestBody RegistriranParkirac regPark) {
-        this.registriranParkiracService.addRegPark(regPark);
+    public Optional<RegistriranParkirac> addRegistriranParkirac(@RequestBody RegistriranParkirac regPark) {
+        return this.registriranParkiracService.addRegPark(regPark);
     }
 
     @PutMapping({"/registriranParkirac/{regParkId}"})
-    public void updateRegistriranParkirac(@PathVariable int regParkId, @RequestBody RegistriranParkirac regPark) {
-        this.registriranParkiracService.updateRegPark(regParkId, regPark.getName(), regPark.getSurname(), regPark.getMobile(), regPark.getEmail());
+    public RegistriranParkirac updateRegistriranParkirac(@PathVariable int regParkId, @RequestBody RegistriranParkirac regPark) {
+        return this.registriranParkiracService.updateRegPark(regParkId, regPark.getName(), regPark.getSurname(), regPark.getMobile(), regPark.getEmail(),regPark.getRegTablicki());
     }
 
     @DeleteMapping({"/registriranParkirac/{regParkId}"})
-    public void deleteRegistriranParkirac(@PathVariable int regParkId) {
-        this.registriranParkiracService.deleteRegPark(regParkId);
+    public Optional<RegistriranParkirac> deleteRegistriranParkirac(@PathVariable int regParkId) {
+        return this.registriranParkiracService.deleteRegPark(regParkId);
+    }
+
+    @PostMapping({"/registriranParkirac/registration"})
+    public String register(@RequestBody RegistrationRequest request){
+        return registrationServiceRP.register(request);
+    }
+
+    @GetMapping(path = "/registriranParkirac/registration/confirm")
+    public String confirm(@RequestParam("token") String token) {
+        return registrationServiceRP.confirmToken(token);
     }
 }