fix : OrganizingSentenceRepository 생성 위치 수정 #7

- AddArticleComponent 에 OrganizingSentenceRepositoryImp 생성 - 잘못된 위치에서 생성된 OrganizingSentenceRepository 코드 제거 - AddArticle 하위 RIB 들이 이를 공유하도록 설정
DDD-Community · Aug 8, 2023 · 5673357 · 5673357
1 parent 14320e3
commit 5673357
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 40 deletions.
diff --git a/Particle/Particle/LoggedIn/LoggedInBuilder.swift b/Particle/Particle/LoggedIn/LoggedInBuilder.swift
@@ -8,19 +8,13 @@
 import RIBs
 
 protocol LoggedInDependency: Dependency {
-    // TODO: Make sure to convert the variable into lower-camelcase.
-    var LoggedInViewController: LoggedInViewControllable { get }
-    var organizingSentenceRepository: OrganizingSentenceRepository { get }
+    var loggedInViewController: LoggedInViewControllable { get }
 }
 
 final class LoggedInComponent: Component<LoggedInDependency>, MainDependency {
 
-    // TODO: Make sure to convert the variable into lower-camelcase.
-    fileprivate var LoggedInViewController: LoggedInViewControllable {
-        return dependency.LoggedInViewController
-    }
-    var organizingSentenceRepository: OrganizingSentenceRepository {
-        return dependency.organizingSentenceRepository
+    fileprivate var loggedInViewController: LoggedInViewControllable {
+        return dependency.loggedInViewController
     }
 }
 

diff --git a/...Particle/Main/HomeTab/AddArticle/AddAriticleRepository/OrganizingSentenceRepository.swift b/...Particle/Main/HomeTab/AddArticle/AddAriticleRepository/OrganizingSentenceRepository.swift
@@ -14,9 +14,8 @@ public protocol OrganizingSentenceRepository {
 }
 
 public final class OrganizingSentenceRepositoryImp: OrganizingSentenceRepository {
-    public var sentenceFile: RxSwift.BehaviorSubject<[String]> {
-        sentenceSubject
-    }
+
+    public var sentenceFile: BehaviorSubject<[String]> = .init(value: [])
 
     private let sentenceSubject = BehaviorSubject<[String]>(value: [
         "그렇게 쓴 글은 매일 사회관계망서비스(SNS)에 남기기도 하고, 모아서 책으로 내기도 한다.",

diff --git a/Particle/Particle/Main/HomeTab/AddArticle/AddArticleBuilder.swift b/Particle/Particle/Main/HomeTab/AddArticle/AddArticleBuilder.swift
@@ -16,6 +16,7 @@ protocol AddArticleDependency: Dependency {
 
 final class AddArticleComponent: Component<AddArticleDependency> {
 
+    var repository = OrganizingSentenceRepositoryImp()
     // TODO: Make sure to convert the variable into lower-camelcase.
     fileprivate var addArticleViewController: ViewControllable {
         return dependency.addArticleViewController
@@ -63,6 +64,6 @@ extension AddArticleComponent: PhotoPickerDependency,
                                SetAdditionalInformationDependency {
 
     var organizingSentenceRepository: OrganizingSentenceRepository {
-        return OrganizingSentenceRepositoryImp() //FIXME: ??
+        return repository
     }
 }
diff --git a/Particle/Particle/Main/HomeTab/AddArticle/SelectSentence/SelectSentenceBuilder.swift b/Particle/Particle/Main/HomeTab/AddArticle/SelectSentence/SelectSentenceBuilder.swift
@@ -9,13 +9,13 @@ import RIBs
 import Photos
 
 protocol SelectSentenceDependency: Dependency {
-    // TODO: Declare the set of dependencies required by this RIB, but cannot be
-    // created by this RIB.
+    var organizingSentenceRepository: OrganizingSentenceRepository { get }
 }
 
 final class SelectSentenceComponent: Component<SelectSentenceDependency> {
-
-    // TODO: Declare 'fileprivate' dependencies that are only used by this RIB.
+    fileprivate var organizingSentenceRepository: OrganizingSentenceRepository {
+        return dependency.organizingSentenceRepository
+    }
 }
 
 // MARK: - Builder
@@ -33,7 +33,7 @@ final class SelectSentenceBuilder: Builder<SelectSentenceDependency>, SelectSent
     func build(withListener listener: SelectSentenceListener, images: [PHAsset]) -> SelectSentenceRouting {
         let component = SelectSentenceComponent(dependency: dependency)
         let viewController = SelectSentenceViewController(selectedImages: images)
-        let interactor = SelectSentenceInteractor(presenter: viewController)
+        let interactor = SelectSentenceInteractor(presenter: viewController, repository: component.organizingSentenceRepository)
         interactor.listener = listener
 
         let editSentenceBuilder = EditSentenceBuilder(dependency: component)
@@ -46,8 +46,4 @@ final class SelectSentenceBuilder: Builder<SelectSentenceDependency>, SelectSent
     }
 }
 
-extension SelectSentenceComponent: EditSentenceDependency, OrganizingSentenceDependency {
-    var organizingSentenceRepository: OrganizingSentenceRepository {
-        OrganizingSentenceRepositoryImp()
-    }
-}
+extension SelectSentenceComponent: EditSentenceDependency { }
diff --git a/Particle/Particle/Main/HomeTab/AddArticle/SelectSentence/SelectSentenceInteractor.swift b/Particle/Particle/Main/HomeTab/AddArticle/SelectSentence/SelectSentenceInteractor.swift
@@ -28,13 +28,16 @@ protocol SelectSentenceListener: AnyObject {
 final class SelectSentenceInteractor: PresentableInteractor<SelectSentencePresentable>,
                                       SelectSentenceInteractable,
                                       SelectSentencePresentableListener {
-
+    
     weak var router: SelectSentenceRouting?
     weak var listener: SelectSentenceListener?
 
+    private var organizingSentenceRepository: OrganizingSentenceRepository
+
     // TODO: Add additional dependencies to constructor. Do not perform any logic
     // in constructor.
-    override init(presenter: SelectSentencePresentable) {
+    init(presenter: SelectSentencePresentable, repository: OrganizingSentenceRepository) {
+        self.organizingSentenceRepository = repository
         super.init(presenter: presenter)
         presenter.listener = self
     }
@@ -56,9 +59,14 @@ final class SelectSentenceInteractor: PresentableInteractor<SelectSentencePresen
         router?.attachEditSentence(with: text)
     }
 
-    func dismissEditSentence() {
+    func dismissEditSentence(with text: String) {
+        guard var list = try? organizingSentenceRepository.sentenceFile.value() else {
+            Console.error("\(#function) value 를 가져올 수 없습니다.")
+            return
+        }
+        list.append(text)
+        organizingSentenceRepository.sentenceFile.onNext(list)
         router?.detachEditSentence()
-        listener?.pushToOrganizingSentence()
     }
 
     func backButtonTapped() {

diff --git a/Particle/Particle/Main/MainBuilder.swift b/Particle/Particle/Main/MainBuilder.swift
@@ -7,15 +7,9 @@
 
 import RIBs
 
-protocol MainDependency: Dependency {
-    var organizingSentenceRepository: OrganizingSentenceRepository { get }
-}
+protocol MainDependency: Dependency { }
 
-final class MainComponent: Component<MainDependency>, OrganizingSentenceDependency, SetAdditionalInformationDependency {
-    var organizingSentenceRepository: OrganizingSentenceRepository {
-        dependency.organizingSentenceRepository
-    }
-}
+final class MainComponent: Component<MainDependency> { }
 
 // MARK: - Builder
 

diff --git a/Particle/Particle/Root/RootComponent+LoggedIn.swift b/Particle/Particle/Root/RootComponent+LoggedIn.swift
@@ -13,11 +13,7 @@ protocol RootDependencyLoggedIn: Dependency {
 
 extension RootComponent: LoggedInDependency {
 
-    var LoggedInViewController: LoggedInViewControllable {
+    var loggedInViewController: LoggedInViewControllable {
         return rootViewController
     }
-
-    var organizingSentenceRepository: OrganizingSentenceRepository {
-        return OrganizingSentenceRepositoryImp()
-    }
 }