Merge pull request #182 from DguFarmSystem/refactor/#180-minigame-review

Refactor/#180 minigame review

Author: pkhyrn268

src/main/java/org/farmsystem/homepage/domain/minigame/dex/controller/DexController.java

@@ -1,34 +1,40 @@
 package org.farmsystem.homepage.domain.minigame.dex.controller;
 
 import lombok.RequiredArgsConstructor;
-import org.farmsystem.homepage.domain.minigame.dex.dto.request.DexRequest;
-import org.farmsystem.homepage.domain.minigame.dex.dto.response.DexListResponse;
-import org.farmsystem.homepage.domain.minigame.dex.dto.response.DexResponse;
+import org.farmsystem.homepage.domain.minigame.dex.dto.request.DexRequestDTO;
+import org.farmsystem.homepage.domain.minigame.dex.dto.response.DexResponseDTO;
 import org.farmsystem.homepage.domain.minigame.dex.service.DexService;
-import org.springframework.http.HttpStatus;
+import org.farmsystem.homepage.global.common.SuccessResponse;
+import org.springframework.http.ResponseEntity;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/dex")
 @RequiredArgsConstructor
 public class DexController {
 
     private final DexService dexService;
 
-    @PostMapping
-    @ResponseStatus(HttpStatus.CREATED)
-    public DexResponse addDex(
-            @AuthenticationPrincipal Long userId,
-            @RequestBody DexRequest request
+    // 도감 전체 목록 조회 API
+    @GetMapping
+    public ResponseEntity<SuccessResponse<?>> getDexList(
+            @AuthenticationPrincipal Long userId
     ) {
-        return dexService.addDex(userId, request);
+        List<DexResponseDTO> response = dexService.getDexList(userId);
+        return SuccessResponse.ok(response);
     }
 
-    @GetMapping
-    public DexListResponse getDexList(
-            @AuthenticationPrincipal Long userId
+    // 도감 등록 API
+    @PostMapping
+    public ResponseEntity<SuccessResponse<?>> addDex(
+            @AuthenticationPrincipal Long userId,
+            @RequestBody DexRequestDTO request
     ) {
-        return dexService.getDexList(userId);
+        DexResponseDTO response = dexService.addDex(userId, request);
+        return SuccessResponse.created(response);
     }
+
 }

src/main/java/org/farmsystem/homepage/domain/minigame/dex/dto/request/DexRequest.java

@@ -0,0 +1,8 @@
+package org.farmsystem.homepage.domain.minigame.dex.dto.request;
+
+import jakarta.validation.constraints.NotNull;
+
+public record DexRequestDTO(
+        @NotNull Long ownedPlant  // Store의 store_goods_number를 의미
+) {
+}

src/main/java/org/farmsystem/homepage/domain/minigame/dex/dto/request/DexRequestDTO.java

@@ -0,0 +1,15 @@
+package org.farmsystem.homepage.domain.minigame.dex.dto.response;
+
+import org.farmsystem.homepage.domain.minigame.dex.entity.Dex;
+
+public record DexResponseDTO(
+        Long dexId,
+        Long ownedPlant // Store의 store_goods_number를 의미
+) {
+    public static DexResponseDTO from(Dex dex) {
+        return new DexResponseDTO(
+                dex.getDexId(),
+                dex.getOwnedPlant().getStoreGoodsNumber()
+        );
+    }
+}

src/main/java/org/farmsystem/homepage/domain/minigame/dex/dto/response/DexListResponse.java

@@ -2,14 +2,14 @@
 
 import jakarta.persistence.*;
 import lombok.*;
+import org.farmsystem.homepage.domain.minigame.inventory.entity.Store;
 import org.farmsystem.homepage.domain.minigame.player.entity.Player;
 
 @Entity
 @Table(name = "dex")
 @Getter
 @NoArgsConstructor
 @AllArgsConstructor
-@Builder
 public class Dex {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -20,7 +20,22 @@ public class Dex {
     @JoinColumn(name = "player_id")
     private Player player;
 
-    @Enumerated(EnumType.STRING)
-    @Column(name = "owned_plant", length = 50, nullable = false)
-    private PlantType ownedPlant;
+    // 식물 종류는 Store 마스터 테이블을 참조
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(
+            name = "owned_plant",
+            referencedColumnName = "store_goods_number"
+    )
+    private Store ownedPlant;
+
+    // 식물 등록 정적 팩토리 메서드
+    public static Dex createDex(Player player, Store ownedPlant) {
+        return new Dex(player, ownedPlant);
+    }
+
+    // private 생성자 → createDex 메서드 통해서만 생성
+    private Dex(Player player, Store ownedPlant) {
+        this.player = player;
+        this.ownedPlant = ownedPlant;
+    }
 }

src/main/java/org/farmsystem/homepage/domain/minigame/dex/dto/response/DexResponse.java

@@ -1,5 +1,6 @@
 package org.farmsystem.homepage.domain.minigame.dex.entity;
 
+// PlantType은 인벤토리 코드 수정후 삭제 예정 -> enum 대신 store 마스터 테이블에서 번호(Long)로 관리 예정
 public enum PlantType {
     // 일반
     Roseangela,
@@ -70,4 +71,4 @@ public enum PlantType {
     Cherry_Shiny,
     Cherryblossoms_Shiny,
     Roseofsharon_Shiny
-}
+}

src/main/java/org/farmsystem/homepage/domain/minigame/dex/dto/response/DexResponseDTO.java

@@ -1,14 +1,16 @@
 package org.farmsystem.homepage.domain.minigame.dex.repository;
 
 import org.farmsystem.homepage.domain.minigame.dex.entity.Dex;
-import org.farmsystem.homepage.domain.minigame.dex.entity.PlantType;
+import org.farmsystem.homepage.domain.minigame.inventory.entity.Store;
 import org.farmsystem.homepage.domain.minigame.player.entity.Player;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.util.List;
 
 public interface DexRepository extends JpaRepository<Dex, Long> {
+    // 플레이어의 도감 전체 조회
     List<Dex> findByPlayer(Player player);
 
-    boolean existsByPlayerAndOwnedPlant(Player player, PlantType ownedPlant);
+    // 이미 등록된 식물인지 여부 확인
+    boolean existsByPlayerAndOwnedPlant(Player player, Store ownedPlant);
 }

src/main/java/org/farmsystem/homepage/domain/minigame/dex/entity/Dex.java

@@ -1,17 +1,19 @@
 package org.farmsystem.homepage.domain.minigame.dex.service;
 
-import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
-import org.farmsystem.homepage.domain.minigame.dex.dto.request.DexRequest;
-import org.farmsystem.homepage.domain.minigame.dex.dto.response.DexListResponse;
-import org.farmsystem.homepage.domain.minigame.dex.dto.response.DexResponse;
+import org.farmsystem.homepage.domain.minigame.dex.dto.request.DexRequestDTO;
+import org.farmsystem.homepage.domain.minigame.dex.dto.response.DexResponseDTO;
 import org.farmsystem.homepage.domain.minigame.dex.entity.Dex;
 import org.farmsystem.homepage.domain.minigame.dex.repository.DexRepository;
+import org.farmsystem.homepage.domain.minigame.inventory.entity.Store;
+import org.farmsystem.homepage.domain.minigame.inventory.repository.StoreRepository;
 import org.farmsystem.homepage.domain.minigame.player.entity.Player;
 import org.farmsystem.homepage.domain.minigame.player.repository.PlayerRepository;
 import org.farmsystem.homepage.global.error.ErrorCode;
 import org.farmsystem.homepage.global.error.exception.BusinessException;
+import org.hibernate.type.TrueFalseConverter;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
@@ -21,35 +23,34 @@ public class DexService {
 
     private final PlayerRepository playerRepository;
     private final DexRepository dexRepository;
+    private final StoreRepository storeRepository;
 
     @Transactional
-    public DexResponse addDex(Long userId, DexRequest request) {
+    public DexResponseDTO addDex(Long userId, DexRequestDTO request) {
+        // 플레이어 조회
         Player player = playerRepository.findByUser_UserId(userId)
                 .orElseThrow(() -> new BusinessException(ErrorCode.PLAYER_NOT_FOUND));
-
-        // 이미 등록된 식물인지 체크 (existsBy 사용)
-        if (dexRepository.existsByPlayerAndOwnedPlant(player, request.ownedPlant())) {
+        // 해당 식물이 store에 존재하는지 확인
+        Store store = storeRepository.findByStoreGoodsNumber(request.ownedPlant())
+                .orElseThrow(() -> new BusinessException(ErrorCode.STORE_NOT_FOUND));
+        // 이미 등록된 식물인지 확인
+        if (dexRepository.existsByPlayerAndOwnedPlant(player, store)) {
             throw new BusinessException(ErrorCode.DEX_ALREADY_REGISTERED);
         }
 
-        Dex savedDex = dexRepository.save(Dex.builder()
-                .player(player)
-                .ownedPlant(request.ownedPlant())
-                .build());
-
-        return DexResponse.from(savedDex);
+        Dex savedDex = dexRepository.save(Dex.createDex(player, store));
+        return DexResponseDTO.from(savedDex);
     }
 
-    @Transactional
-    public DexListResponse getDexList(Long userId) {
+    @Transactional(readOnly= true)
+    public List<DexResponseDTO> getDexList(Long userId) {
+        // 플레이어 조회
         Player player = playerRepository.findByUser_UserId(userId)
                 .orElseThrow(() -> new BusinessException(ErrorCode.PLAYER_NOT_FOUND));
-
-        List<DexResponse> list = dexRepository.findByPlayer(player)
+        // 도감 목록 조회 및 반환
+        return dexRepository.findByPlayer(player)
                 .stream()
-                .map(DexResponse::from)
+                .map(DexResponseDTO::from)
                 .toList();
-
-        return new DexListResponse(list);
     }
 }