NABI-204 api 보완점 수정

build.gradle

@@ -30,6 +30,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
     implementation 'org.springframework.boot:spring-boot-starter-security'
     implementation 'com.auth0:java-jwt:4.4.0'
+    implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.8.0'
 
     compileOnly 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'

src/main/java/org/prgrms/nabimarketbe/domain/card/api/CardController.java

@@ -1,25 +1,36 @@
 package org.prgrms.nabimarketbe.domain.card.api;
 
-import lombok.RequiredArgsConstructor;
+import java.util.List;
 
 import org.prgrms.nabimarketbe.domain.card.dto.request.CardCreateRequestDTO;
+import org.prgrms.nabimarketbe.domain.card.dto.request.CardStatusUpdateRequestDTO;
 import org.prgrms.nabimarketbe.domain.card.dto.response.CardCreateResponseDTO;
 import org.prgrms.nabimarketbe.domain.card.dto.response.CardListReadPagingResponseDTO;
+import org.prgrms.nabimarketbe.domain.card.dto.response.CardListResponseDTO;
 import org.prgrms.nabimarketbe.domain.card.dto.response.CardSingleReadResponseDTO;
+import org.prgrms.nabimarketbe.domain.card.dto.response.SuggestionAvailableCardResponseDTO;
 import org.prgrms.nabimarketbe.domain.card.entity.CardStatus;
 import org.prgrms.nabimarketbe.domain.card.service.CardService;
 import org.prgrms.nabimarketbe.domain.category.entity.CategoryEnum;
 import org.prgrms.nabimarketbe.domain.item.entity.PriceRange;
 import org.prgrms.nabimarketbe.global.util.ResponseFactory;
+import org.prgrms.nabimarketbe.global.util.model.CommonResult;
 import org.prgrms.nabimarketbe.global.util.model.SingleResult;
-
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RequestPart;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-
 import lombok.RequiredArgsConstructor;
 
 @RestController

src/main/java/org/prgrms/nabimarketbe/domain/card/dto/response/SuggestionAvailableCardResponseDTO.java

@@ -1,17 +1,22 @@
 package org.prgrms.nabimarketbe.domain.card.dto.response;
 
