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

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

@@ -2 +2 @@
 
 import java.util.List;
+import java.util.Optional;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import parkup.configs.RegistrationRequest;
-import parkup.configs.RegistrationService;
+import parkup.configs.RegistrationServiceRP;
 import parkup.entities.Administrator;
 import parkup.services.AdministratorService;
@@ -12 +14 @@
 public class AdministratorController {
     private final AdministratorService administratorService;
-    private final RegistrationService registrationService;
+    private final RegistrationServiceRP registrationServiceRP;
 
     @Autowired
-    public AdministratorController(AdministratorService administratorService, RegistrationService registrationService) {
+    public AdministratorController(AdministratorService administratorService, RegistrationServiceRP registrationServiceRP) {
         this.administratorService = administratorService;
-        this.registrationService = registrationService;
+        this.registrationServiceRP = registrationServiceRP;
     }
 
@@ -36 +38 @@
 
     @PostMapping({"/administrator"})
-    public void addAdministrator(@RequestBody Administrator administrator) {
-        this.administratorService.addAdministrator(administrator);
+    public Optional<Administrator> addAdministrator(@RequestBody Administrator administrator) {
+        return this.administratorService.addAdministrator(administrator);
     }
 
     @PutMapping({"/administrator/{administratorId}"})
-    public void updateAdministrator(@PathVariable int administratorId, @RequestBody Administrator administrator) {
-        this.administratorService.updateAdministrator(administratorId, administrator.getFirstName(), administrator.getLastName(), administrator.getMobile(), administrator.getEmail());
+    public Administrator updateAdministrator(@PathVariable int administratorId, @RequestBody Administrator administrator) {
+        return this.administratorService.updateAdministrator(administratorId, administrator.getFirstName(), administrator.getLastName(), administrator.getMobile(), administrator.getEmail());
     }
 
     @DeleteMapping({"/administrator/{administratorId}"})
-    public void deleteAdministrator(@PathVariable int administratorId) {
-        this.administratorService.deleteAdministrator(administratorId);
+    public Optional<Administrator> deleteAdministrator(@PathVariable int administratorId) {
+        return this.administratorService.deleteAdministrator(administratorId);
     }
 
     @PostMapping({"/administrator/registration"})
     public String register(@RequestBody RegistrationRequest request){
-        return registrationService.register(request);
+        return registrationServiceRP.register(request);
     }
 
     @GetMapping(path = "/administrator/registration/confirm")
     public String confirm(@RequestParam("token") String token) {
-        return registrationService.confirmToken(token);
+        return registrationServiceRP.confirmToken(token);
     }
 }