Merge pull request #16 from volo-db/15-add-user-endpoint

feat: add new user endpoint

sql/volodb.sql

@@ -51,11 +51,12 @@ CREATE TABLE `contact_type` (
 
 DROP TABLE IF EXISTS `user`;
 CREATE TABLE `user` (
-  `username` VARCHAR(50) NOT NULL,
+  `email` VARCHAR(50) NOT NULL,
   `person` INT NOT NULL,
   `secret` VARCHAR(100) NOT NULL,
   `organisational_role` VARCHAR(50),
-  PRIMARY KEY (`username`)
+  `avatar` TEXT,
+  PRIMARY KEY (`email`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=latin1;
 
 DROP TABLE IF EXISTS `user_role`;
@@ -319,7 +320,7 @@ CREATE TABLE `volunteer_document_type` (
 
 ALTER TABLE `user` ADD FOREIGN KEY (`person`) REFERENCES `person` (`id`);
 
-ALTER TABLE `user_role_mapping` ADD FOREIGN KEY (`user`) REFERENCES `user` (`username`);
+ALTER TABLE `user_role_mapping` ADD FOREIGN KEY (`user`) REFERENCES `user` (`email`);
 
 ALTER TABLE `user_role_mapping` ADD FOREIGN KEY (`user_role`) REFERENCES `user_role` (`id`);
 
@@ -351,7 +352,7 @@ ALTER TABLE `volunteer` ADD FOREIGN KEY (`religion`) REFERENCES `religion` (`id`
 
 ALTER TABLE `editing_history` ADD FOREIGN KEY (`volunteer`) REFERENCES `volunteer` (`id`);
 
-ALTER TABLE `editing_history` ADD FOREIGN KEY (`user`) REFERENCES `user` (`username`);
+ALTER TABLE `editing_history` ADD FOREIGN KEY (`user`) REFERENCES `user` (`email`);
 
 ALTER TABLE `editing_history` ADD FOREIGN KEY (`editing_type`) REFERENCES `editing_type` (`id`);
 
@@ -383,10 +384,10 @@ ALTER TABLE `contract_modification` ADD FOREIGN KEY (`status`) REFERENCES `contr
 
 ALTER TABLE `volunteer_note` ADD FOREIGN KEY (`volunteer`) REFERENCES `volunteer` (`id`);
 
-ALTER TABLE `volunteer_note` ADD FOREIGN KEY (`user`) REFERENCES `user` (`username`);
+ALTER TABLE `volunteer_note` ADD FOREIGN KEY (`user`) REFERENCES `user` (`email`);
 
 ALTER TABLE `volunteer_document` ADD FOREIGN KEY (`volunteer`) REFERENCES `volunteer` (`id`);
 
 ALTER TABLE `volunteer_document` ADD FOREIGN KEY (`type`) REFERENCES `volunteer_document_type` (`id`);
 
-ALTER TABLE `volunteer_document` ADD FOREIGN KEY (`user`) REFERENCES `user` (`username`);
+ALTER TABLE `volunteer_document` ADD FOREIGN KEY (`user`) REFERENCES `user` (`email`);

src/main/java/dev/urner/volodb/entity/User.java

@@ -9,38 +9,36 @@
 import lombok.Getter;
 import lombok.Setter;
 
-
 @Entity
-@Table(name="User")
+@Table(name = "User")
 @Getter
 @Setter
 public class User {
-  
-  //Username
+
+  // Username
   @Id
-  @Column(name = "username")
+  @Column(name = "email")
   private String username;
 
   @OneToOne
-  @JoinColumn(name = "person") //FK
+  @JoinColumn(name = "person") // FK
   private Person person;
 
-  //Secret
+  // Secret
   @JsonIgnore
   @Column(name = "secret")
   private String secret;
-  
-  //user_roles
+
+  // user_roles
   @ManyToMany
-  @JoinTable(
-    name = "user_role_mapping",
-    joinColumns = @JoinColumn(name = "user"),
-    inverseJoinColumns = @JoinColumn(name = "user_role"))
-  private List<UserRole> roles; 
+  @JoinTable(name = "user_role_mapping", joinColumns = @JoinColumn(name = "user"), inverseJoinColumns = @JoinColumn(name = "user_role"))
+  private List<UserRole> roles;
 
-  //organisational_role
+  // organisational_role
   @Column(name = "organisationalRole")
   private String organisationalRole;
 
-
+  @Column(name = "avatar")
+  private String avatar;
+
 }

src/main/java/dev/urner/volodb/rest/AuthRestController.java

@@ -66,23 +66,25 @@ public LoginResponse login(@RequestBody @Validated LoginRequest request) {
   }
 
   @ExceptionHandler
-  public ResponseEntity<AuthErrorResponse> handleException(UserNotFoundException exc) {
-    AuthErrorResponse error = new AuthErrorResponse(
-        HttpStatus.NOT_FOUND.value(),
+  public ResponseEntity<VolodbErrorResponse> handleException(UserNotFoundException exc) {
+    HttpStatus httpStatus = HttpStatus.NOT_FOUND;
+    VolodbErrorResponse error = new VolodbErrorResponse(
+        httpStatus.value(),
         exc.getMessage(),
         System.currentTimeMillis());
 
-    return new ResponseEntity<>(error, HttpStatus.NOT_FOUND);
+    return new ResponseEntity<>(error, httpStatus);
   }
 
   @ExceptionHandler
-  public ResponseEntity<AuthErrorResponse> handleException(TokenExpiredException exc) {
-    AuthErrorResponse error = new AuthErrorResponse(
-        HttpStatus.UNAUTHORIZED.value(),
+  public ResponseEntity<VolodbErrorResponse> handleException(TokenExpiredException exc) {
+    HttpStatus httpStatus = HttpStatus.UNAUTHORIZED;
+    VolodbErrorResponse error = new VolodbErrorResponse(
+        httpStatus.value(),
         exc.getMessage(),
         System.currentTimeMillis());
 
-    return new ResponseEntity<>(error, HttpStatus.UNAUTHORIZED);
+    return new ResponseEntity<>(error, httpStatus);
   }
 
 }

src/main/java/dev/urner/volodb/rest/FileRestController.java

@@ -44,16 +44,16 @@ public void getTestMethod(@PathVariable("bucket") String bucket, HttpServletRequ
   }
 
   @ExceptionHandler
-  public ResponseEntity<VolunteerErrorResponse> handleException(RuntimeException exc) {
-    VolunteerErrorResponse error = new VolunteerErrorResponse();
+  public ResponseEntity<VolodbErrorResponse> handleException(RuntimeException exc) {
 
-    HttpStatus status = HttpStatus.BAD_REQUEST;
+    HttpStatus httpStatus = HttpStatus.BAD_REQUEST;
 
-    error.setStatus(status.value());
-    error.setMessage(exc.getMessage());
-    error.setTimeStamp(System.currentTimeMillis());
+    VolodbErrorResponse error = new VolodbErrorResponse(
+        httpStatus.value(),
+        exc.getMessage(),
+        System.currentTimeMillis());
 
-    return new ResponseEntity<>(error, status);
+    return new ResponseEntity<>(error, httpStatus);
   }
 
 }

src/main/java/dev/urner/volodb/rest/ProjectRestController.java

@@ -13,7 +13,7 @@
 import dev.urner.volodb.service.ProjectService;
 import lombok.RequiredArgsConstructor;
 
-import java.util.List;
+import java.lang.System;
 import java.util.Map;
 
 @RestController
@@ -89,53 +89,49 @@ public String deleteProjectById(@PathVariable int projectId) {
   // Exception-Hanlder:
 
   @ExceptionHandler
-  public ResponseEntity<ProjectErrorResponse> handleException(ProjectNotFoundException exc) {
-    ProjectErrorResponse error = new ProjectErrorResponse();
-
+  public ResponseEntity<VolodbErrorResponse> handleException(ProjectNotFoundException exc) {
     HttpStatus httpStatus = HttpStatus.NOT_FOUND;
 
-    error.setStatus(httpStatus.value());
-    error.setMessage(exc.getMessage());
-    error.setTimeStamp(System.currentTimeMillis());
+    VolodbErrorResponse error = new VolodbErrorResponse(
+        httpStatus.value(),
+        exc.getMessage(),
+        System.currentTimeMillis());
 
     return new ResponseEntity<>(error, httpStatus);
   }
 
   @ExceptionHandler
-  public ResponseEntity<ProjectErrorResponse> handleException(ProjectInvalidFormatException exc) {
-    ProjectErrorResponse error = new ProjectErrorResponse();
-
+  public ResponseEntity<VolodbErrorResponse> handleException(ProjectInvalidFormatException exc) {
     HttpStatus httpStatus = HttpStatus.BAD_REQUEST;
 
-    error.setStatus(httpStatus.value());
-    error.setMessage(exc.getMessage());
-    error.setTimeStamp(System.currentTimeMillis());
+    VolodbErrorResponse error = new VolodbErrorResponse(
+        httpStatus.value(),
+        exc.getMessage(),
+        System.currentTimeMillis());
 
     return new ResponseEntity<>(error, httpStatus);
   }
 
   @ExceptionHandler
-  public ResponseEntity<ProjectErrorResponse> handleException(CountryNotFoundException exc) {
-    ProjectErrorResponse error = new ProjectErrorResponse();
-
+  public ResponseEntity<VolodbErrorResponse> handleException(CountryNotFoundException exc) {
     HttpStatus httpStatus = HttpStatus.NOT_FOUND;
 
-    error.setStatus(httpStatus.value());
-    error.setMessage(exc.getMessage());
-    error.setTimeStamp(System.currentTimeMillis());
+    VolodbErrorResponse error = new VolodbErrorResponse(
+        httpStatus.value(),
+        exc.getMessage(),
+        System.currentTimeMillis());
 
     return new ResponseEntity<>(error, httpStatus);
   }
 
   @ExceptionHandler
-  public ResponseEntity<ProjectErrorResponse> handleException(RuntimeException exc) {
-    ProjectErrorResponse error = new ProjectErrorResponse();
-
+  public ResponseEntity<VolodbErrorResponse> handleException(RuntimeException exc) {
     HttpStatus httpStatus = HttpStatus.BAD_REQUEST;
 
-    error.setStatus(httpStatus.value());
-    error.setMessage(exc.getMessage());
-    error.setTimeStamp(System.currentTimeMillis());
+    VolodbErrorResponse error = new VolodbErrorResponse(
+        httpStatus.value(),
+        exc.getMessage(),
+        System.currentTimeMillis());
 
     return new ResponseEntity<>(error, httpStatus);
   }

src/main/java/dev/urner/volodb/rest/UserRestController.java

@@ -0,0 +1,48 @@
+package dev.urner.volodb.rest;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import dev.urner.volodb.entity.User;
+import dev.urner.volodb.entity.UserNotFoundException;
+import dev.urner.volodb.security.UserPrincipal;
+import dev.urner.volodb.service.UserService;
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@RestController
+@RequestMapping("/user")
+@RequiredArgsConstructor
+public class UserRestController {
+
+  private final UserService userService;
+
+  @GetMapping()
+  public User getUser(@AuthenticationPrincipal UserPrincipal principal) {
+    User theUser = userService.findByUsername(principal.getUsername());
+
+    if (theUser == null) {
+      throw new UserNotFoundException("Username not found - " + principal.getUsername());
+    }
+
+    return theUser;
+  }
+
+  @ExceptionHandler
+  public ResponseEntity<VolodbErrorResponse> handleException(UserNotFoundException exc) {
+    HttpStatus httpStatus = HttpStatus.NOT_FOUND;
+
+    VolodbErrorResponse error = new VolodbErrorResponse(
+        httpStatus.value(),
+        exc.getMessage(),
+        System.currentTimeMillis());
+
+    return new ResponseEntity<>(error, httpStatus);
+  }
+
+}

src/main/java/dev/urner/volodb/rest/AuthErrorResponse.java → src/main/java/dev/urner/volodb/rest/VolodbErrorResponse.java

@@ -7,7 +7,7 @@
 @RequiredArgsConstructor
 @Getter
 @Setter
-public class AuthErrorResponse {
+public class VolodbErrorResponse {
   private final int status;
   private final String message;
   private final long timeStamp;