혼합 광고·채팅 흐름·Tuist 캐시 개선과 전체 모듈 문서화

Plugins/DependencyPlugin/ProjectDescriptionHelpers/TargetDependency+Module/Modules.swift

@@ -65,6 +65,7 @@ public enum DomainModule: String, CaseIterable {
   case auth = "AuthDomain"
   case battle = "BattleDomain"
   case comment = "CommentDomain"
+  case ad = "AdDomain"
   case home = "HomeDomain"
   case notification = "NotificationDomain"
   case perspective = "PerspectiveDomain"

Projects/Feature/Chat/Sources/Coordinator/Reducer/ChatCoordinator.swift → Projects/App/Sources/Navigation/Chat/ChatCoordinator.swift

@@ -1,6 +1,6 @@
 //
 //  ChatCoordinator.swift
-//  Chat
+//  App
 //
 
 import Foundation
@@ -9,6 +9,7 @@ import PickeCoreLogger
 import ChatInterface
 import CommentDomainInterface
 import ComposableArchitecture
+import FeatureAssembly
 import PickeDesignKit
 import PickeCoreUtility
 import TCAFlow
@@ -99,7 +100,13 @@ extension ChatCoordinator {
     action: IndexedRouterActionOf<ChatScreen>
   ) -> Effect<Action> {
     switch action {
-    case .routeAction(_, action: .preVote(.delegate(.dismiss))):
+    case let .routeAction(id, action: .preVote(.delegate(.dismiss))):
+      // 루트(사전투표)의 뒤로가기는 Chat 플로우 전체를 닫고,
+      // 스택 위에 올라온 최종투표 화면이면 한 단계만 닫아 대화방으로 돌아간다.
+      guard id == 0 else {
+        state.routes.goBack()
+        return .none
+      }
       return .send(.delegate(.dismiss))
 
     case let .routeAction(_, action: .preVote(.delegate(.voteSubmitted(battleId, voteMode, _, isMindChanged)))):
@@ -115,7 +122,9 @@ extension ChatCoordinator {
       // 사전투표 루트에서 감지된 재진입이면 사전투표 화면을 남기지 않고 관점 화면으로 교체.
       // (스택 중간 — 최종투표 중복 500 — 이면 기존처럼 push)
       if state.routes.count <= 1 {
-        state.routes = [.root(.comment(.init(battleId: battleId)), embedInNavigationView: true)]
+        // 배열을 통째로 갈아끼우면 TCAFlow 의 인덱스 기반 스크린 상태 캐시가 이전 화면 상태를
+        // 그대로 붙들어 화면이 바뀌지 않는다. 같은 인덱스의 screen 만 교체한다.
+        state.routes[screenAt: 0] = .comment(.init(battleId: battleId))
       } else {
         state.routes.push(.comment(.init(battleId: battleId)))
       }

Projects/Feature/Chat/Sources/Coordinator/View/ChatCoordinatorView.swift → Projects/App/Sources/Navigation/Chat/ChatCoordinatorView.swift

@@ -1,13 +1,14 @@
 //
 //  ChatCoordinatorView.swift
-//  Chat
+//  App
 //
 
 import Foundation
 
 import SwiftUI
 
 import ComposableArchitecture
+import FeatureAssembly
 import TCAFlow
 
 public struct ChatCoordinatorView: View {

Projects/Domain/AdDomain/Interface/Sources/Model/FeedAd.swift

@@ -0,0 +1,32 @@
+public struct FeedAd: Equatable, Sendable, Identifiable {
+  public let code: String
+  public let network: String
+  public let title: String
+  public let subtitle: String
+  public let imageURL: String
+  public let ctaText: String
+  public let clickURL: String
+  public let label: String
+
+  public var id: String { code }
+
+  public init(
+    code: String,
+    network: String,
+    title: String,
+    subtitle: String,
+    imageURL: String,
+    ctaText: String,
+    clickURL: String,
+    label: String
+  ) {
+    self.code = code
+    self.network = network
+    self.title = title
+    self.subtitle = subtitle
+    self.imageURL = imageURL
+    self.ctaText = ctaText
+    self.clickURL = clickURL
+    self.label = label
+  }
+}

Projects/Domain/AdDomain/Interface/Sources/UseCase/FeedAdInterface.swift

@@ -0,0 +1,31 @@
+import ComposableArchitecture
+
+public protocol FeedAdInterface: Sendable {
+  func fetchAds() async throws -> [FeedAd]
+  func recordImpressions(codes: [String]) async throws
+}
+
+public enum FeedAdUseCaseDependency: TestDependencyKey {
+  public static var testValue: FeedAdInterface { MockFeedAdClient() }
+}
+
+public enum FeedAdRepositoryDependency: TestDependencyKey {
+  public static var testValue: FeedAdInterface { MockFeedAdClient() }
+}
+
+public extension DependencyValues {
+  var feedAdRepository: FeedAdInterface {
+    get { self[FeedAdRepositoryDependency.self] }
+    set { self[FeedAdRepositoryDependency.self] = newValue }
+  }
+
+  var feedAdUseCase: FeedAdInterface {
+    get { self[FeedAdUseCaseDependency.self] }
+    set { self[FeedAdUseCaseDependency.self] = newValue }
+  }
+}
+
+private struct MockFeedAdClient: FeedAdInterface {
+  func fetchAds() async throws -> [FeedAd] { [] }
+  func recordImpressions(codes: [String]) async throws {}
+}

Projects/Domain/AdDomain/Project.swift

@@ -0,0 +1,23 @@
+import Foundation
+
+import DependencyPackagePlugin
+import DependencyPlugin
+import ProjectTemplatePlugin
+
+import ProjectDescription
+
+let project = Project.makeModule(
+  name: "AdDomain",
+  bundleId: .appBundleID(name: ".AdDomain"),
+  product: .framework,
+  settings: .settings(),
+  dependencies: [
+    .serviceAssembly,
+  ],
+  hasTests: true,
+  hasInterface: true,
+  interfaceDependencies: [
+    .SPM.composableArchitecture,
+  ],
+  hasTesting: false
+)

Projects/Domain/AdDomain/Sources/AdLiveDependencies.swift

@@ -0,0 +1,10 @@
+import AdDomainInterface
+import ComposableArchitecture
+
+extension FeedAdUseCaseDependency: DependencyKey {
+  public static var liveValue: FeedAdInterface { FeedAdUseCaseImpl() }
+}
+
+extension FeedAdRepositoryDependency: DependencyKey {
+  public static var liveValue: FeedAdInterface { FeedAdRepositoryImpl() }
+}

Projects/Domain/AdDomain/Sources/Model/FeedAdDTO.swift

@@ -0,0 +1,25 @@
+import AdDomainInterface
+
+struct FeedAdDTO: Decodable, Sendable {
+  let code: String
+  let network: String
+  let title: String
+  let subtitle: String
+  let imageUrl: String
+  let ctaText: String
+  let clickUrl: String
+  let label: String
+
+  func toDomain() -> FeedAd {
+    FeedAd(
+      code: code,
+      network: network,
+      title: title,
+      subtitle: subtitle,
+      imageURL: imageUrl,
+      ctaText: ctaText,
+      clickURL: clickUrl,
+      label: label
+    )
+  }
+}

Projects/Domain/AdDomain/Sources/Repository/FeedAdRepositoryImpl.swift

@@ -0,0 +1,25 @@
+import APIEndpoint
+import AdDomainInterface
+import ComposableArchitecture
+import PickeNetwork
+
+public struct FeedAdRepositoryImpl: FeedAdInterface {
+  @Dependency(\.networkClient) private var client
+
+  public init() {}
+
+  public func fetchAds() async throws -> [FeedAd] {
+    let data = try await client.send(
+      AdsService.list(query: AdsQueryRequest()),
+      as: [FeedAdDTO].self
+    )
+    return data.map { $0.toDomain() }
+  }
+
+  public func recordImpressions(codes: [String]) async throws {
+    _ = try await client.send(
+      AdsService.impressions(body: AdsImpressionsRequest(codes: codes)),
+      as: PickeEmptyResponse.self
+    )
+  }
+}

Projects/Domain/AdDomain/Sources/UseCase/FeedAdUseCaseImpl.swift

@@ -0,0 +1,16 @@
+import AdDomainInterface
+import ComposableArchitecture
+
+public struct FeedAdUseCaseImpl: FeedAdInterface {
+  @Dependency(\.feedAdRepository) private var feedAdRepository
+
+  public init() {}
+
+  public func fetchAds() async throws -> [FeedAd] {
+    return try await feedAdRepository.fetchAds()
+  }
+
+  public func recordImpressions(codes: [String]) async throws {
+    try await feedAdRepository.recordImpressions(codes: codes)
+  }
+}

Projects/Domain/AdDomain/Tests/Sources/AdDomainTests.swift

@@ -0,0 +1,57 @@
+//
+//  AdTests.swift
+//  AdTests
+//
+
+import Foundation
+@testable import PickeNetwork
+@testable import AdDomain
+import AdDomainInterface
+import APIEndpoint
+import Testing
+
+struct AdDomainTests {
+  @Test func 광고_DTO를_도메인으로_매핑한다() {
+    let dto = FeedAdDTO(
+      code: "a1",
+      network: "ADPICK",
+      title: "상품",
+      subtitle: "상점 · 2.8%",
+      imageUrl: "https://example.com/image.jpg",
+      ctaText: "구매하러 가기",
+      clickUrl: "https://ad.picke.store/c/a1",
+      label: "광고"
+    )
+
+    #expect(dto.toDomain() == FeedAd(
+      code: "a1",
+      network: "ADPICK",
+      title: "상품",
+      subtitle: "상점 · 2.8%",
+      imageURL: "https://example.com/image.jpg",
+      ctaText: "구매하러 가기",
+      clickURL: "https://ad.picke.store/c/a1",
+      label: "광고"
+    ))
+  }
+
+  @Test func 광고_조회_요청을_매핑한다() throws {
+    let request = try AdsService.list(query: AdsQueryRequest()).asURLRequest()
+    #expect(request.url?.path == "/api/v1/ads")
+    #expect(request.httpMethod == "GET")
+    #expect(request.url?.query?.contains("slot=HOME_FEED") == true)
+    #expect(request.url?.query?.contains("os=IOS") == true)
+    #expect(request.url?.query?.contains("size=20") == true)
+  }
+
+  @Test func 광고_노출은_codes_JSON을_POST한다() throws {
+    let request = try AdsService.impressions(
+      body: AdsImpressionsRequest(codes: ["first", "second"])
+    ).asURLRequest()
+    #expect(request.url?.path == "/api/v1/ads/impressions")
+    #expect(request.httpMethod == "POST")
+    let data = try #require(request.httpBody)
+    let body = try JSONDecoder().decode([String: [String]].self, from: data)
+    #expect(body == ["codes": ["first", "second"]])
+  }
+}

Projects/Domain/BattleDomain/Sources/Model/DTO/BattleScenarioDataDTO.swift

@@ -12,7 +12,8 @@ public struct BattleScenarioDataDTO: Decodable {
   public let title: String
   public let philosophers: [ScenarioPhilosopherDTO]
   public let isInteractive: Bool
-  public let startNodeId: Int
+  /// 서버가 비대화형 시나리오에서 null 을 내려주므로 옵셔널. 매핑 시 첫 노드로 폴백한다.
+  public let startNodeId: Int?
   public let recommendedPathKey: String
   public let audios: [String: String]
   public let nodes: [ScenarioNodeDTO]

Projects/Domain/BattleDomain/Sources/Model/Mapper/BattleScenarioDataDTO+.swift

@@ -15,7 +15,7 @@ public extension BattleScenarioDataDTO {
         dto.toDomain(fallbackLabel: Self.fallbackLabel(for: idx))
       },
       isInteractive: isInteractive,
-      startNodeId: startNodeId,
+      startNodeId: startNodeId ?? nodes.first?.nodeId ?? 0,
       recommendedPathKey: RecommendedPathKey(rawValue: recommendedPathKey),
       audios: audios,
       nodes: nodes.map { $0.toDomain() }

Projects/Domain/BattleDomain/Tests/Sources/BattleRepositoryTests.swift

@@ -388,6 +388,21 @@ struct BattleRepositoryTests {
     #expect(perspective == nil)
   }
 
+  @Test func fetchMyPerspective_는_data_가_빈_배열이면_nil_을_반환한다() async throws {
+    let json = """
+    { "statusCode": 200, "data": [] }
+    """
+    let repo = withDependencies {
+      $0.networkClient = StubNetworkClient(stubData: Data(json.utf8))
+    } operation: {
+      BattleRepositoryImpl()
+    }
+
+    let perspective = try await repo.fetchMyPerspective(battleId: 1)
+
+    #expect(perspective == nil)
+  }
+
   @Test func fetchMyPerspective_는_provider_가_에러를_던지면_nil_을_반환한다() async throws {
     let repo = withDependencies {
       $0.networkClient = ThrowingStubNetworkClient()
@@ -474,6 +489,51 @@ struct BattleRepositoryTests {
     #expect(scenario.philosophers[1].label == "B")
   }
 
+  @Test func fetchScenario_는_startNodeId_가_null_이면_첫_노드를_시작_노드로_쓴다() async throws {
+    let json = """
+    {
+      "statusCode": 200,
+      "data": {
+        "battleId": 5,
+        "title": "시나리오 제목",
+        "philosophers": [{"label": "A", "name": "소크라테스", "stance": "PRO", "imageUrl": "https://img.picke.app/s.png"}],
+        "isInteractive": false,
+        "startNodeId": null,
+        "recommendedPathKey": "COMMON",
+        "audios": {},
+        "nodes": [
+          {
+            "nodeId": 11,
+            "nodeName": "START",
+            "audioDuration": 85,
+            "autoNextNodeId": null,
+            "scripts": [],
+            "interactiveOptions": []
+          },
+          {
+            "nodeId": 12,
+            "nodeName": "CLOSING",
+            "audioDuration": 11,
+            "autoNextNodeId": null,
+            "scripts": [],
+            "interactiveOptions": []
+          }
+        ]
+      },
+      "error": null
+    }
+    """
+    let repo = withDependencies {
+      $0.networkClient = StubNetworkClient(stubData: Data(json.utf8))
+    } operation: {
+      BattleRepositoryImpl()
+    }
+
+    let scenario = try await repo.fetchScenario(battleId: 5)
+
+    #expect(scenario.startNodeId == 11)
+  }
+
   // MARK: - fetchRecommendedBattles
 
   @Test func fetchRecommendedBattles_는_봉투_data_를_도메인으로_매핑한다() async throws {