added new endpoints delete scanned history, delete all scanned histories, delete bookmarks, delete all bookmarks

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

@@ -4,6 +4,8 @@ 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.BaseResponse;
+import com.safeqr.app.user.dto.BookmarkRequestDto;
 import com.safeqr.app.user.dto.UserResponseDto;
 import com.safeqr.app.user.service.UserService;
 import org.slf4j.Logger;
@@ -11,10 +13,7 @@ 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 org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -47,9 +46,39 @@ public class UserController {
         return ResponseEntity.ok(userService.getUserScannedHistories(userId));
     }
 
+    @PutMapping(value = API_URL_USER_DELETE_SCANNED_HISTORIES, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<BaseResponse> deleteScannedHistory(@RequestHeader(name = HEADER_USER_ID) String userId, @RequestBody BookmarkRequestDto bookmarkRequestDto) {
+        logger.info("Invoking PUT Delete Single Scanned History endpoint");
+        return ResponseEntity.ok(userService.deleteScannedHistory(userId, bookmarkRequestDto.getQrCodeId()));
+    }
+
+    @PutMapping(value = API_URL_USER_DELETE_ALL_SCANNED_HISTORIES, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<BaseResponse> deleteAllScannedHistories(@RequestHeader(name = HEADER_USER_ID) String userId) {
+        logger.info("Invoking PUT Delete All Scanned Histories endpoint");
+        return ResponseEntity.ok(userService.deleteAllScannedHistoriesByUserId(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));
     }
+
+    @PostMapping(value = API_URL_USER_SET_BOOKMARK, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<BaseResponse> setBookmark(@RequestHeader(name = HEADER_USER_ID) String userId, @RequestBody BookmarkRequestDto bookmarkRequestDto) {
+        logger.info("Invoking POST User bookmark endpoint");
+        return ResponseEntity.ok(userService.setBookmark(userId, bookmarkRequestDto.getQrCodeId()));
+    }
+
+    @PutMapping(value = API_URL_USER_DELETE_BOOKMARK, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<BaseResponse> deleteBookmark(@RequestHeader(name = HEADER_USER_ID) String userId, @RequestBody BookmarkRequestDto bookmarkRequestDto) {
+        logger.info("Invoking PUT Delete Single Bookmark endpoint");
+        return ResponseEntity.ok(userService.deleteBookmark(userId, bookmarkRequestDto.getQrCodeId()));
+    }
+
+    @PutMapping(value = API_URL_USER_DELETE_ALL_BOOKMARK, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<BaseResponse> deleteAllBookmark(@RequestHeader(name = HEADER_USER_ID) String userId) {
+        logger.info("Invoking PUT Delete All Bookmark endpoint");
+        return ResponseEntity.ok(userService.deleteAllBookmarkByUserId(userId));
+    }
 }

src/main/java/com/safeqr/app/user/dto/BaseResponse.java

@@ -0,0 +1,11 @@
+package com.safeqr.app.user.dto;
+
+import lombok.Builder;
+import lombok.Data;
+
+
+@Data
+@Builder
+public class BaseResponse {
+    private String message;
+}

src/main/java/com/safeqr/app/user/dto/BookmarkRequestDto.java

@@ -0,0 +1,10 @@
+package com.safeqr.app.user.dto;
+
+import lombok.Data;
+
+import java.util.UUID;
+
+@Data
+public class BookmarkRequestDto {
+    private UUID qrCodeId;
+}

src/main/java/com/safeqr/app/user/service/UserService.java

@@ -1,19 +1,30 @@
 package com.safeqr.app.user.service;
 
-import com.safeqr.app.exceptions.CustomNotFoundExceptions;
+import com.safeqr.app.exceptions.ResourceAlreadyExists;
+import com.safeqr.app.exceptions.ResourceNotFoundExceptions;
 import com.safeqr.app.qrcode.entity.QRCodeEntity;
+import com.safeqr.app.qrcode.entity.ScanBookmarkEntity;
 import com.safeqr.app.qrcode.repository.ScanBookmarkRepository;
 import com.safeqr.app.qrcode.repository.ScanHistoryRepository;
+import com.safeqr.app.user.controller.UserController;
+import com.safeqr.app.user.dto.BaseResponse;
 import com.safeqr.app.user.dto.UserResponseDto;
 import com.safeqr.app.user.entity.UserEntity;
 import com.safeqr.app.user.repository.UserRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
 
 @Service
 public class UserService {
+    private static final Logger logger = LoggerFactory.getLogger(UserService.class);
 
     @Autowired
     public UserService(UserRepository userRepository,
@@ -30,7 +41,7 @@ public class UserService {
     public UserResponseDto getUserById(String userId) {
         // Find user by id
         UserEntity userEntity = userRepository.findById(userId)
-                .orElseThrow(() -> new CustomNotFoundExceptions("User id not found: " + userId));
+                .orElseThrow(() -> new ResourceNotFoundExceptions("User id not found: " + userId));
 
         // Map to DTO before returning to controller
         return UserResponseDto.builder()
@@ -46,7 +57,70 @@ public class UserService {
     public List<QRCodeEntity> getUserScannedHistories(String userId) {
         return scanHistoryRepository.findAllQRCodesByUserId(userId);
     }
+    @Transactional
+    public BaseResponse deleteScannedHistory(String userId, UUID qrCodeId) {
+        int updatedCount = scanHistoryRepository.updateScannedHistoryToInactive(userId, qrCodeId);
+        // throw exception if bookmark not found
+        if (updatedCount < 1)
+            throw new ResourceNotFoundExceptions("Scanned QR Code not found");
+
+        return BaseResponse.builder().message("Scanned QR Code deleted successfully").build();
+    }
+
+    @Transactional
+    public BaseResponse deleteAllScannedHistoriesByUserId(String userId) {
+        int updatedCount = scanHistoryRepository.updateScannedHistoriesToInactiveByUserId(userId);
+
+        return (updatedCount < 1) ?
+                BaseResponse.builder().message("No QR Code not found").build():
+                BaseResponse.builder().message("All scanned QR Code deleted successfully").build();
+    }
     public List<QRCodeEntity> getUserBookmarks(String userId) {
         return scanBookmarkRepository.findAllBookmarksByUserId(userId);
     }
+    @Transactional
+    public BaseResponse setBookmark(String userId, UUID qrCodeId) {
+        // Check if the bookmark already exists
+        Optional<ScanBookmarkEntity> existingBookmark = scanBookmarkRepository.findByUserIdAndQrCodeId(userId, qrCodeId);
+
+        // throw exception if bookmark already exists
+        if (existingBookmark.isPresent()) {
+            throw new ResourceAlreadyExists("Bookmark already exists!");
+        }
+        try {
+            // Save bookmark
+            ScanBookmarkEntity bookmarkEntity = ScanBookmarkEntity.builder()
+                    .userId(userId)
+                    .qrCodeId(qrCodeId)
+                    .bookmarkStatus(ScanBookmarkEntity.BookmarkStatus.ACTIVE)
+                    .build();
+            scanBookmarkRepository.save(bookmarkEntity);
+
+        } catch (DataIntegrityViolationException e) {
+            logger.error("Failed to create bookmark: {}", e.getMessage());
+            // throw exception if bookmark creation fails
+            throw new ResourceNotFoundExceptions("Unable to create bookmark. The QR code may not exist.");
+        }
+
+        return BaseResponse.builder().message("Bookmark saved successfully").build();
+    }
+
+    @Transactional
+    public BaseResponse deleteBookmark(String userId, UUID qrCodeId) {
+        int updatedCount = scanBookmarkRepository.updateBookmarkStatusToInactive(userId, qrCodeId);
+        // throw exception if bookmark not found
+        if (updatedCount < 1)
+            throw new ResourceNotFoundExceptions("Bookmark not found");
+
+        return BaseResponse.builder().message("Bookmark deleted successfully").build();
+    }
+
+    @Transactional
+    public BaseResponse deleteAllBookmarkByUserId(String userId) {
+        int updatedCount = scanBookmarkRepository.updateBookmarkStatusToInactiveByUserId(userId);
+
+        return (updatedCount < 1) ?
+                BaseResponse.builder().message("No Bookmark not found").build():
+                BaseResponse.builder().message("All Bookmarks deleted successfully").build();
+    }
 }