isky/backend-springboot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added bookmarked to scan history

Browse Source
This commit is contained in:
heyethereum
2024-07-22 00:48:23 +08:00
parent 77541c2a9d
commit 7cb68e2ec0
7 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/safeqr/app/user/controller/UserController.java
View File

@@ -6,6 +6,7 @@ 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.ScannedHistoriesDto;
import com.safeqr.app.user.dto.UserResponseDto;
import com.safeqr.app.user.service.UserService;
import org.slf4j.Logger;
@@ -41,7 +42,7 @@ public class UserController {
}
@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) {
public ResponseEntity<List<ScannedHistoriesDto>> getUserScannedHistories(@RequestHeader(name = HEADER_USER_ID) String userId) {
logger.info("Invoking GET User Scanned Histories endpoint");
return ResponseEntity.ok(userService.getUserScannedHistories(userId));
}

18
src/main/java/com/safeqr/app/user/dto/ScannedHistoriesDto.java Normal file
View File

@@ -0,0 +1,18 @@
package com.safeqr.app.user.dto;
import com.safeqr.app.qrcode.entity.QRCodeEntity;
import lombok.Builder;
import lombok.Data;
@Data
@Builder
public class ScannedHistoriesDto {
private QRCodeEntity data;
private boolean bookmarked;
public ScannedHistoriesDto(QRCodeEntity qrCodeEntity, boolean bookmarked) {
this.data = qrCodeEntity;
this.bookmarked = bookmarked;
}
}

4
src/main/java/com/safeqr/app/user/dto/ScannedHistoriesResponse.java
View File

@@ -1,4 +0,0 @@
package com.safeqr.app.user.dto;
public class ScannedHistoriesResponse {
}

4
src/main/java/com/safeqr/app/user/service/UserService.java
View File

@@ -6,8 +6,8 @@ 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.ScannedHistoriesDto;
import com.safeqr.app.user.dto.UserResponseDto;
import com.safeqr.app.user.entity.UserEntity;
import com.safeqr.app.user.repository.UserRepository;
@@ -54,7 +54,7 @@ public class UserService {
.status(userEntity.getStatus())
.build();
}
public List<QRCodeEntity> getUserScannedHistories(String userId) {
public List<ScannedHistoriesDto> getUserScannedHistories(String userId) {
return scanHistoryRepository.findAllQRCodesByUserId(userId);
}
@Transactional