-import lombok.Getter;
-import lombok.NoArgsConstructor;
 import org.prgrms.nabimarketbe.domain.item.entity.PriceRange;
 import org.prgrms.nabimarketbe.domain.suggestion.entity.SuggestionType;
 
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
 @Getter
 @NoArgsConstructor
 public class SuggestionAvailableCardResponseDTO {
     private Long cardId;
+
     private String thumbNail;
+
     private String itemName;
+
     private PriceRange priceRange;
+
     private SuggestionType suggestionType;
 
     public void updateSuggestionType(SuggestionType suggestionType) {

src/main/java/org/prgrms/nabimarketbe/domain/card/repository/CardRepositoryImpl.java

@@ -1,13 +1,10 @@
 package org.prgrms.nabimarketbe.domain.card.repository;
 
-import com.querydsl.core.types.ConstantImpl;
-import com.querydsl.core.types.Projections;
-import com.querydsl.core.types.dsl.BooleanExpression;
-import com.querydsl.core.types.dsl.Expressions;
-import com.querydsl.core.types.dsl.StringExpressions;
-import com.querydsl.core.types.dsl.StringTemplate;
-import com.querydsl.jpa.impl.JPAQueryFactory;
-import lombok.RequiredArgsConstructor;
+import static org.prgrms.nabimarketbe.domain.card.entity.QCard.card;
+import static org.prgrms.nabimarketbe.domain.item.entity.QItem.item;
+
+import java.util.List;
+
 import org.prgrms.nabimarketbe.domain.card.dto.response.CardListReadPagingResponseDTO;
 import org.prgrms.nabimarketbe.domain.card.dto.response.CardListReadResponseDTO;
 import org.prgrms.nabimarketbe.domain.card.dto.response.SuggestionAvailableCardResponseDTO;
@@ -17,10 +14,15 @@
 import org.prgrms.nabimarketbe.domain.suggestion.entity.SuggestionType;
 import org.prgrms.nabimarketbe.domain.user.entity.User;
 
-import java.util.List;
+import com.querydsl.core.types.ConstantImpl;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.core.types.dsl.Expressions;
+import com.querydsl.core.types.dsl.StringExpressions;
+import com.querydsl.core.types.dsl.StringTemplate;
+import com.querydsl.jpa.impl.JPAQueryFactory;
 
-import static org.prgrms.nabimarketbe.domain.card.entity.QCard.card;
-import static org.prgrms.nabimarketbe.domain.item.entity.QItem.item;
+import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
 public class CardRepositoryImpl implements CardRepositoryCustom {
@@ -89,8 +91,9 @@ public CardListReadPagingResponseDTO getMyCardsByStatus(
                 .from(card)
                 .leftJoin(item).on(card.item.itemId.eq(item.itemId))
                 .where(
-                        cursorId(cursorId),
-                        card.status.eq(status)
+                    cursorId(cursorId),
+                    card.status.eq(status),
+                    card.user.eq(user)
                 )
                 .orderBy(card.createdDate.desc())   // 디폴트는 생성일자 최신순 정렬
                 .limit(size)

src/main/java/org/prgrms/nabimarketbe/domain/completeRequest/service/CompleteRequestService.java

@@ -1,11 +1,9 @@
 package org.prgrms.nabimarketbe.domain.completeRequest.service;
 
-import lombok.RequiredArgsConstructor;
-
 import org.prgrms.nabimarketbe.domain.card.entity.Card;
 import org.prgrms.nabimarketbe.domain.card.repository.CardRepository;
-import org.prgrms.nabimarketbe.domain.completeRequest.dto.response.HistoryListReadLimitResponseDTO;
 import org.prgrms.nabimarketbe.domain.completeRequest.dto.response.CompleteRequestDTO;
+import org.prgrms.nabimarketbe.domain.completeRequest.dto.response.HistoryListReadLimitResponseDTO;
 import org.prgrms.nabimarketbe.domain.completeRequest.dto.response.HistoryListReadPagingResponseDTO;
 import org.prgrms.nabimarketbe.domain.completeRequest.entity.CompleteRequest;
 import org.prgrms.nabimarketbe.domain.completeRequest.repository.CompleteRequestRepository;
@@ -14,10 +12,11 @@
 import org.prgrms.nabimarketbe.domain.user.service.CheckService;
 import org.prgrms.nabimarketbe.global.error.BaseException;
 import org.prgrms.nabimarketbe.global.error.ErrorCode;
-
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import lombok.RequiredArgsConstructor;
+
 @Service
 @RequiredArgsConstructor
 public class CompleteRequestService {
@@ -82,8 +81,8 @@ public CompleteRequestDTO updateCompleteRequestStatus(
     private void updateStatus(Boolean isAccepted, CompleteRequest completeRequest, Card fromCard, Card toCard) {
         if (isAccepted) {
             completeRequest.acceptCompleteRequest();
-            fromCard.tradeCompleted();
-            toCard.tradeCompleted();
+            fromCard.updateCardStatusToTradeComplete();
+            toCard.updateCardStatusToTradeComplete();
         } else {
             completeRequest.refuseCompleteRequest();
         }

src/main/java/org/prgrms/nabimarketbe/domain/suggestion/service/SuggestionService.java

@@ -1,26 +1,24 @@
 package org.prgrms.nabimarketbe.domain.suggestion.service;
 
-import lombok.RequiredArgsConstructor;
-
 import org.prgrms.nabimarketbe.domain.card.entity.Card;
 import org.prgrms.nabimarketbe.domain.card.repository.CardRepository;
 import org.prgrms.nabimarketbe.domain.suggestion.dto.request.SuggestionRequestDTO;
 import org.prgrms.nabimarketbe.domain.suggestion.dto.response.SuggestionListReadPagingResponseDTO;
 import org.prgrms.nabimarketbe.domain.suggestion.dto.response.SuggestionResponseDTO;
 import org.prgrms.nabimarketbe.domain.suggestion.entity.DirectionType;
 import org.prgrms.nabimarketbe.domain.suggestion.entity.Suggestion;
-import org.prgrms.nabimarketbe.domain.suggestion.entity.SuggestionStatus;
 import org.prgrms.nabimarketbe.domain.suggestion.entity.SuggestionType;
 import org.prgrms.nabimarketbe.domain.suggestion.repository.SuggestionRepository;
 import org.prgrms.nabimarketbe.domain.user.entity.User;
 import org.prgrms.nabimarketbe.domain.user.repository.UserRepository;
 import org.prgrms.nabimarketbe.domain.user.service.CheckService;
 import org.prgrms.nabimarketbe.global.error.BaseException;
 import org.prgrms.nabimarketbe.global.error.ErrorCode;
-
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import lombok.RequiredArgsConstructor;
+
 @Service
 @RequiredArgsConstructor
 public class SuggestionService {
@@ -45,13 +43,13 @@ public SuggestionResponseDTO createSuggestion(
             .orElseThrow(() -> new BaseException(ErrorCode.USER_NOT_MATCHED));
 
         Card toCard = cardRepository.findById(requestDto.toCardId())
-                .orElseThrow(() -> new BaseException(ErrorCode.CARD_NOT_FOUND));
+            .orElseThrow(() -> new BaseException(ErrorCode.CARD_NOT_FOUND));
 
         Suggestion suggestion = Suggestion.builder()
-                .suggestionType(SuggestionType.valueOf(type))
-                .fromCard(fromCard)
-                .toCard(toCard)
-                .build();
+            .suggestionType(SuggestionType.valueOf(type))
+            .fromCard(fromCard)
+            .toCard(toCard)
+            .build();
 
         Suggestion savedSuggestion = suggestionRepository.save(suggestion);