added new endpoints, getUser, getUserHistories, getBookmarks

src/main/java/com/safeqr/app/user/controller/UserController.java

@@ -1,25 +1,55 @@
 package com.safeqr.app.user.controller;
 
+import static com.safeqr.app.constants.APIConstants.*;
+import static com.safeqr.app.constants.CommonConstants.HEADER_USER_ID;
+
+import com.safeqr.app.qrcode.entity.QRCodeEntity;
+import com.safeqr.app.user.dto.UserResponseDto;
 import com.safeqr.app.user.service.UserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
 import java.util.Map;
 
 @RestController
-@RequestMapping("/v1")
+@RequestMapping(API_VERSION)
 public class UserController {
-    @Autowired
+    private static final Logger logger = LoggerFactory.getLogger(UserController.class);
     UserService userService;
+    @Autowired
+    public UserController(UserService userService) {
+        this.userService = userService;
+    }
+
     @GetMapping(value = "/version", produces = MediaType.APPLICATION_JSON_VALUE)
     public ResponseEntity<Map<String, String>> version() {
-        // System.out.println(userService.getUserByEmail());
-        System.out.println("Health Check");
+        logger.info("Health Check");
         return ResponseEntity.ok(Map.of("version","SafeQR v1.0.2"));
     }
 
+    @GetMapping(value = API_URL_USER_GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<UserResponseDto> getUser(@RequestHeader(name = HEADER_USER_ID) String userId) {
+        logger.info("Invoking GET User endpoint");
+        return ResponseEntity.ok(userService.getUserById(userId));
+    }
+
+    @GetMapping(value = API_URL_USER_GET_SCANNED_HISTORIES, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<List<QRCodeEntity>> getUserScannedHistories(@RequestHeader(name = HEADER_USER_ID) String userId) {
+        logger.info("Invoking GET User Scanned Histories endpoint");
+        return ResponseEntity.ok(userService.getUserScannedHistories(userId));
+    }
+
+    @GetMapping(value = API_URL_USER_GET_BOOKMARKS, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<List<QRCodeEntity>> getUserBookmarks(@RequestHeader(name = HEADER_USER_ID) String userId) {
+        logger.info("Invoking GET User bookmarks endpoint");
+        return ResponseEntity.ok(userService.getUserBookmarks(userId));
+    }
 }