개발 기록 초안 작성·확정과 타임라인을 구성한다

Application/App/Sources/App/Dependency/AppGraph+PresentationDependencies.swift

@@ -11,6 +11,7 @@ extension AppGraph {
     func preparePresentationDependencies() {
         prepareDependencies { dependencies in
             prepareEntryDependencies(&dependencies)
+            prepareDevelopmentDependencies(&dependencies)
             prepareTodoDependencies(&dependencies)
             prepareHomeDependencies(&dependencies)
             prepareTodayDependencies(&dependencies)
@@ -21,6 +22,39 @@ extension AppGraph {
 }
 
 private extension AppGraph {
+    func prepareDevelopmentDependencies(_ dependencies: inout DependencyValues) {
+        DevelopmentDependencyPreparation.prepareGoal(
+            &dependencies,
+            fetchGoalUseCase: developmentGraphSet
+                .developmentGoalUseCaseGraph
+                .fetchDevelopmentGoalUseCase
+        )
+        DevelopmentDependencyPreparation.prepareQuery(
+            &dependencies,
+            fetchRecordsUseCase: developmentGraphSet
+                .developmentRecordQueryUseCaseGraph
+                .fetchDevelopmentRecordsUseCase,
+            fetchRecordHistoryUseCase: developmentGraphSet
+                .developmentRecordQueryUseCaseGraph
+                .fetchDevelopmentRecordHistoryUseCase,
+            fetchRecordVersionUseCase: developmentGraphSet
+                .developmentRecordQueryUseCaseGraph
+                .fetchDevelopmentRecordVersionUseCase
+        )
+        DevelopmentDependencyPreparation.prepareMutation(
+            &dependencies,
+            createRecordUseCase: developmentGraphSet
+                .developmentRecordMutationUseCaseGraph
+                .createDevelopmentRecordUseCase,
+            saveRecordDraftUseCase: developmentGraphSet
+                .developmentRecordMutationUseCaseGraph
+                .saveDevelopmentRecordDraftUseCase,
+            confirmRecordUseCase: developmentGraphSet
+                .developmentRecordMutationUseCaseGraph
+                .confirmDevelopmentRecordUseCase
+        )
+    }
+
     func prepareEntryDependencies(_ dependencies: inout DependencyValues) {
         PresentationDependencyPreparation.prepareRoot(
             &dependencies,

Application/Data/Sources/DTO/DevelopmentRecordDTO.swift

@@ -11,15 +11,21 @@ public struct DevelopmentRecordDraftRequest: Encodable {
     public let title: String
     public let markdownContent: String
     public let baseVersionId: String?
+    public let revisionId: String?
+    public let expectedRevisionId: String?
 
     public init(
         title: String,
         markdownContent: String,
-        baseVersionId: String?
+        baseVersionId: String?,
+        revisionId: String? = nil,
+        expectedRevisionId: String? = nil
     ) {
         self.title = title
         self.markdownContent = markdownContent
         self.baseVersionId = baseVersionId
+        self.revisionId = revisionId
+        self.expectedRevisionId = expectedRevisionId
     }
 }
 
@@ -35,15 +41,18 @@ public struct DevelopmentRecordConfirmationRequest {
     public let versionId: String
     public let kind: String
     public let sourceVersionId: String?
+    public let draftRevisionId: String?
 
     public init(
         versionId: String,
         kind: String,
-        sourceVersionId: String?
+        sourceVersionId: String?,
+        draftRevisionId: String? = nil
     ) {
         self.versionId = versionId
         self.kind = kind
         self.sourceVersionId = sourceVersionId
+        self.draftRevisionId = draftRevisionId
     }
 }
 
@@ -61,17 +70,20 @@ public struct DevelopmentRecordDraftResponse {
     public let title: String
     public let markdownContent: String
     public let baseVersionId: String?
+    public let revisionId: String?
     public let updatedAt: Date
 
     public init(
         title: String,
         markdownContent: String,
         baseVersionId: String?,
+        revisionId: String? = nil,
         updatedAt: Date
     ) {
         self.title = title
         self.markdownContent = markdownContent
         self.baseVersionId = baseVersionId
+        self.revisionId = revisionId
         self.updatedAt = updatedAt
     }
 }

Application/Data/Sources/Mapper/DevelopmentRecordMapping.swift

@@ -8,11 +8,16 @@
 import Domain
 
 public extension DevelopmentRecordDraftRequest {
-    static func fromDomain(_ draft: DevelopmentRecord.Draft) -> Self {
+    static func fromDomain(
+        _ draft: DevelopmentRecord.Draft,
+        expectedRevisionId: String? = nil
+    ) -> Self {
         Self(
             title: draft.title,
             markdownContent: draft.markdownContent,
-            baseVersionId: draft.baseVersionId
+            baseVersionId: draft.baseVersionId,
+            revisionId: draft.revisionId,
+            expectedRevisionId: expectedRevisionId
         )
     }
 }
@@ -23,6 +28,7 @@ public extension DevelopmentRecordDraftResponse {
             title: title,
             markdownContent: markdownContent,
             baseVersionId: baseVersionId,
+            revisionId: revisionId,
             updatedAt: updatedAt
         )
     }

Application/Data/Sources/Protocol/DevelopmentRecordService.swift

@@ -13,6 +13,11 @@ public protocol DevelopmentRecordService {
     ) async throws -> DevelopmentRecordResponse
     func fetchRecords(goalId: String) async throws -> [DevelopmentRecordResponse]
     func fetchRecord(goalId: String, recordId: String) async throws -> DevelopmentRecordResponse
+    func fetchVersion(
+        goalId: String,
+        recordId: String,
+        versionId: String
+    ) async throws -> DevelopmentRecordVersionResponse
     func fetchVersions(
         goalId: String,
         recordId: String

Application/Data/Sources/Repository/DevelopmentRecordRepositoryImpl.swift

@@ -47,6 +47,22 @@ final class DevelopmentRecordRepositoryImpl: DevelopmentRecordRepository {
         }
     }
 
+    func fetchVersion(
+        goalId: String,
+        recordId: String,
+        versionId: String
+    ) async throws -> DevelopmentRecord.Version {
+        do {
+            return try await service.fetchVersion(
+                goalId: goalId,
+                recordId: recordId,
+                versionId: versionId
+            ).toDomain()
+        } catch {
+            throw error.toDomain()
+        }
+    }
+
     func fetchVersions(
         goalId: String,
         recordId: String
@@ -61,13 +77,14 @@ final class DevelopmentRecordRepositoryImpl: DevelopmentRecordRepository {
     func saveDraft(
         goalId: String,
         recordId: String,
+        expectedRevisionId: String?,
         draft: DevelopmentRecord.Draft
     ) async throws -> DevelopmentRecord {
         do {
             let response = try await service.saveDraft(
                 goalId: goalId,
                 recordId: recordId,
-                request: .fromDomain(draft)
+                request: .fromDomain(draft, expectedRevisionId: expectedRevisionId)
             )
             return try response.toDomain()
         } catch {
@@ -80,7 +97,8 @@ final class DevelopmentRecordRepositoryImpl: DevelopmentRecordRepository {
         recordId: String,
         versionId: String,
         kind: DevelopmentRecord.Version.Kind,
-        sourceVersionId: String?
+        sourceVersionId: String?,
+        draftRevisionId: String?
     ) async throws -> DevelopmentRecord.Version {
         do {
             let response = try await service.confirmDraft(
@@ -89,7 +107,8 @@ final class DevelopmentRecordRepositoryImpl: DevelopmentRecordRepository {
                 request: .init(
                     versionId: versionId,
                     kind: kind.storageValue,
-                    sourceVersionId: sourceVersionId
+                    sourceVersionId: sourceVersionId,
+                    draftRevisionId: draftRevisionId
                 )
             )
             return try response.toDomain()

Application/Data/Tests/Mapper/DevelopmentRecordMappingTests.swift

@@ -17,6 +17,7 @@ struct DevelopmentRecordMappingTests {
             title: "기록",
             markdownContent: "본문",
             baseVersionId: "version-1",
+            revisionId: "revision-1",
             updatedAt: .distantPast
         )
 
@@ -25,6 +26,7 @@ struct DevelopmentRecordMappingTests {
         #expect(request.title == "기록")
         #expect(request.markdownContent == "본문")
         #expect(request.baseVersionId == "version-1")
+        #expect(request.revisionId == "revision-1")
     }
 
     @Test("저장 버전 종류는 Domain 종류로 변환한다")

Application/Data/Tests/Repository/DevelopmentRecordRepositoryImplTests.swift

@@ -45,14 +45,16 @@ struct DevelopmentRecordRepositoryImplTests {
             recordId: "record-1",
             versionId: "version-2",
             kind: .correction,
-            sourceVersionId: "version-1"
+            sourceVersionId: "version-1",
+            draftRevisionId: "revision-1"
         )
 
         let request = try #require(await service.confirmationRequest())
         #expect(version.kind == .correction)
         #expect(request.versionId == "version-2")
         #expect(request.kind == "correction")
         #expect(request.sourceVersionId == "version-1")
+        #expect(request.draftRevisionId == "revision-1")
     }
 }
 
@@ -100,6 +102,14 @@ private actor DevelopmentRecordServiceSpy: DevelopmentRecordService {
         [version]
     }
 
+    func fetchVersion(
+        goalId: String,
+        recordId: String,
+        versionId: String
+    ) async throws -> DevelopmentRecordVersionResponse {
+        version
+    }
+
     func saveDraft(
         goalId: String,
         recordId: String,

Application/Domain/Sources/Entity/DevelopmentRecord.swift

@@ -12,12 +12,14 @@ public struct DevelopmentRecord: Hashable {
         public let title: String
         public let markdownContent: String
         public let baseVersionId: String?
+        public let revisionId: String?
         public let updatedAt: Date
 
         public init(
             title: String,
             markdownContent: String,
             baseVersionId: String?,
+            revisionId: String? = nil,
             updatedAt: Date
         ) throws {
             guard title.containsMeaningfulCharacter else {
@@ -26,10 +28,14 @@ public struct DevelopmentRecord: Hashable {
             guard baseVersionId?.containsMeaningfulCharacter != false else {
                 throw DomainLayerError.invalidDevelopmentRecordVersion
             }
+            guard revisionId?.containsMeaningfulCharacter != false else {
+                throw DomainLayerError.invalidDevelopmentRecordVersion
+            }
 
             self.title = title
             self.markdownContent = markdownContent
             self.baseVersionId = baseVersionId
+            self.revisionId = revisionId
             self.updatedAt = updatedAt
         }
     }

Application/Domain/Sources/Graph/DevelopmentRecordQueryUseCaseGraph.swift

@@ -26,4 +26,9 @@ public final class DevelopmentRecordQueryUseCaseGraph {
     private func makeFetchDevelopmentRecordHistoryUseCase() -> FetchDevelopmentRecordHistoryUseCase {
         FetchDevelopmentRecordHistoryUseCaseImpl(input.repository)
     }
+
+    @Provide
+    private func makeFetchDevelopmentRecordVersionUseCase() -> FetchDevelopmentRecordVersionUseCase {
+        FetchDevelopmentRecordVersionUseCaseImpl(input.repository)
+    }
 }

Application/Domain/Sources/Protocol/DevelopmentRecordRepository.swift

@@ -13,18 +13,25 @@ public protocol DevelopmentRecordRepository {
     ) async throws -> DevelopmentRecord
     func fetchRecords(goalId: String) async throws -> [DevelopmentRecord]
     func fetchRecord(goalId: String, recordId: String) async throws -> DevelopmentRecord
+    func fetchVersion(
+        goalId: String,
+        recordId: String,
+        versionId: String
+    ) async throws -> DevelopmentRecord.Version
     func fetchVersions(goalId: String, recordId: String) async throws -> [DevelopmentRecord.Version]
     func saveDraft(
         goalId: String,
         recordId: String,
+        expectedRevisionId: String?,
         draft: DevelopmentRecord.Draft
     ) async throws -> DevelopmentRecord
     func confirmDraft(
         goalId: String,
         recordId: String,
         versionId: String,
         kind: DevelopmentRecord.Version.Kind,
-        sourceVersionId: String?
+        sourceVersionId: String?,
+        draftRevisionId: String?
     ) async throws -> DevelopmentRecord.Version
     func restoreVersion(
         goalId: String,

Application/Domain/Sources/UseCase/DevelopmentRecord/Confirm/ConfirmDevelopmentRecordUseCase.swift

@@ -6,5 +6,11 @@
 //
 
 public protocol ConfirmDevelopmentRecordUseCase {
-    func execute(goalId: String, recordId: String) async throws -> DevelopmentRecord.Version
+    func execute(
+        goalId: String,
+        recordId: String,
+        versionId: String,
+        baseVersionId: String?,
+        draftRevisionId: String?
+    ) async throws -> DevelopmentRecord.Version
 }