♻️ Refactor: 로직 수정

Author: naooung

src/main/java/com/pbl/insaroad/domain/game/controller/GameController.java

@@ -13,10 +13,8 @@
 import org.springframework.web.bind.annotation.RequestParam;
 
 import com.pbl.insaroad.domain.game.dto.request.GameRequest.CompleteRequest;
-import com.pbl.insaroad.domain.game.dto.request.GameRequest.UnvisitedRequest;
 import com.pbl.insaroad.domain.game.dto.response.GameResponse.GameProgressResponse;
 import com.pbl.insaroad.domain.game.dto.response.GameResponse.StartResponse;
-import com.pbl.insaroad.domain.game.dto.response.GameResponse.UnvisitedResponse;
 import com.pbl.insaroad.global.response.BaseResponse;
 
 import io.swagger.v3.oas.annotations.Operation;
@@ -36,16 +34,9 @@ public interface GameController {
   @GetMapping("/start")
   BaseResponse<StartResponse> resume(@RequestParam("userCode") String userCode);
 
-  @PostMapping("/unvisited")
-  @Operation(
-      summary = "미방문 Location 전체 조회",
-      description = "사용자 기준으로 아직 방문하지 않은 Location 목록 전체를 반환합니다.")
-  ResponseEntity<BaseResponse<UnvisitedResponse>> unvisited(
-      @RequestBody @Valid UnvisitedRequest request);
-
   @PostMapping("/complete")
   @Operation(
-      summary = "게임 진행/완료 처리",
+      summary = "[개발자] 게임 진행/완료 처리",
       description =
           """
               현재 Location 방문을 처리합니다.
@@ -58,4 +49,8 @@ ResponseEntity<BaseResponse<UnvisitedResponse>> unvisited(
               """)
   ResponseEntity<BaseResponse<GameProgressResponse>> complete(
       @RequestBody @Valid CompleteRequest request);
+
+  @Operation(summary = "[Web] 정보 조회", description = "사용자 코드로 완주 여부에 따라 다른 화면 정보를 반환합니다.")
+  @GetMapping("/progress")
+  BaseResponse<GameProgressResponse> getProgress(@RequestParam String userCode);
 }

src/main/java/com/pbl/insaroad/domain/game/controller/GameControllerImpl.java

@@ -7,13 +7,12 @@
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.pbl.insaroad.domain.game.dto.request.GameRequest.CompleteRequest;
-import com.pbl.insaroad.domain.game.dto.request.GameRequest.UnvisitedRequest;
 import com.pbl.insaroad.domain.game.dto.response.GameResponse.GameProgressResponse;
 import com.pbl.insaroad.domain.game.dto.response.GameResponse.StartResponse;
-import com.pbl.insaroad.domain.game.dto.response.GameResponse.UnvisitedResponse;
 import com.pbl.insaroad.domain.user.service.UserService;
 import com.pbl.insaroad.global.response.BaseResponse;
 
@@ -35,16 +34,14 @@ public BaseResponse<StartResponse> resume(String userCode) {
     return BaseResponse.success(userService.startResumeGame(userCode));
   }
 
-  @Override
-  public ResponseEntity<BaseResponse<UnvisitedResponse>> unvisited(
-      @RequestBody @Valid UnvisitedRequest request) {
-    return ResponseEntity.ok(
-        BaseResponse.success(userService.getUnvisitedLocations(request.getUserCode())));
-  }
-
   @Override
   public ResponseEntity<BaseResponse<GameProgressResponse>> complete(
       @RequestBody @Valid CompleteRequest request) {
     return ResponseEntity.ok(BaseResponse.success(userService.completeGame(request)));
   }
+
+  @Override
+  public BaseResponse<GameProgressResponse> getProgress(@RequestParam String userCode) {
+    return BaseResponse.success(userService.getGameProgress(userCode));
+  }
 }

src/main/java/com/pbl/insaroad/domain/game/mapper/GameMapper.java

