🚑 hotfix(api): itemClaimService dto error hotfix (#242)

depromeet · Jul 18, 2023 · 59c4302 · 59c4302
1 parent 28eebe8
commit 59c4302
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 13 deletions.
diff --git a/...end/streetdrop-api/src/main/java/com/depromeet/domains/item/service/ItemClaimService.java b/...end/streetdrop-api/src/main/java/com/depromeet/domains/item/service/ItemClaimService.java
@@ -39,7 +39,16 @@ public void claimItem(User user, ItemClaimRequestDto itemClaimRequestDto) {
 
         var saveditemClaim = itemClaimRepository.save(itemClaim);
 
-        slackItemClaimReportService.sendReport(new ItemClaimReportDto(saveditemClaim));
+        ItemClaimReportDto itemClaimReportDto = ItemClaimReportDto.builder()
+                .itemClaimId(saveditemClaim.getId())
+                .itemClaimReason(saveditemClaim.getReason())
+                .itemClaimStatus(saveditemClaim.getStatus())
+                .reportUserId(saveditemClaim.getUserId())
+                .itemId(saveditemClaim.getItemId())
+                .itemContent(item.getContent())
+                .build();
+
+        slackItemClaimReportService.sendReport(itemClaimReportDto);
     }
 
     private void checkUserAlreadyReport(Long userId, Long itemId) {

diff --git a/backend/streetdrop-api/src/main/java/com/depromeet/report/dto/ItemClaimReportDto.java b/backend/streetdrop-api/src/main/java/com/depromeet/report/dto/ItemClaimReportDto.java
@@ -1,28 +1,36 @@
 package com.depromeet.report.dto;
 
-import com.depromeet.item.ItemClaim;
 import com.depromeet.item.ItemClaimStatus;
+import lombok.Builder;
 
 import java.time.LocalDateTime;
 
 public record ItemClaimReportDto(
         Long itemClaimId,
         String itemClaimReason,
         ItemClaimStatus itemClaimStatus,
-        String reporter,
+        Long reportUserId,
         Long itemId,
         String itemContent,
         LocalDateTime claimTime
 ) {
-    public ItemClaimReportDto(ItemClaim itemClaim) {
+
+    @Builder
+    public ItemClaimReportDto(Long itemClaimId,
+                              String itemClaimReason,
+                              ItemClaimStatus itemClaimStatus,
+                              Long reportUserId,
+                              Long itemId,
+                              String itemContent
+    ) {
         this(
-                itemClaim.getId(),
-                itemClaim.getReason(),
-                itemClaim.getStatus(),
-                itemClaim.getUser().getNickname(),
-                itemClaim.getItem().getId(),
-                itemClaim.getItem().getContent(),
-                itemClaim.getCreatedAt()
+                itemClaimId,
+                itemClaimReason,
+                itemClaimStatus,
+                reportUserId,
+                itemId,
+                itemContent,
+                LocalDateTime.now()
         );
     }
 }
diff --git a/backend/streetdrop-domain/src/main/java/com/depromeet/item/ItemClaim.java b/backend/streetdrop-domain/src/main/java/com/depromeet/item/ItemClaim.java
@@ -32,12 +32,12 @@ public class ItemClaim extends BaseTimeEntity {
     private Long itemId;
 
     @Column(nullable = false)
-    private Long user;
+    private Long userId;
 
     @Builder
     public ItemClaim(Long itemId, Long userId, String reason, ItemClaimStatus status) {
         this.itemId = itemId;
-        this.user = userId;
+        this.userId = userId;
         this.reason = reason;
         this.status = status;
     }