Changeset 48f3030 for phonelux-backend/src/main/java/finki/it

Timestamp:

09/23/22 02:03:14 (2 years ago)

Author:

Marko <Marko@…>

Branches:

master

Children:

895cd87

Parents:

436e0da

Message:

Implemented all use cases

Location:

phonelux-backend/src/main/java/finki/it/phoneluxbackend

Files:

• controllers/UserController.java (modified) (1 diff)
• entities/User.java (modified) (1 diff)
• security/CustomAuthenticationFilter.java (modified) (1 diff)
• services/UserService.java (modified) (2 diffs)

phonelux-backend/src/main/java/finki/it/phoneluxbackend/controllers/UserController.java

@@ -33 +33 @@
     }
 
+    @PutMapping(path = "/{userId}/editspecifications")
+    public ResponseEntity<Object> editSpecificationsForUser(@PathVariable("userId") Long userId,
+                                                            @RequestBody String specifications){
+        return userService.editSpecificationsForUser(userId,specifications);
+    }
+
+    @GetMapping(path = "/{userId}/getspecifications")
+    public String getSpecificationsForUser(@PathVariable("userId") Long userId){
+        return userService.getSpecificationsForUser(userId);
+    }
+
 }

phonelux-backend/src/main/java/finki/it/phoneluxbackend/entities/User.java

@@ -69 +69 @@
     }
 
+
     public User(Long id, String firstName, String lastName, String email, UserRole userRole) {
         this.id = id;

phonelux-backend/src/main/java/finki/it/phoneluxbackend/security/CustomAuthenticationFilter.java

@@ -52 +52 @@
                 .withClaim("name", user.getFirstName())
                 .withClaim("id", user.getId())
+//                .withClaim("pickedSpecifications",user.getSpecifications()!=null ?
+//                        user.getSpecifications() : "[]")
                 .sign(algorithm);
 

phonelux-backend/src/main/java/finki/it/phoneluxbackend/services/UserService.java

@@ -85 +85 @@
         String name = decodedJWT.getClaim("name").as(String.class);
         Long id = decodedJWT.getClaim("id").as(Long.class);
-
+//        String pickedSpecifications = decodedJWT.getClaim("pickedSpecifications").as(String.class);
         return new User(id,name,role);
     }
@@ -175 +175 @@
         return ResponseEntity.ok().build();
     }
+
+    public ResponseEntity<Object> editSpecificationsForUser(Long userId, String specifications) {
+        boolean userExists = userRepository.existsById(userId);
+        if (!userExists)
+        {
+            return ResponseEntity.badRequest().body("User with id "+userId+" doesn't exist");
+        }
+        User user = userRepository.findById(userId).get();
+
+        user.setSpecifications(specifications);
+        userRepository.save(user);
+
+        return ResponseEntity.ok().build();
+    }
+
+    public String getSpecificationsForUser(Long userId) {
+        boolean userExists = userRepository.existsById(userId);
+        if (!userExists)
+        {
+            throw new UsernameNotFoundException("User with id "+userId+" doesn't exist");
+        }
+
+        User user = userRepository.findById(userId).get();
+
+        return user.getSpecifications() != null ? user.getSpecifications() : "[]";
+    }
 }