ronanociosoig · ronanociosoig · Jan 6, 2022 · Nov 29, 2021 · Dec 31, 2021 · Dec 31, 2021
diff --git a/.package.resolved b/.package.resolved
@@ -1,15 +1,6 @@
 {
   "object": {
     "pins": [
-      {
-        "package": "Alamofire",
-        "repositoryURL": "https://github.com/Alamofire/Alamofire.git",
-        "state": {
-          "branch": null,
-          "revision": "f96b619bcb2383b43d898402283924b80e2c4bae",
-          "version": "5.4.3"
-        }
-      },
       {
         "package": "JGProgressHUD",
         "repositoryURL": "https://github.com/JonasGessner/JGProgressHUD",
@@ -18,42 +9,6 @@
           "revision": "78d7cd35f1d90ff74fd82e486f2cbe4b24be8cf9",
           "version": "2.2.0"
         }
-      },
-      {
-        "package": "Moya",
-        "repositoryURL": "https://github.com/Moya/Moya.git",
-        "state": {
-          "branch": null,
-          "revision": "b3e5a233e0d85fd4d69f561c80988590859c7dee",
-          "version": "14.0.0"
-        }
-      },
-      {
-        "package": "ReactiveSwift",
-        "repositoryURL": "https://github.com/Moya/ReactiveSwift.git",
-        "state": {
-          "branch": null,
-          "revision": "f195d82bb30e412e70446e2b4a77e1b514099e88",
-          "version": "6.1.0"
-        }
-      },
-      {
-        "package": "Result",
-        "repositoryURL": "https://github.com/antitypical/Result.git",
-        "state": {
-          "branch": null,
-          "revision": "12920a5c2595926efab9274d6003e29f503dbb66",
-          "version": "5.0.0"
-        }
-      },
-      {
-        "package": "RxSwift",
-        "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
-        "state": {
-          "branch": null,
-          "revision": "254617dd7fae0c45319ba5fbea435bf4d0e15b5d",
-          "version": "5.1.2"
-        }
       }
     ]
   },