@@ -0,0 +1,49 @@
+/* 
+ * Copyright (c) SKU PBL Team4 
+ */
+package com.pbl.insaroad.domain.game.mapper;
+
+import java.util.List;
+
+import com.pbl.insaroad.domain.game.dto.response.GameResponse.CompleteResponse;
+import com.pbl.insaroad.domain.game.dto.response.GameResponse.FinishResponse;
+import com.pbl.insaroad.domain.game.dto.response.GameResponse.GameProgressResponse;
+import com.pbl.insaroad.domain.location.dto.LocationResponse;
+import com.pbl.insaroad.domain.location.entity.Location;
+import com.pbl.insaroad.domain.ticket.entity.Ticket;
+import com.pbl.insaroad.domain.user.entity.User;
+
+public final class GameMapper {
+
+  private GameMapper() {}
+
+  /* ---------- 미완주 ---------- */
+
+  public static GameProgressResponse toInProgress(User user, List<Location> unvisited) {
+    return GameProgressResponse.builder()
+        .completed(false)
+        .complete(
+            CompleteResponse.builder()
+                .userCode(user.getCode())
+                .unvisitedLocations(unvisited.stream().map(LocationResponse::from).toList())
+                .build())
+        .finish(null)
+        .build();
+  }
+
+  /* ---------- 완주 + 티켓 있음 ---------- */
+
+  public static GameProgressResponse toCompletedWithTicket(User user, Ticket ticket, String qrUrl) {
+    return GameProgressResponse.builder()
+        .completed(true)
+        .complete(null)
+        .finish(FinishResponse.builder().exchangeUrl(qrUrl).issuedAt(ticket.getCreatedAt()).build())
+        .build();
+  }
+
+  /* ---------- 완주 + 티켓 없음 ---------- */
+
+  public static GameProgressResponse toCompletedWithoutTicket() {
+    return GameProgressResponse.builder().completed(true).complete(null).finish(null).build();
+  }
+}

src/main/java/com/pbl/insaroad/domain/koreanname/service/KoreanNameService.java

@@ -27,7 +27,7 @@ public class KoreanNameService {
   private final KoreanNameAiClient koreanNameAiClient;
   private final UserService userService;
 
-  @Transactional(readOnly = true)
+  @Transactional
   public KoreanNameResponse recommendName(KoreanNameRequest request) {
     String systemPrompt =
         """

src/main/java/com/pbl/insaroad/domain/location/controller/LocationController.java

@@ -12,6 +12,8 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import com.pbl.insaroad.domain.game.dto.request.GameRequest;
+import com.pbl.insaroad.domain.game.dto.response.GameResponse.UnvisitedResponse;
 import com.pbl.insaroad.domain.location.dto.LocationResponse;
 import com.pbl.insaroad.domain.location.dto.request.LocationRequest;
 import com.pbl.insaroad.global.response.BaseResponse;
@@ -31,4 +33,11 @@ ResponseEntity<BaseResponse<LocationResponse>> create(
   @DeleteMapping("/{id}")
   @Operation(summary = "Location 삭제", description = "Location을 삭제합니다.")
   ResponseEntity<BaseResponse<Void>> deleteById(@PathVariable("id") Long locationId);
+
+  @PostMapping("/unvisited")
+  @Operation(
+      summary = "미방문 Location 전체 조회",
+      description = "사용자 기준으로 아직 방문하지 않은 Location 목록 전체를 반환합니다.")
+  ResponseEntity<BaseResponse<UnvisitedResponse>> unvisited(
+      @RequestBody @Valid GameRequest.UnvisitedRequest request);
 }

src/main/java/com/pbl/insaroad/domain/location/controller/LocationControllerImpl.java

@@ -10,9 +10,12 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.pbl.insaroad.domain.game.dto.request.GameRequest;
+import com.pbl.insaroad.domain.game.dto.response.GameResponse.UnvisitedResponse;
 import com.pbl.insaroad.domain.location.dto.LocationResponse;
 import com.pbl.insaroad.domain.location.dto.request.LocationRequest.CreateLocationRequest;
 import com.pbl.insaroad.domain.location.service.LocationService;
+import com.pbl.insaroad.domain.user.service.UserService;
 import com.pbl.insaroad.global.response.BaseResponse;
 
 import lombok.RequiredArgsConstructor;
@@ -22,13 +25,21 @@
 public class LocationControllerImpl implements LocationController {
 
   private final LocationService locationService;
+  private final UserService userService;
 
   @Override
   public ResponseEntity<BaseResponse<LocationResponse>> create(
       @RequestBody @Valid CreateLocationRequest request) {
     return ResponseEntity.ok(BaseResponse.success(locationService.create(request)));
   }
 
+  @Override
+  public ResponseEntity<BaseResponse<UnvisitedResponse>> unvisited(
+      @RequestBody @Valid GameRequest.UnvisitedRequest request) {
+    return ResponseEntity.ok(
+        BaseResponse.success(userService.getUnvisitedLocations(request.getUserCode())));
+  }
+
   @Override
   public ResponseEntity<BaseResponse<Void>> deleteById(@PathVariable("id") Long locationId) {
     locationService.deleteById(locationId);

src/main/java/com/pbl/insaroad/domain/ticket/repository/TicketRepository.java

@@ -30,15 +30,26 @@ public interface TicketRepository extends JpaRepository<Ticket, Long> {
   @Lock(LockModeType.PESSIMISTIC_WRITE)
   @Query(
       """
-      select t
-      from Ticket t
-      where t.userId = :userId
-        and t.usedAt is null
-        and (t.expiresAt is null or t.expiresAt >= :today)
-      order by t.createdAt desc
-      """)
+          select t
+          from Ticket t
+          where t.userId = :userId
+            and t.usedAt is null
+            and (t.expiresAt is null or t.expiresAt >= :today)
+          order by t.createdAt desc
+          """)
   List<Ticket> findLatestValidTicketForUpdate(
       @Param("userId") Long userId, @Param("today") LocalDate today, Pageable pageable);
 
   Optional<Ticket> findTop1ByUserIdOrderByCreatedAtDesc(Long userId);
+
+  @Query(
+      """
+        SELECT t
+        FROM Ticket t
+        WHERE t.userId = :userId
+          AND t.expiresAt >= :today
+        ORDER BY t.createdAt DESC
+      """)
+  List<Ticket> findLatestValidTicket(
+      @Param("userId") Long userId, @Param("today") LocalDate today, Pageable pageable);
 }

