[feat] 단어 카드 도메인 API 수정

COM-MA · Feb 17, 2024 · 5230c32 · 5230c32
1 parent f0a35c4
commit 5230c32
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/src/main/java/com/example/comma/domain/card/dto/response/CardImageResponseDto.java b/src/main/java/com/example/comma/domain/card/dto/response/CardImageResponseDto.java
@@ -3,7 +3,7 @@
 import lombok.Builder;
 
 public record CardImageResponseDto(
-        Long id,
+        Long CardId,
         String CardImageUrl,
         String SignImageUrl
 ) {

diff --git a/src/main/java/com/example/comma/domain/card/dto/response/CardResponseDto.java b/src/main/java/com/example/comma/domain/card/dto/response/CardResponseDto.java
@@ -4,7 +4,7 @@
 
 @Builder
 public record CardResponseDto(
-        Long id,
+        Long userCardId,
         String name,
         String cardImageUrl,
         String signImageUrl

diff --git a/src/main/java/com/example/comma/domain/card/repository/UserCardRepository.java b/src/main/java/com/example/comma/domain/card/repository/UserCardRepository.java
@@ -1,6 +1,8 @@
 package com.example.comma.domain.card.repository;
 
+import com.example.comma.domain.card.entity.Card;
 import com.example.comma.domain.card.entity.UserCard;
+import com.example.comma.domain.user.entity.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.time.LocalDateTime;
@@ -16,4 +18,6 @@ public interface UserCardRepository extends JpaRepository<UserCard, Long> {
     Optional<UserCard> findUserCardByUserIdAndCardId(Long userId, Long cardId);
 
     List<UserCard> findUserCardByUserIdAndCardIdNot(Long id, Long id1);
+
+    boolean existsByUserAndCard(User user, Card card);
 }
diff --git a/src/main/java/com/example/comma/domain/card/service/CardService.java b/src/main/java/com/example/comma/domain/card/service/CardService.java
@@ -13,6 +13,7 @@
 import com.example.comma.global.error.ErrorCode;
 import com.example.comma.global.error.exception.EntityNotFoundException;
 import com.example.comma.global.error.exception.InvalidValueException;
+import com.example.comma.global.error.exception.ConflictException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -48,6 +49,10 @@ public void createCard(Long userId, Long cardId) {
         Card card = cardRepository.findById(cardId)
                 .orElseThrow(() -> new EntityNotFoundException(ErrorCode.CARD_NOT_FOUND));
 
+        if (userCardRepository.existsByUserAndCard(user, card)) {
+            throw new ConflictException(ErrorCode.USER_CARD_ALREADY_EXISTS);
+        }
+
         UserCard userCard = new UserCard(user, card, false, true);
 
         userCardRepository.save(userCard);
@@ -76,7 +81,7 @@ private List<CardResponseDto> convertToCardResponseDtos(List<UserCard> userCards
         return userCards.stream()
                 .map(userCard -> {
                     Card card = userCard.getCard();
-                    return new CardResponseDto(card.getId(), card.getName(), card.getCardImageUrl(), card.getSignImageUrl());
+                    return new CardResponseDto(userCard.getId(), card.getName(), card.getCardImageUrl(), card.getSignImageUrl());
                 })
                 .collect(Collectors.toList());
     }

diff --git a/src/main/java/com/example/comma/global/error/ErrorCode.java b/src/main/java/com/example/comma/global/error/ErrorCode.java
@@ -45,6 +45,7 @@ public enum ErrorCode {
      * 409 Conflict
      */
     CONFLICT(HttpStatus.CONFLICT, "이미 존재하는 리소스입니다."),
+    USER_CARD_ALREADY_EXISTS(HttpStatus.CONFLICT, "이미 등록된 단어카드입니다."),
 
     /**
      * 500 Internal Server Error