diff --git a/src/main/java/com/DecodEat/domain/report/converter/ReportConverter.java b/src/main/java/com/DecodEat/domain/report/converter/ReportConverter.java index a531367..bf425ff 100644 --- a/src/main/java/com/DecodEat/domain/report/converter/ReportConverter.java +++ b/src/main/java/com/DecodEat/domain/report/converter/ReportConverter.java @@ -23,10 +23,11 @@ public static ReportResponseDto toReportResponseDto(Long productId, String type) .build(); } - public static NutritionReport toNutritionReport(Long reporterId, Product product,ProductNutritionUpdateRequestDto requestDto){ + public static NutritionReport toNutritionReport(Long reporterId, String nickname, Product product,ProductNutritionUpdateRequestDto requestDto){ return NutritionReport.builder() .product(product) .reporterId(reporterId) + .nickname(nickname) .reportStatus(ReportStatus.IN_PROGRESS) .calcium(requestDto.getCalcium()) .carbohydrate(requestDto.getCarbohydrate()) @@ -106,6 +107,7 @@ public static ReportResponseDto.ReportListItemDTO toReportListItemDTO(ReportReco ReportResponseDto.ReportListItemDTO.ReportListItemDTOBuilder builder = ReportResponseDto.ReportListItemDTO.builder() .reportId(reportRecord.getId()) .reporterId(reportRecord.getReporterId()) + .nickname(reportRecord.getNickname()) .productInfo(toSimpleProductInfoDTO(product)) .currentNutritionInfo(toProductNutritionInfoDTO(currentNutrition)) .reportStatus(reportRecord.getReportStatus()) diff --git a/src/main/java/com/DecodEat/domain/report/dto/response/ReportResponseDto.java b/src/main/java/com/DecodEat/domain/report/dto/response/ReportResponseDto.java index 6dee298..9ab107c 100644 --- a/src/main/java/com/DecodEat/domain/report/dto/response/ReportResponseDto.java +++ b/src/main/java/com/DecodEat/domain/report/dto/response/ReportResponseDto.java @@ -89,6 +89,9 @@ public static class ReportListItemDTO { @Schema(description = "신고자 ID", example = "2") private Long reporterId; + @Schema(description = "신고자 닉네임", example = "닉네임") + private String nickname; + @Schema(description = "신고된 상품 정보") private SimpleProductInfoDTO productInfo; diff --git a/src/main/java/com/DecodEat/domain/report/entity/ReportRecord.java b/src/main/java/com/DecodEat/domain/report/entity/ReportRecord.java index aa59371..1253e11 100644 --- a/src/main/java/com/DecodEat/domain/report/entity/ReportRecord.java +++ b/src/main/java/com/DecodEat/domain/report/entity/ReportRecord.java @@ -29,6 +29,9 @@ public abstract class ReportRecord extends BaseEntity { @Column(nullable = false) private Long reporterId; + @Column(nullable = false) + private String nickname; + @Enumerated(EnumType.STRING) @Column(nullable = false) @Schema(name = "처리 상태", example = "IN_PROGRESS") diff --git a/src/main/java/com/DecodEat/domain/report/service/ReportService.java b/src/main/java/com/DecodEat/domain/report/service/ReportService.java index a207239..7ec086c 100644 --- a/src/main/java/com/DecodEat/domain/report/service/ReportService.java +++ b/src/main/java/com/DecodEat/domain/report/service/ReportService.java @@ -38,7 +38,7 @@ public ReportResponseDto requestUpdateNutrition(User user, Long productId, Produ Product productProxy = productRepository.getReferenceById(productId); //SELECT 쿼리 없이 ID만 가진 프록시 객체를 가져옴 - nutritionReportRepository.save(ReportConverter.toNutritionReport(user.getId(), productProxy, requestDto)); + nutritionReportRepository.save(ReportConverter.toNutritionReport(user.getId(), user.getNickname(), productProxy, requestDto)); return ReportConverter.toReportResponseDto(productId,"상품 정보 업데이트 요청 완료"); }