Merge remote-tracking branch 'origin/main'

unithon-11th-2team · Apr 6, 2024 · b74ce4c · b74ce4c
2 parents 25dbc70 + e44256a
commit b74ce4c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/com/core/api/item/dto/response/ItemDetailResponseDto.java b/src/main/java/com/core/api/item/dto/response/ItemDetailResponseDto.java
@@ -2,6 +2,7 @@
 
 import com.core.api.item.entity.Item;
 import com.core.api.item.entity.enums.ItemType;
+import com.core.api.user.entity.User;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -12,6 +13,7 @@
 public class ItemDetailResponseDto {
     private Long itemId;
     private Long uid;
+    private String nickname;
     private ItemType type;
     private ItemType currentType;
     private String message;
@@ -25,8 +27,8 @@ public class ItemDetailResponseDto {
     public ItemDetailResponseDto(
             Item item,
             List<ItemDetailCommentDto> itemCommentList,
-            Long likeCounts
-    ) {
+            Long likeCounts,
+            User use1) {
         this.itemId = item.getId();
         this.uid = item.getUid();
         this.type = item.getType();
@@ -38,5 +40,6 @@ public ItemDetailResponseDto(
         this.commentList = itemCommentList;
         this.createdAt = item.getCreatedAt();
         this.likeCounts = likeCounts;
+        this.nickname = use1.getNickname();
     }
 }
diff --git a/src/main/java/com/core/api/item/service/ItemService.java b/src/main/java/com/core/api/item/service/ItemService.java
@@ -24,6 +24,7 @@
 import com.core.api.item.repository.ItemRepository;
 import com.core.api.user.entity.User;
 import com.core.api.user.repository.UserRepository;
+import com.querydsl.core.Tuple;
 import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.JPQLQueryFactory;
 import com.querydsl.jpa.impl.JPAQueryFactory;
@@ -143,6 +144,10 @@ public ItemDetailResponseDto itemDetail(Long uId, Long itemId) {
                 .where(QItem.item.id.eq(itemId))
                 .fetchFirst();
 
+        User use1 = jpaQueryFactory.selectFrom(user)
+                .where(user.id.eq(item.getUid()))
+                .fetchFirst();
+
         List<ItemDetailCommentDto> itemCommentList = jpaQueryFactory
                 .select(Projections.constructor(ItemDetailCommentDto.class,
                         itemComment.uid,
@@ -158,7 +163,7 @@ public ItemDetailResponseDto itemDetail(Long uId, Long itemId) {
 
         Long likeCounts = itemLikeRepository.countByItemId(item.getId());
 
-        return new ItemDetailResponseDto(item, itemCommentList, likeCounts);
+        return new ItemDetailResponseDto(item, itemCommentList, likeCounts, use1);
     }
 
     public Integer itemCommentLike(Long id, Long itemCommentId) {