Merge pull request #24 from vespinola/23-add-mock-files

23 add mock files
vespinola · Jun 25, 2024 · 65005b3 · 65005b3
2 parents 3f709b9 + d325fb8
commit 65005b3
Show file tree

Hide file tree

Showing 41 changed files with 2,386 additions and 407 deletions.
diff --git a/mobile-courier-app.xcodeproj/project.pbxproj b/mobile-courier-app.xcodeproj/project.pbxproj
diff --git a/mobile-courier-app/App/AppDIContainer.swift b/mobile-courier-app/App/AppDIContainer.swift
@@ -16,7 +16,7 @@ final class AppDIContainer: DIContainerProtocol {
     register(AddressRespository(), for: AddressRepositoryProtocol.self)
     register(PackagesRepository(), for: PackagesRepositoryProtocol.self)
 
-    //Helpers
+    // Helpers
     register(UserDefaultsStorage(), for: Storage.self)
 
     // ViewModels
@@ -38,6 +38,10 @@ final class AppDIContainer: DIContainerProtocol {
       PackagesForWithdrawalViewModel(packagesRepository: resolve(PackagesRepositoryProtocol.self)),
       for: PackagesForWithdrawalViewModel.self
     )
+    register(
+      SettingsViewModel(authRepository: resolve(AuthRepositoryProtocol.self)),
+      for: SettingsViewModel.self
+    )
   }
 
   func register<T>(_ service: T, for type: T.Type) {

diff --git a/mobile-courier-app/App/MobileCourierApp.swift b/mobile-courier-app/App/MobileCourierApp.swift
@@ -9,7 +9,7 @@ import SwiftUI
 
 @main
 struct MobileCourierApp: App {
-  @AppStorage("isDarkMode") var isDarkMode: Bool = true
+  @AppStorage("isDarkMode") var isDarkMode: Bool = false
 
   @StateObject var coordinator = Coordinator(diContainer: AppDIContainer())
   @StateObject var appData = AppData.shared

diff --git a/mobile-courier-app/Data/ConcreteRepositories/AddressRespository.swift b/mobile-courier-app/Data/ConcreteRepositories/AddressRespository.swift
@@ -20,7 +20,7 @@ struct AddressRespository: AddressRepositoryProtocol {
       decoder: JSONDecoder()
     )
 
-    AppData.shared.setUsername(model.enviosAereos.cliente.clienteNombre)
+    AppData.shared.setUsername(model.airShipments.client.clientFirstName)
 
     return model.asEntity()
   }

diff --git a/mobile-courier-app/Data/ConcreteRepositories/AuthRepository.swift b/mobile-courier-app/Data/ConcreteRepositories/AuthRepository.swift
@@ -22,4 +22,8 @@ struct AuthRepository: AuthRepositoryProtocol {
 
     AppData.shared.updateToken(model.accessToken)
   }
+
+  func performLogout() {
+    AppData.shared.updateToken(nil)
+  }
 }