diff --git a/.tuist-version b/.tuist-version
@@ -0,0 +1 @@
+1.52.0
diff --git a/AppTargets.drawio.png b/AppTargets.drawio.png
diff --git a/Features/Catch/Example/Sources/DataProviderExtension.swift b/Features/Catch/Example/Sources/DataProviderExtension.swift
@@ -18,39 +18,33 @@ public protocol DataSearchProviding {
 extension DataProvider: DataSearchProviding {
     public func search(identifier: Int, networkService: SearchService) {
         appData.pokemon = nil
+        let queue = DispatchQueue.main
 
-        networkService.search(identifier: identifier) { (data, errorMessage) in
-            let queue = DispatchQueue.main
-
-            if let errorMessage = errorMessage {
-                if errorMessage == Constants.Translations.Error.statusCode404 {
+        searchCancellable = networkService.search(identifier: identifier)
+            .receive(on: queue)
+            .sink(receiveCompletion: { completion in
+                switch completion {
+                case .failure(let error):
+                    let errorMessage = "\(error.localizedDescription)"
+                    os_log("Error: %s", log: Log.data, type: .error, errorMessage)
                     self.notifier?.dataReceived(errorMessage: errorMessage, on: queue)
-                    return
+                case .finished:
+                    print("All good")
                 }
 
-                os_log("Error message: %s", log: Log.network, type: .error, errorMessage)
-                self.notifier?.dataReceived(errorMessage: errorMessage, on: queue)
-                return
-            }
-
-            guard let data = data else {
-                os_log("Error message: %s", log: Log.network, type: .error, Constants.Translations.Error.noDataError)
-                self.notifier?.dataReceived(errorMessage: Constants.Translations.Error.noDataError, on: queue)
-                return
-            }
-
-            do {
-                let decoder = JSONDecoder()
-                decoder.keyDecodingStrategy = .convertFromSnakeCase
-                let pokemon = try decoder.decode(Pokemon.self, from: data)
-                self.appData.pokemon = pokemon
-                self.notifier?.dataReceived(errorMessage: nil, on: queue)
-                os_log("Success: %s", log: Log.network, type: .default, "Loaded")
-            } catch {
-                let errorMessage = "\(error)"
-                os_log("Error: %s", log: Log.data, type: .error, errorMessage)
-                self.notifier?.dataReceived(errorMessage: errorMessage, on: queue)
-            }
-        }
+            }, receiveValue: { data in
+                do {
+                    let decoder = JSONDecoder()
+                    decoder.keyDecodingStrategy = .convertFromSnakeCase
+                    let pokemon = try decoder.decode(Pokemon.self, from: data)
+                    self.appData.pokemon = pokemon
+                    self.notifier?.dataReceived(errorMessage: nil, on: queue)
+                    os_log("Success: %s", log: Log.network, type: .default, "Loaded")
+                } catch {
+                    let errorMessage = "\(error.localizedDescription)"
+                    os_log("Error: %s", log: Log.data, type: .error, errorMessage)
+                    self.notifier?.dataReceived(errorMessage: errorMessage, on: queue)
+                }
+            })
     }
 }
diff --git a/Features/Catch/Example/Sources/Scenes/Home Scene/HomeActions.swift b/Features/Catch/Example/Sources/Scenes/Home Scene/HomeActions.swift
@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import PokedexCommon
+import Common
 
 protocol HomeActions {
     func catchButtonAction()

diff --git a/Features/Catch/Example/Sources/Scenes/Home Scene/HomeDataProvider.swift b/Features/Catch/Example/Sources/Scenes/Home Scene/HomeDataProvider.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2021 Sonomos.com. All rights reserved.
 //
 
-import PokedexCommon
+import Common
 
 protocol HomeDataProvider {
 

diff --git a/Features/Catch/Example/Tests/AppTests.swift b/Features/Catch/Example/Tests/AppTests.swift
@@ -5,4 +5,4 @@ final class CatchTests: XCTestCase {
     func test_twoPlusTwo_isFour() {
         XCTAssertEqual(2+2, 4)
     }
-}
+}
diff --git a/Features/Catch/Tests/CatchUITests.swift b/Features/Catch/Tests/CatchUITests.swift
@@ -5,4 +5,4 @@ final class CatchUITests: XCTestCase {
     func test_example() {
         XCTAssertEqual("CatchUI", "CatchUI")
     }
-}
+}
diff --git a/Features/Common/Sources/Core/Actions.swift b/Features/Common/Sources/Core/Actions.swift
@@ -1,6 +1,6 @@
 //
 //  Actions.swift
-//  PokedexCommon
+//  Common
 //
 //  Created by Ronan on 09/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Core/AppData.swift b/Features/Common/Sources/Core/AppData.swift
@@ -1,6 +1,6 @@
 //
 //  AppData.swift
-//  PokedexCommon
+//  Common
 //
 //  Created by Ronan on 09/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Core/Configuration.swift b/Features/Common/Sources/Core/Configuration.swift
@@ -1,6 +1,6 @@
 //
 //  Configuration.swift
-//  PokedexCommon
+//  Common
 //
 //  Created by Ronan on 09/02/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.
@@ -11,28 +11,21 @@ import UIKit
 public struct Configuration {
 
     public static var uiTesting: Bool {
-
-        // We can use CommandLine.arguments for this as well.
         let arguments = ProcessInfo.processInfo.arguments
-        let result = arguments.contains("UITesting")
-
-        if result == true {
-            // Speed up the animations in the app when running UI testing.
-
-            if let first = UIApplication.shared.windows.first {
-                first.layer.speed = 100
-            }
-        }
-
-        return result
+        return arguments.contains("UITesting")
     }
 
     public static var networkTesting: Bool {
         let arguments = CommandLine.arguments
         return arguments.contains("NetworkTesting")
     }
 
-    public static var authenticationErrorTesting: Bool {
+    public static var searchErrorTesting: Bool {
         return CommandLine.arguments.contains("Error_401")
     }
+
+    public static var asyncTesting: Bool {
+        let arguments = ProcessInfo.processInfo.arguments
+        return arguments.contains("AsyncTesting")
+    }
 }
diff --git a/Features/Common/Sources/Core/Constants.swift b/Features/Common/Sources/Core/Constants.swift
@@ -1,6 +1,6 @@
 //
 //  Constants.swift
-//  PokedexCommon
+//  Common
 //
 //  Created by Ronan on 09/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.
@@ -59,6 +59,8 @@ public struct Constants {
             public static let noDataError = "Error: No data received."
             public static let noResultsFound = "No results were found for your search."
             public static let statusCode404 = "404"
+            public static let notFound = "Error 401 Pokemon not found"
+            public static let asyncError = "Async Search failed"
         }
     }
 

diff --git a/Features/Common/Sources/Core/Coordinating.swift b/Features/Common/Sources/Core/Coordinating.swift
@@ -1,6 +1,6 @@
 //
 //  Coordinating.swift
-//  PokedexCommon
+//  Common
 //
 //  Created by Ronan O Ciosig on 19/5/21.
 //  Copyright © 2021 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Core/DataProvider.swift b/Features/Common/Sources/Core/DataProvider.swift
@@ -1,19 +1,21 @@
 //
 //  DataProvider.swift
-//  PokedexCommon
+//  Common
 //
 //  Created by Ronan on 09/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.
 //
 
 import Foundation
 import os.log
+import Combine
 
 public class DataProvider: DataProviding {
     public let appData = AppData(storage: FileStorage())
     public var notifier: Notifier?
+    public var searchCancellable: AnyCancellable?
 
-    public init(){
+    public init() {
 
     }
 

diff --git a/Features/Common/Sources/Core/DataProviding.swift b/Features/Common/Sources/Core/DataProviding.swift
@@ -1,6 +1,6 @@
 //
 //  DataProviding.swift
-//  PokedexCommon
+//  Common
 //
 //  Created by Ronan O Ciosig on 5/6/21.
 //  Copyright © 2021 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Core/Notifier.swift b/Features/Common/Sources/Core/Notifier.swift
@@ -1,6 +1,6 @@
 //
 //  Notifier.swift
-//  PokedexCommon
+//  Common
 //
 //  Created by Ronan on 09/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Core/Updatable.swift b/Features/Common/Sources/Core/Updatable.swift
@@ -1,6 +1,6 @@
 //
 //  Updatable.swift
-//  PokedexCommon
+//  Common
 //
 //  Created by Ronan on 09/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Extensions/Loadable.swift b/Features/Common/Sources/Extensions/Loadable.swift
@@ -1,6 +1,6 @@
 //
 //  Loadable.swift
-//  Pokedex
+//  Common
 //
 //  Created by Ronan on 26/11/2018.
 //  Copyright © 2018 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Extensions/UIBarButtonItem+Extension.swift b/Features/Common/Sources/Extensions/UIBarButtonItem+Extension.swift
@@ -1,6 +1,6 @@
 //
 //  UIBarButtonItem+Extension.swift
-//  Pokedex
+//  Common
 //
 //  Created by Ronan on 09/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Extensions/UITableViewCell+Extension.swift b/Features/Common/Sources/Extensions/UITableViewCell+Extension.swift
@@ -1,6 +1,6 @@
 //
 //  UITableViewCell+Extension.swift
-//  Pokedex
+//  Common
 //
 //  Created by Ronan on 26/11/2018.
 //  Copyright © 2018 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Model/Generator.swift b/Features/Common/Sources/Model/Generator.swift
@@ -1,6 +1,6 @@
 //
 //  Generator.swift
-//  Pokedex
+//  Common
 //
 //  Created by Ronan on 10/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Model/LocalPokemon.swift b/Features/Common/Sources/Model/LocalPokemon.swift
@@ -1,6 +1,6 @@
 //
 //  Pokemon.swift
-//  Pokedex
+//  Common
 //
 //  Created by Ronan on 09/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Model/Pokemon.swift b/Features/Common/Sources/Model/Pokemon.swift
@@ -1,6 +1,6 @@
 //
 //  Pokemon.swift
-//  Pokedex
+//  Common
 //
 //  Created by Ronan on 09/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Model/PokemonParser.swift b/Features/Common/Sources/Model/PokemonParser.swift
@@ -1,6 +1,6 @@
 //
 //  PokemonParser.swift
-//  Pokedex
+//  Common
 //
 //  Created by Ronan on 10/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Model/ScreenPokemon.swift b/Features/Common/Sources/Model/ScreenPokemon.swift
@@ -1,6 +1,6 @@
 //
 //  ScreenPokemon.swift
-//  Pokedex
+//  Common
 //
 //  Created by Ronan on 09/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Util/FileStorage.swift b/Features/Common/Sources/Util/FileStorage.swift
@@ -1,6 +1,6 @@
 //
 //  FileStorage.swift
-//  Pokedex
+//  Common
 //
 //  Created by Ronan on 23/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Util/Storage.swift b/Features/Common/Sources/Util/Storage.swift
@@ -1,6 +1,6 @@
 //
 //  Storage.swift
-//  Pokedex
+//  Common
 //
 //  Created by Ronan on 10/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.

diff --git a/Features/Common/Sources/Views/PokemonView.swift b/Features/Common/Sources/Views/PokemonView.swift
@@ -1,6 +1,6 @@
 //
 //  PokemonView.swift
-//  Pokedex
+//  Common
 //
 //  Created by Ronan on 09/05/2019.
 //  Copyright © 2019 Sonomos. All rights reserved.