[Feature/domain v1] Domain 분리를 위한 작업

Projects/CodestackApp/Project.swift

@@ -27,7 +27,7 @@ let resources: ResourceFileElements
     "Resources/PLanguage/swift/*.txt",
     "Resources/PLanguage/typescript/*.txt",
     "Resources/Base.lproj/LaunchScreen.storyboard",
-    "Sources/Data/Repository/MO/db_model_v1.xcdatamodeld"
+    "Sources/Data/MO/db_model_v1.xcdatamodeld"
 ]
 
 

Projects/CodestackApp/Sources/Common/View/RichTextView.swift

@@ -39,7 +39,7 @@ class RichTextViewController: UIViewController{
     }
 
 
-    static func create(with html: [Problem]) -> RichTextViewController{
+    static func create(with html: [ProblemVO]) -> RichTextViewController {
         let vc = RichTextViewController()
         let problems = html
 

Projects/CodestackApp/Sources/DI/DataAssembly.swift

@@ -12,10 +12,13 @@ import Data
 public struct DataAssembly: Assembly {
 
     public func assemble(container: Container) {
-
         container.register(WebRepository.self) { resolver in
-            let tokenService = resolver.resolve(TokenAcquisitionService<RefreshToken>.self)!
-            return DefaultRepository(dependency: tokenService)
+            let graphAPI = resolver.resolve(GraphQLAPI.self)!
+            let restAPI = resolver.resolve(RestAPI.self)!
+            let token = resolver.resolve(TokenAcquisitionService<RefreshToken>.self)!
+            return DefaultRepository(dependency: .init(tokenAcquizition: token,
+                                                       graphAPI: graphAPI,
+                                                       restAPI: restAPI))
         }.inObjectScope(.container)
 
         container.register(DBRepository.self) { resolver in

Projects/CodestackApp/Sources/DI/NetworkAssembly.swift

@@ -29,6 +29,13 @@ public struct NetworkAssembly: Assembly {
                                            extractToken: API.extractAccessToken)
         }.inObjectScope(.container)
 
+
+        container.register(GraphQLAPI.self) { resolver in
+            let graphAPIDependency = DefaultGraphQLAPI.Dependency.init(baseURL: DefaultRepository.baseURL,
+                                                                       configuration: .default)
+            return DefaultGraphQLAPI(dependency: graphAPIDependency)
+        }
+
         container.register(AppleLoginManager.self) { resolver in
             let service = resolver.resolve(Auth.self)!
             return AppleLoginManager(serviceManager: service)

Projects/CodestackApp/Sources/Data/Interface/DBRepository.swift

@@ -10,11 +10,11 @@ import Foundation
 import RxSwift
 
 protocol DBRepository: AnyObject {
-    func fetch(_ requestType: SubmissionMO.RequestType) -> Single<[Submission]>
-    func store(submission: Submission) -> Single<Void>
+    func fetch(_ requestType: SubmissionMO.RequestType) -> Single<[SubmissionVO]>
+    func store(submission: SubmissionVO) -> Single<Void>
     func remove() -> Single<Void>
     func remove(_ requestType: SubmissionMO.RequestType) -> Completable
-    func update(submission: Submission, type request: SubmissionMO.RequestType) -> Single<Void>
+    func update(submission: SubmissionVO, type request: SubmissionMO.RequestType) -> Single<Void>
 
     func fetchProblemState() -> Single<[ProblemSubmissionState]>
     func fetchSubmissionCalendar() -> Single<[SubmissionCalendar]>

Projects/CodestackApp/Sources/Data/Interface/WebRepository.swift

@@ -11,7 +11,7 @@ import CodestackAPI
 import Apollo
 import Data
 
-protocol WebRepository: AnyObject {
+public protocol WebRepository: AnyObject {
 
     // MARK: GraphQL
 //    func getSolvedProblems(_ graph: GRAPH) -> Maybe<[ProblemIdentityFR]>
@@ -37,7 +37,7 @@ protocol WebRepository: AnyObject {
 }
 
 
-extension WebRepository {
+public extension WebRepository {
 
     private static var endpoint: String {
         return Bundle.main.infoDictionary!["graphql_endpoint"] as! String

Projects/CodestackApp/Sources/Data/MO/SubmissionCalendarMO+CoreDataProperties.swift

@@ -46,9 +46,9 @@ extension SubmissionCalendarMO : Identifiable {
         let _submissions =
         submissionSet
             .toArray(of: SubmissionMO.self)
-            .compactMap { Submission(managedContext: $0) }
+            .compactMap { value in value.toDomain() }
 
-        return SubmissionCalendarVO(dates: _submissions.compactMap(\.createdAt))
+        return SubmissionCalendarVO(dates: _submissions.map(\.createdAt))
     }
 }
 

Projects/CodestackApp/Sources/Data/MO/SubmissionMO+CoreDataProperties.swift

@@ -52,6 +52,17 @@ extension SubmissionMO : Identifiable {
 }
 
 extension SubmissionVO {
+    func updateMO(mo: SubmissionMO) -> SubmissionMO {
+        mo.codeContext?.code = self.sourceCode
+        mo.codeContext?.problemID = self.problem.id
+        mo.codeContext?.problemTitle = self.problem.title
+        mo.language?.languageID = self.language.id
+        mo.language?.name = self.language.name
+        mo.language?.extension = self.language.extension
+        mo.statusCode = self.statusCode
+        mo.createdAt = self.createdAt.toDateKST()
+        return mo
+    }
     func toMO(in context: NSManagedObjectContext) -> SubmissionMO? {
         guard
             let submissionMO = SubmissionMO.insertNew(in: context),

Projects/CodestackApp/Sources/Data/Persistence/FavoriteProblemMO-extension.swift

@@ -24,7 +24,7 @@ extension FavoritProblemMO {
         }
     }
 
-    static func isEqualID(probelmID: ID) -> NSFetchRequest<FavoritProblemMO> {
+    static func isEqualID(probelmID: ProblemID) -> NSFetchRequest<FavoritProblemMO> {
         let request = newFetchRequest()
         let predicate1 = NSPredicate(format: "problemID == %@", "\(probelmID)")
         request.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [ predicate1 ])

Projects/CodestackApp/Sources/Data/Persistence/Models-extension.swift

@@ -26,57 +26,6 @@ protocol MapperbleProtocol {
     static func fetchRequest() -> NSFetchRequest<PersistenceType>
 }
 
-extension CodeContext: MapperbleProtocol {
-    typealias PersistenceType = CodeContextMO
-
-    static func fetchRequest() -> NSFetchRequest<CodeContextMO> {
-        CodeContextMO.fetchRequest()
-    }
-
-    @discardableResult
-    func store(in context: NSManagedObjectContext) -> CodeContextMO? {
-        let codeContextMO = CodeContextMO.insertNew(in: context)
-        codeContextMO?.code = self.code
-        codeContextMO?.problemID = self.problemID
-        codeContextMO?.problemTitle = self.problemTitle
-        return codeContextMO
-    }
-
-    init?(managedContext: CodeContextMO) {
-        self.init(code: managedContext.code,
-                  problemID: managedContext.problemID,
-                  problemTitle: managedContext.problemTitle)
-    }
-}
-
-extension Language: MapperbleProtocol {
-    typealias PersistenceType = LanguageMO
-
-    static func fetchRequest() -> NSFetchRequest<PersistenceType> {
-        LanguageMO.fetchRequest()
-    }
-
-    @discardableResult
-    func store(in context: NSManagedObjectContext) -> LanguageMO? {
-        let languageMO = LanguageMO.insertNew(in: context)
-        languageMO?.languageID = self.id
-        languageMO?.extension = self._extension
-        languageMO?.name = self.name
-        return languageMO
-    }
-
-    init?(managedContext: LanguageMO) {
-        guard
-            let id = managedContext.languageID,
-            let name = managedContext.name,
-            let `extension` = managedContext.extension
-        else {
-            return nil
-        }
-        self.init(id: id, name: name, _extension: `extension`)
-    }
-}
-
 extension FavoriteProblem: MapperbleProtocol {
 
     func store(in context: NSManagedObjectContext) -> FavoritProblemMO? {
@@ -106,7 +55,7 @@ extension FavoriteProblem: MapperbleProtocol {
 }
 
 struct ProblemSubmissionState {
-    var submissions: [Submission]
+    var submissions: [SubmissionVO]
 }
 
 extension SubmissionCalendar: MapperbleProtocol {
@@ -119,9 +68,9 @@ extension SubmissionCalendar: MapperbleProtocol {
         let _submissions =
         submissionSet
             .toArray(of: SubmissionMO.self)
-            .compactMap { Submission(managedContext: $0) }
+            .compactMap { $0.toDomain() }
 
-        self.dates = _submissions.compactMap(\.createdAt)
+        self.dates = _submissions.map(\.createdAt)
     }
 
     func store(in context: NSManagedObjectContext) -> SubmissionCalendarMO? {
@@ -149,77 +98,17 @@ extension ProblemSubmissionState: MapperbleProtocol {
         let _submissions =
         submissionSet
             .toArray(of: SubmissionMO.self)
-            .compactMap { Submission(managedContext: $0) }
+            .compactMap { $0.toDomain() }
+            //.compactMap { Submission(managedContext: $0) }
 
         self.submissions = _submissions
     }
 
     func store(in context: NSManagedObjectContext) -> ProblemSubmissionStateMO? {
         guard let problemSubmissionMO = ProblemSubmissionStateMO.insertNew(in: context) else { return nil }
 
-        problemSubmissionMO.submissions = self.submissions.compactMap { $0.store(in: context) } as? NSSet
+        problemSubmissionMO.submissions = self.submissions.compactMap { $0.toMO(in:) } as? NSSet
 
         return problemSubmissionMO
     }
 }
-
-extension Submission: MapperbleProtocol {
-    typealias PersistenceType = SubmissionMO
-
-    static func fetchRequest() -> NSFetchRequest<PersistenceType> {
-        SubmissionMO.fetchRequest()
-    }
-
-    func store(in context: NSManagedObjectContext) -> SubmissionMO? {
-        guard
-            let submissionMO = SubmissionMO.insertNew(in: context),
-            let language = self.language,
-            let languageMO = language.store(in: context)
-        else {
-            return nil
-        }
-
-        let codeContext = CodeContext(code: self.sourceCode,
-                                      problemID: self.problem?.id,
-                                      problemTitle: self.problem?.title)
-        guard let codeContextMO = codeContext.store(in: context) else {
-            return nil }
-
-        submissionMO.createdAt = self.createdAt?.toDateKST()
-        submissionMO.id = self.id
-        submissionMO.statusCode = self.statusCode
-        submissionMO.codeContext = codeContextMO
-        submissionMO.language = languageMO
-
-        languageMO.submission = submissionMO
-        codeContextMO.submission = submissionMO
-
-        return submissionMO
-    }
-
-    init?(managedContext: SubmissionMO) {
-        guard 
-            let id = managedContext.id,
-            let statusCode = managedContext.statusCode,
-            let createdAt = managedContext.createdAt,
-            let codeContextMO = managedContext.codeContext,
-            let codeContext = CodeContext(managedContext: codeContextMO),
-            let problemID = codeContext.problemID,
-            let problemTitle = codeContext.problemTitle,
-            let languageMO = managedContext.language,
-            let language = Language(managedContext: languageMO)
-        else {
-            return nil
-        }
-
-        self.init(id: id,
-                  sourceCode: codeContext.code,
-                  problem: Problem(id: problemID, title: problemTitle),
-                  member: nil,
-                  language: language,
-                  cpuTime: nil,
-                  memoryUsage: nil,
-                  statusCode: statusCode,
-                  createdAt: createdAt.toString())
-    }
-}

Projects/CodestackApp/Sources/Data/Persistence/SubmissionMO-extension.swift

@@ -15,8 +15,8 @@ extension SubmissionMO {
     typealias LanguageName = String
     enum RequestType {
         case isExist(ProblemID)
-        case isNotTemp(ProblemID, String)
-        case isEqualStatusCode(String)
+        case isNotTemp(ProblemID, StatusCode)
+        case isEqualStatusCode(StatusCode)
         case update(SubmissionID, ProblemID)
         case recent(ProblemID)
         case `default`
@@ -53,43 +53,43 @@ extension SubmissionMO {
         }
     }
 
-    static func recent(probelm id: ID) -> NSFetchRequest<SubmissionMO> {
+    static func recent(probelm id: ProblemID) -> NSFetchRequest<SubmissionMO> {
         let request = newFetchRequest()
-        let predicate1 = NSPredicate(format: "codeContext.problemID == %@", "\(id)")
+        let predicate1 = NSPredicate(format: "codeContext.problemID == %@", "\(String(describing: id))")
         request.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate1])
         request.fetchLimit = 1
         request.sortDescriptors = [ NSSortDescriptor(key: "createdAt", ascending: false)]
         return request
     }
 
-    static func isEqualID(id: ID, _ probelmID: ID) -> NSFetchRequest<SubmissionMO> {
+    static func isEqualID(id: SubmissionID, _ probelmID: ProblemID) -> NSFetchRequest<SubmissionMO> {
         let request = newFetchRequest()
-        let predicate1 = NSPredicate(format: "id == %@", "\(id)")
-        let predicate2 = NSPredicate(format: "codeContext.problemID == %@", "\(probelmID)")
+        let predicate1 = NSPredicate(format: "id == %@", "\(String(describing: id))")
+        let predicate2 = NSPredicate(format: "codeContext.problemID == %@", "\(String(describing: probelmID))")
         request.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate1, predicate2])
         return request
     }
 
-    static func isEqualStatusCode(_ statusCode: String) -> NSFetchRequest<SubmissionMO> {
+    static func isEqualStatusCode(_ statusCode: StatusCode) -> NSFetchRequest<SubmissionMO> {
         let request = newFetchRequest()
         let predicate1 = NSPredicate(format: "statusCode == %@", "\(statusCode)")
         request.predicate = predicate1
         request.sortDescriptors = [NSSortDescriptor(key: "createdAt", ascending: false)]
         return request
     }
 
-    static func isNotTempSubmission(probelmID: ID, status: String) -> NSFetchRequest<SubmissionMO> {
+    static func isNotTempSubmission(probelmID: ProblemID, status: StatusCode) -> NSFetchRequest<SubmissionMO> {
         let request = newFetchRequest()
         let predicate1 = NSPredicate(format: "statusCode != %@", "\(status)")
-        let predicate2 = NSPredicate(format: "codeContext.problemID == %@", "\(probelmID)")
+        let predicate2 = NSPredicate(format: "codeContext.problemID == %@", "\(String(describing: probelmID))")
         request.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate1, predicate2])
         request.sortDescriptors = [NSSortDescriptor(key: "createdAt", ascending: true)]
         return request
     }
 
-    static func isExistSubmission(problemID: ID) -> NSFetchRequest<SubmissionMO> {
+    static func isExistSubmission(problemID: ProblemID) -> NSFetchRequest<SubmissionMO> {
         let request = newFetchRequest()
-        let predicate1 = NSPredicate(format: "codeContext.problemID == %@", "\(problemID)")
+        let predicate1 = NSPredicate(format: "codeContext.problemID == %@", "\(String(describing: problemID))")
         request.predicate = NSCompoundPredicate(andPredicateWithSubpredicates: [predicate1])
         request.sortDescriptors = [NSSortDescriptor(key: "createdAt", ascending: true)]
         // request.fetchLimit = 1
@@ -107,15 +107,15 @@ extension SubmissionMO {
         return request
     }
 
-    func update(submission: Submission) -> Self {
-        self.codeContext?.code = submission.sourceCode
-        self.codeContext?.problemID = submission.problem?.id
-        self.codeContext?.problemTitle = submission.problem?.title
-        self.language?.languageID = submission.language?.id
-        self.language?.name = submission.language?.name
-        self.language?.extension = submission.language?._extension
-        self.statusCode = submission.statusCode
-        self.createdAt = submission.createdAt?.toDateKST()
-        return self
-    }
+//    func update(submission: Submission) -> Self {
+//        self.codeContext?.code = submission.sourceCode
+//        self.codeContext?.problemID = submission.problem?.id
+//        self.codeContext?.problemTitle = submission.problem?.title
+//        self.language?.languageID = submission.language?.id
+//        self.language?.name = submission.language?.name
+//        self.language?.extension = submission.language?._extension
+//        self.statusCode = submission.statusCode
+//        self.createdAt = submission.createdAt?.toDateKST()
+//        return self
+//    }
 }