src/main/java/com/pbl/insaroad/domain/ticket/service/TicketService.java

@@ -4,6 +4,7 @@
 package com.pbl.insaroad.domain.ticket.service;
 
 import java.util.List;
+import java.util.Optional;
 
 import com.pbl.insaroad.domain.ticket.dto.request.TicketRequest.ConsumeTicketRequest;
 import com.pbl.insaroad.domain.ticket.dto.request.TicketRequest.VerifyTicketRequest;
@@ -45,4 +46,6 @@ public interface TicketService {
   Ticket issueNewTicket(Long userId);
 
   List<TicketItemResponse> getTicketsByUserCode(String userCode);
+
+  Optional<Ticket> findLatestValidTicket(Long userId);
 }

src/main/java/com/pbl/insaroad/domain/ticket/service/TicketServiceImpl.java

@@ -6,6 +6,7 @@
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 
 import org.springframework.data.domain.PageRequest;
 import org.springframework.stereotype.Service;
@@ -118,4 +119,13 @@ private User getUserByCodeOrThrow(String userCode) {
         .findByCode(userCode)
         .orElseThrow(() -> new CustomException(GameErrorCode.USER_NOT_FOUND));
   }
+
+  @Override
+  public Optional<Ticket> findLatestValidTicket(Long userId) {
+
+    List<Ticket> tickets =
+        ticketRepository.findLatestValidTicket(userId, LocalDate.now(), PageRequest.of(0, 1));
+
+    return tickets.isEmpty() ? Optional.empty() : Optional.of(tickets.getFirst());
+  }
 }

src/main/java/com/pbl/insaroad/domain/user/service/UserService.java

@@ -19,6 +19,7 @@
 import com.pbl.insaroad.domain.game.dto.response.GameResponse.StartResponse;
 import com.pbl.insaroad.domain.game.dto.response.GameResponse.UnvisitedResponse;
 import com.pbl.insaroad.domain.game.exception.GameErrorCode;
+import com.pbl.insaroad.domain.game.mapper.GameMapper;
 import com.pbl.insaroad.domain.location.dto.LocationResponse;
 import com.pbl.insaroad.domain.location.entity.Location;
 import com.pbl.insaroad.domain.location.repository.LocationRepository;
@@ -128,7 +129,11 @@ public GameProgressResponse completeGame(CompleteRequest request) {
     int currentStage = user.getStage();
 
     if (currentStage >= 3) {
-      // stage3 완료로 간주하고 finish 응답(티켓은 issueNewTicket이 막아줌)
+
+      if (!user.isCompleted()) {
+        user.completeMission();
+      }
+
       Ticket ticket = ticketService.issueNewTicket(user.getId());
       FinishResponse finish =
           FinishResponse.builder()
@@ -153,6 +158,24 @@ public GameProgressResponse completeGame(CompleteRequest request) {
     return GameProgressResponse.builder().completed(false).complete(complete).finish(null).build();
   }
 
+  @Transactional(readOnly = true)
+  public GameProgressResponse getGameProgress(String userCode) {
+
+    User user = getUserByCodeOrThrow(userCode);
+
+    if (!user.isCompleted()) {
+      return GameMapper.toInProgress(user, findUnvisitedLocations(user));
+    }
+
+    return ticketService
+        .findLatestValidTicket(user.getId())
+        .map(
+            ticket ->
+                GameMapper.toCompletedWithTicket(
+                    user, ticket, qrPayloadFactory.create(ticket.getToken())))
+        .orElseGet(GameMapper::toCompletedWithoutTicket);
+  }
+
   /* =========================
    * Private Helpers
    * ========================= */