Add the NoteDTO

Author: Chamal-Peiris

src/main/java/lk/ijse/dep/note/api/UserController.java

@@ -7,6 +7,7 @@
 import lk.ijse.dep.note.service.exception.NotFoundException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
+import org.springframework.validation.Errors;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
@@ -21,14 +22,17 @@ public class UserController {
 
     @ResponseStatus(HttpStatus.CREATED)
     @PostMapping(consumes = "application/json", produces = "application/json")
-    public UserDTO registerUser(@RequestBody @Valid UserDTO user) {
+    public UserDTO registerUser(@RequestBody @Validated UserDTO user, Errors errors) {
 
+      if(errors.hasFieldErrors()){
+          throw new ResponseStatusException(HttpStatus.BAD_REQUEST,errors.getFieldErrors().get(0).getDefaultMessage());
+      }
         userService.registerUser(user);
 
         return user;
     }
 
-    @GetMapping(path = "{userId:[A-Fa-f0-\\~]{36}}}", produces = "application/json")
+    @GetMapping(path = "/{userId:[A-Fa-f0-9\\-]{36}}", produces = "application/json")
     public UserDTO getUserInfo(@PathVariable String userId) {
         System.out.println("get" + userId);
 
@@ -37,18 +41,20 @@ public UserDTO getUserInfo(@PathVariable String userId) {
     }
 
     @ResponseStatus(HttpStatus.NO_CONTENT)
-    @DeleteMapping("{userId:[A-Fa-f0-\\~]{36}}")
+    @DeleteMapping("/{userId:[A-Fa-f0-9\\-]{36}}")
     public void deleteuser(@PathVariable String userId) {
 
         userService.deleteUser(userId);
 
     }
 
     @ResponseStatus(HttpStatus.NO_CONTENT)
-    @PatchMapping(path = "{userId:[A-Fa-f0-\\~]{36}}", consumes = "application/json")
-    public void updateUser(@PathVariable String userId, @RequestBody @Valid UserDTO user) {
-
+    @PatchMapping(path = "/{userId:[A-Fa-f0-9\\-]{36}}", consumes = "application/json")
+    public void updateUser(@PathVariable String userId, @RequestBody @Valid UserDTO user, Errors errors) {
 
+        if(errors.hasFieldErrors()){
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST,errors.getFieldErrors().get(0).getDefaultMessage());
+        }
 
         user.setId(userId);
         userService.updateUser(user);

src/main/java/lk/ijse/dep/note/dto/NoteDTO.java

@@ -0,0 +1,20 @@
+package lk.ijse.dep.note.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Null;
+import javax.validation.constraints.Pattern;
+import java.io.Serializable;
+
+@NoArgsConstructor @AllArgsConstructor @Data
+public class NoteDTO implements Serializable {
+    @Null(message = "Id cannot be set")
+    private int id;
+    @NotBlank(message = "Text cannot be empty")
+    private String text;
+    @Pattern(regexp = "[A-Fa-F0-9\\-]{36}",message = "Invalid user id")
+    private String userId;
+}

src/main/java/lk/ijse/dep/note/dto/UserDTO.java

@@ -23,7 +23,7 @@ public class UserDTO implements Serializable {
     private String email;
 
     @NotNull(message = "Password cannot be empty")
-    @Length(max = 6,message = "Password must have minimum of 6 characters")
+    @Length(min = 6,message = "Password must have minimum of 6 characters")
     @NotNull(message = "Password cannot be null")
     private String password;