IOS-0952 :: Feature Internal :: Implement generic network datasource

Author: kerimsari

.gitignore

@@ -52,6 +52,7 @@ Pods/
 # Add this line if you want to avoid checking in source code from Carthage dependencies.
 Carthage/Checkouts
 Carthage/Build
+Package.resolved
 
 # fastlane
 #

Cartfile.private

@@ -1,2 +1 @@
 github "Quick/Nimble" "v10.0.0"
-

Example/Harmony.xcodeproj/project.pbxproj

@@ -75,6 +75,7 @@
 		607FACEA1AFB9204008FA782 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		677082F15065F4C17D69219F /* Pods-Harmony_Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Harmony_Example.release.xcconfig"; path = "Target Support Files/Pods-Harmony_Example/Pods-Harmony_Example.release.xcconfig"; sourceTree = "<group>"; };
 		79EF043A5EBB6F5787C9BD65 /* Pods-Harmony_Tests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Harmony_Tests.release.xcconfig"; path = "Target Support Files/Pods-Harmony_Tests/Pods-Harmony_Tests.release.xcconfig"; sourceTree = "<group>"; };
+		AEF8517528D8495A00C77B0B /* Alamofire.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = Alamofire.xcframework; path = ../Carthage/Build/Alamofire.xcframework; sourceTree = "<group>"; };
 		D22A0B9E2035C91F0026068F /* Harmony_Example-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Harmony_Example-Bridging-Header.h"; sourceTree = "<group>"; };
 		D22A0BA52035CD580026068F /* TestHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestHelper.swift; sourceTree = "<group>"; };
 		D23CDCAF2253716B001C1914 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -214,6 +215,7 @@
 		8FEB14D5F816FBF6F03E5F42 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				AEF8517528D8495A00C77B0B /* Alamofire.xcframework */,
 				319D67FB913C0BB868D4BBAE /* Pods_Harmony_Example.framework */,
 				35E50C73A54D07B7A6EC055D /* Pods_Harmony_Tests.framework */,
 			);

Example/Harmony/Core/ApplicationProvider.swift

@@ -21,11 +21,8 @@ class ApplicationDefaultModule: ApplicationComponent {
     private lazy var logger: Logger = DeviceConsoleLogger()
     private lazy var backgroundExecutor: Executor = DispatchQueueExecutor()
 
-    private lazy var apiClient: Session = {
-        // Alamofire Session Manager
-        let sessionManager = Session(interceptor: BaseURLRequestAdapter(URL(string:"https://demo3068405.mockable.io")!,
-                                                                        [UnauthorizedStatusCodeRequestRetrier()]))
-        return sessionManager
+    private lazy var apiClient: URLSession = {
+        URLSession.shared
     }()
 
     private lazy var storage: AnyDataSource<Data> = {

Example/Harmony/Core/Features/Item/Data/ItemQuery.swift

@@ -9,13 +9,23 @@
 import Foundation
 import Harmony
 
-struct SearchItemsQuery: Query {
+class SearchItemsQuery: NetworkQuery {
+    
     let text : String
+    
     init(_ text: String) {
         self.text = text
+        super.init(method: .get, path: "items", params: ["name":text])
     }
 }
 
-struct AllItemsQuery: KeyQuery {
-    let key: String = "all-items"
+class AllItemsQuery: NetworkQuery {
+    
+    init() {
+        super.init(method: .get, path: "items", key: "all-items")
+    }
 }
+
+
+
+

Example/Harmony/Core/Features/Item/ItemProvider.swift

@@ -7,26 +7,27 @@
 //
 
 import Harmony
-import Alamofire
 
 protocol ItemComponent {
     func itemListPresenter(view: ItemListPresenterView) -> ItemListPresenter
 }
 
 class ItemDefaultModule: ItemComponent {
     private let executor: Executor
-    private let apiClient: Session
     private let storage: AnyDataSource<Data>
+    private let apiClient: URLSession
 
-    init(executor: Executor, apiClient: Session, storage: AnyDataSource<Data>) {
+    init(executor: Executor, apiClient: URLSession, storage: AnyDataSource<Data>) {
         self.executor = executor
-        self.apiClient = apiClient
         self.storage = storage
+        self.apiClient = apiClient
     }
 
     private lazy var networkDataSource: AnyDataSource<ItemEntity> = {
-        let baseDataSource = ItemNetworkDataSource(self.apiClient)
-        
+        let baseDataSource = GetNetworkDataSource<ItemEntity>(url: URL(string:"https://demo3068405.mockable.io/")!,
+                                                              session: apiClient,
+                                                              decoder: JSONDecoder())
+
         // To debug the UI upon random API behavior, adding this intermediate layer
         let itemNetworkDataSource = DebugDataSource(DataSourceAssembler(get: baseDataSource),
                                                     delay: .sync(0.5),

Example/Podfile.lock

@@ -38,4 +38,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: b7ed6de1edd55522f5ced841111c3aa6c7beeab7
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3

Harmony.podspec

@@ -33,6 +33,6 @@ Pod::Spec.new do |s|
     s.ios.deployment_target = '12.0'
 
     s.source_files = 'Sources/Harmony/**/*'
-    s.frameworks = 'Security'
+    s.frameworks = 'Security'    
 
 end