Changeset b738035 for trip-planner/src/main/java/finki/diplomska/tripplanner/web/rest

Timestamp:

01/24/22 21:08:32 (2 years ago)

Author:

Ema <ema_spirova@…>

Branches:

master

Children:

76712b2

Parents:

bdd6491

Message:

signup/login server errors on front and remove location from planner

Location:

trip-planner/src/main/java/finki/diplomska/tripplanner/web/rest

Files:

• LocationRestController.java (modified) (1 diff)
• PlannerRestController.java (modified) (2 diffs)
• UserController.java (modified) (3 diffs)

trip-planner/src/main/java/finki/diplomska/tripplanner/web/rest/LocationRestController.java

@@ -45 +45 @@
 
     @GetMapping(value = "/region/locations")
-    public List<Location> getAllLocationsFromRegion(@RequestParam(required = false) Long regionId,
-                                                    @RequestParam(required = false)  Long companionId,
-                                                    @RequestParam(required = false) Long lengthOfStay,
-                                                    @RequestParam(required = false) String categoryIds){
+    public List<Location> getAllLocationsFromRegion(@RequestParam Long regionId,
+                                                    @RequestParam  Long companionId,
+                                                    @RequestParam Long lengthOfStay,
+                                                    @RequestParam String categoryIds){
         return this.locationService.findLocationsFromRegionForm(regionId, companionId,lengthOfStay, categoryIds);
     }
 
-    @PutMapping(value = "/add-location")
+    @PostMapping(value = "/add-location")
     public Location addLocationToPlanner(@RequestBody PlannerLocationDto plannerLocationDto){
         return this.locationService.addLocationToPlanner(plannerLocationDto);

trip-planner/src/main/java/finki/diplomska/tripplanner/web/rest/PlannerRestController.java

@@ -5 +5 @@
 import finki.diplomska.tripplanner.models.User;
 import finki.diplomska.tripplanner.models.dto.PlannerDto;
+import finki.diplomska.tripplanner.models.dto.PlannerLocationDto;
 import finki.diplomska.tripplanner.service.LocationService;
 import finki.diplomska.tripplanner.service.PlannerService;
@@ -92 +93 @@
     }
 
-
-    @DeleteMapping(value = "/delete-from-planner")
-    public ResponseEntity deleteLocationFromPlanner(@PathVariable Long locationId){
-        this.plannerService.deleteLocationFromPlanner(locationId);
-        return this.locationService.findById(locationId)
-                .map(location -> ResponseEntity.ok().body(location))
-                .orElseGet(()-> ResponseEntity.notFound().build());
+    @DeleteMapping(value = "/delete-location")
+    public ResponseEntity deleteLocationFromPlanner(@RequestBody PlannerLocationDto plannerLocationDto){
+       return  this.plannerService.deleteLocationFromPlanner(plannerLocationDto);
     }
 }

trip-planner/src/main/java/finki/diplomska/tripplanner/web/rest/UserController.java

@@ -19 +19 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.security.core.Authentication;
+
 import javax.validation.Valid;
+import java.util.List;
+import java.util.Optional;
 
 @RestController
@@ -52 +55 @@
                 )
         );
-
         SecurityContextHolder.getContext().setAuthentication(authentication);
         String jwt = SecurityConstants.TOKEN_PREFIX +  tokenProvider.generateToken(authentication);
-
         return ResponseEntity.ok(new JWTLoginSucessReponse(true, jwt));
     }
@@ -65 +66 @@
         ResponseEntity<?> errorMap = mapValidationErrorService.MapValidationService(result);
         if(errorMap != null)return errorMap;
+        User newUser = userService.saveUser(user);
+        return  new ResponseEntity<User>(newUser, HttpStatus.CREATED);
+    }
 
-        User newUser = userService.saveUser(user);
+    @GetMapping(value = "/usernames")
+    public List<String> getAllUsernames (){
+        return this.userService.getAllUsernames();
+    }
 
-        return  new ResponseEntity<User>(newUser, HttpStatus.CREATED);
+    @GetMapping(value = "/password")
+    public Optional<String> getPassword(@RequestBody UserDto userDto){
 
+        return this.userService.getPassword(userDto);
     }
+
 }