diff --git a/mobile-courier-app/Data/Networking/APIRequestClient.swift b/mobile-courier-app/Data/Networking/APIRequestClient.swift
@@ -26,16 +26,20 @@ final class APIRequestClient: NSObject, APIRequestClientProtocol {
   private lazy var delegate: URLSessionDelegate? = CustomSessionDelegate()
 
   func performRequest<T: Decodable>(endpoint: Endpoint, decoder: JSONDecoder = JSONDecoder()) async throws -> T {
+    #if DEBUG
+    if let mockfile = endpoint.mockFile, let fileUrl = Bundle.main.url(forResource: mockfile, withExtension: "json") {
+      decoder.keyDecodingStrategy = .convertFromSnakeCase
+      let decodedData = try decoder.decode(T.self, from: Data(contentsOf: fileUrl))
+      try? await Task.sleep(nanoseconds: 2 * 1_000_000_000)
+      return decodedData
+    }
+    #endif
+
     guard let urlRequest = try? endpoint.asRequest() else {
       throw APIErrorMessage.invalidRequest
     }
 
     do {
-//
-//      #if DEBUG
-//      endpoint.mockFile =
-//      #endif
-
       let configuration = URLSessionConfiguration.default
       configuration.timeoutIntervalForRequest = 10
       configuration.timeoutIntervalForResource = 10

diff --git a/mobile-courier-app/Data/Networking/CustomSessionDelegate.swift b/mobile-courier-app/Data/Networking/CustomSessionDelegate.swift
@@ -8,30 +8,6 @@
 import Foundation
 
 final class CustomSessionDelegate: NSObject, URLSessionDataDelegate {
-  func urlSession(_ session: URLSession, dataTask: URLSessionDataTask, didReceive data: Data) {
-    do {
-      let jsonObject = try JSONSerialization.jsonObject(with: data, options: [])
-      let jsonData = try JSONSerialization.data(withJSONObject: jsonObject, options: [.prettyPrinted])
-
-      if let jsonString = String(data: jsonData, encoding: .utf8) {
-        let urlString = dataTask.currentRequest?.url?.absoluteString ?? "Unknown URL"
-        print("Data received from '\(urlString)' ➡️ \n\(jsonString)")
-      }
-    } catch {
-      print("Failed to parse JSON: \(error.localizedDescription)")
-    }
-  }
-
-  func urlSession(_ session: URLSession, task: URLSessionTask, didCompleteWithError error: Error?) {
-    if let error = error {
-      print("Error: \(error.localizedDescription)")
-    } else {
-      print("Request completed successfully.")
-    }
-  }
-}
-
-extension CustomSessionDelegate {
   func urlSession(_ session: URLSession, didReceive challenge: URLAuthenticationChallenge, completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
     guard challenge.protectionSpace.authenticationMethod == NSURLAuthenticationMethodServerTrust,
           let serverTrust = challenge.protectionSpace.serverTrust else {

diff --git a/mobile-courier-app/Data/Networking/Endpoints/AddressEndpoints.swift b/mobile-courier-app/Data/Networking/Endpoints/AddressEndpoints.swift
@@ -13,15 +13,15 @@ enum AddressEndpoints {
 
 extension AddressEndpoints: Endpoint {
   var mockFile: String? {
-    ""
+    "Address"
   }
 
   var requestType: RequestType {
     .get
   }
 
   var path: String {
-    "/frontliner-middleware/api/direccion"
+    "/direccion"
   }
 
   var body: [AnyHashable: Any]? {

diff --git a/mobile-courier-app/Data/Networking/Endpoints/AuthEndpoints.swift b/mobile-courier-app/Data/Networking/Endpoints/AuthEndpoints.swift
@@ -14,15 +14,13 @@ enum AuthEndpoints {
 
 extension AuthEndpoints: Endpoint {
 
-  #if DEBUG
   var mockFile: String? {
-    "login-response"
+    "Login"
   }
-  #endif
 
   var requestType: RequestType {
     switch self {
-    case .login(email: _, password: _):
+    case .login:
       return .post
     default:
       return .get
@@ -31,8 +29,8 @@ extension AuthEndpoints: Endpoint {
 
   var path: String {
     switch self {
-    case .login(email: _, password: _):
-      return "/frontliner-middleware/api/ingresar"
+    case .login:
+      return "/ingresar"
     default:
       return ""
     }

diff --git a/mobile-courier-app/Data/Networking/Endpoints/Endpoint.swift b/mobile-courier-app/Data/Networking/Endpoints/Endpoint.swift
@@ -23,14 +23,12 @@ protocol Endpoint {
   var authToken: String? { get }
   var port: Int { get }
 
-  #if DEBUG
   var mockFile: String? { get }
-  #endif
 }
 
 extension Endpoint {
   var scheme: String { "https" }
-  var host: String { "frontliner.com.py" }
+  var host: String { "justacourier.com.py" }
   var port: Int { 8449 }
   var headers: [String: String] {
     var internalHeaders = [

diff --git a/mobile-courier-app/Data/Networking/Endpoints/PackageEndpoints.swift b/mobile-courier-app/Data/Networking/Endpoints/PackageEndpoints.swift
@@ -14,7 +14,12 @@ enum PackageEndpoints {
 
 extension PackageEndpoints: Endpoint {
   var mockFile: String? {
-    ""
+    switch self {
+    case .withdrawn:
+      "WithdrawnPackages"
+    case .forWithdrawl:
+      "PackagesForWithdrawl"
+    }
   }
 
   var requestType: RequestType {
@@ -24,9 +29,9 @@ extension PackageEndpoints: Endpoint {
   var path: String {
     switch self {
     case .withdrawn:
-      "/frontliner-middleware/api/paquetesRetirados"
+      "/paquetesRetirados"
     case .forWithdrawl:
-      "/frontliner-middleware/api/paquetesPendientes"
+      "/paquetesPendientes"
     }
   }
 

diff --git a/mobile-courier-app/Data/Networking/MockFiles/Address.json b/mobile-courier-app/Data/Networking/MockFiles/Address.json
@@ -0,0 +1,68 @@
+{
+  "enviosAereos": {
+    "ciudad": "New York, NY 10001",
+    "cliente": {
+      "class": "com.example.Clientes",
+      "id": 12345,
+      "apellidoautorizado": "SMITH",
+      "autorizaemail": 1,
+      "ciautorizado": "1234567",
+      "ciudad": 1,
+      "clienteapellido": "DOE",
+      "clientecelular": "1234567890",
+      "clienteci": "12345678",
+      "clientedireccion": "123 Main St",
+      "clientenombre": "JOHN",
+      "clienteobservacion": "",
+      "clientetelefono": "0987654321",
+      "dianac": 1,
+      "estado": 1,
+      "estante": "A1",
+      "mesnac": 1,
+      "nombreautorizado": "JANE",
+      "pagoAnualidad": null,
+      "password": "passwordhash",
+      "ruc": "9876543",
+      "tarifa": 25.0,
+      "username": "[email protected]"
+    },
+    "direccion": "789 Broadway",
+    "empresa": "EXAMPLE USA",
+    "pais": "United States",
+    "telefono": "(555) 123-4567",
+    "viaMaritima": false
+  },
+  "viaMaritima": {
+    "ciudad": "Los Angeles, CA 90001",
+    "cliente": {
+      "class": "com.example.Clientes",
+      "id": 12345,
+      "apellidoautorizado": "SMITH",
+      "autorizaemail": 1,
+      "ciautorizado": "1234567",
+      "ciudad": 1,
+      "clienteapellido": "DOE",
+      "clientecelular": "1234567890",
+      "clienteci": "12345678",
+      "clientedireccion": "123 Main St",
+      "clientenombre": "JOHN",
+      "clienteobservacion": "",
+      "clientetelefono": "0987654321",
+      "dianac": 1,
+      "estado": 1,
+      "estante": "A1",
+      "mesnac": 1,
+      "nombreautorizado": "JANE",
+      "pagoAnualidad": null,
+      "password": "passwordhash",
+      "ruc": "9876543",
+      "tarifa": 25.0,
+      "username": "[email protected]"
+    },
+    "direccion": "123 Ocean Blvd",
+    "empresa": "EXAMPLE USA",
+    "pais": "United States",
+    "telefono": "(555) 987-6543",
+    "viaMaritima": true
+  }
+}
diff --git a/mobile-courier-app/Data/Networking/MockFiles/Login.json b/mobile-courier-app/Data/Networking/MockFiles/Login.json
@@ -0,0 +1,4 @@
+{
+  "access_token": "eyJhbGciOiJIUzI1NiJ9.eyJwcmluY2lwYWwiOiJINHNJQUFBQUFBQUFBSlZTejJzVFFSUitpU2tWaXRnV0ZFUXFIdXBOTmpZaE5DR1gybEtsc0NSaXpLV0NaYkw3c2s0N083UE96S2FiaThTTFBYZ1ExSUxneFlNbjZYXC9peVQ5QUVPODk5K3FidE0ybVhvckx3aTV2dnYxK3ZUMDZoaG1qb1JwcHhvWHhFcEZHWEhvbTBWeEdCb05VY3p2MFVvTTZSRHRHUEI0RHV6U0IwNnRRaElJUFJSNWFXUFIzMllDVkJaTlJ1ZDNieGNBMk13MFZwYU16eHI1bU1lNHJ2ZWROdUFPbDhZSkFUbDFZSzhMc05peXdJRkNwdEMwbE43T0Vhd3kzWVQ2ZitTclljNk1iQVoyZ3RKd0pNdzJkUmAsNkFrTWY1bGhxWHlwUzVXZ3NYRDgxbTFvdXloMjBUUit1SnN3WWN2ZFBrbzUxMXQyNXN5a3B3U3Q0RGFVc0tkQkYzZDF6VU1cL3hlQnRLQ0VyTmxUVExYUm1ya1BlNUV5ZiswZEtIbisrXC9qTHBGQU9ya1wvdVhmNVBOYjZ6RDY4ZUxrenJqb1FtRGg1cFQxSE5iTUVuS3prRE1cLzAraVVmMzErOHZIdytPRDVGVkoyaUVmXC92NFwvbGgyZk5EVGRVbkRETnJKcmFFZEh1bDl3N2thOWZUbjYraGFIWDRYRWlrUDRvYVRHY1NPVEVGTGVrbFRqdjI4SzFwMjFcL2M2ZlYzbkhQVG1iaGJyOGZybFRweGxWV2J6UjZyRjZyWTZOU3FmYnJxMkd0aGc4czNCNElGdktZYXc5TndxVVNiQzJLS1JtWmlTZDl1VVY3VzJRalFyMzQ1K3Uza3pjSGRkTGZncGtCRXluU3h1WnpYQ3VOZTZqZkhoMHV6WDM2XC9XNmNIOERcL1wvaGNLbEMyeFN3TUFBQT09Iiwic3ViIjoidmxhZGltaXIuZXNwaW5vbGFAZ21haWwuY29tIiwiZXhwIjoxNzI1MzM4ODE5LCJpYXQiOjE3MTkyOTA4MTksInJvbGVzIjpbIlJPTEVfTk9fUk9MRVMiXX0.Us_2_7asxxzrPv6D6LqKwVctdgD397XpyB4rfHC0pEK",
+  "username": "[email protected]"
+}
diff --git a/mobile-courier-app/Data/Networking/MockFiles/PackagesForWithdrawl.json b/mobile-courier-app/Data/Networking/MockFiles/PackagesForWithdrawl.json
@@ -0,0 +1,32 @@
+{
+  "paquetes": [
+    {
+      "paquetedescripcion": "TOY",
+      "paquetetracking": "CNUSUP00000773583",
+      "estado": "B",
+      "cotizacion": 7585.0,
+      "embarqueestado": "ASUNCION",
+      "embarquefecha": "2024-06-11T04:00:00Z",
+      "paquetepeso": 0.2,
+      "embarquemedio": "Aereo",
+      "embarquecodigo": 2179,
+      "id": 1606577,
+      "tarifapreciocli": 22.5,
+      "paqueteprecio": 22.5
+    },
+    {
+      "paquetedescripcion": "ACC",
+      "paquetetracking": "420331869361289677032421065418",
+      "estado": "A",
+      "cotizacion": 7585.0,
+      "embarqueestado": "TRANSITO",
+      "embarquefecha": "2024-06-18T04:00:00Z",
+      "paquetepeso": 0.12,
+      "embarquemedio": "Aereo",
+      "embarquecodigo": 2182,
+      "id": 1610658,
+      "tarifapreciocli": 22.5,
+      "paqueteprecio": 22.5
+    }
+  ]
+}