feat: improve NetworkService equally with MangaKu

Author: uwaisalqadri

Modules/Common/Common/Sources/Common/Data/API/APIFactory.swift

@@ -8,19 +8,40 @@
 import Foundation
 
 public protocol APIFactory {
-  var path: String { get }
-  var parameter: [String: Any] { get }
-  var baseURL: String { get }
-  
-  var composedURL: URL { get }
+    var path: String { get }
+    var parameters: [String: Any] { get }
+    var baseURL: String { get }
+    var method: HTTPMethod { get }
+    var headers: [String: String] { get }
+    var bodyData: Data? { get }
+    
+    var composedURL: URL { get }
 }
 
 public extension APIFactory {
-  var composedURL: URL {
-    let params = parameter.map({ "\($0.key)=\($0.value)" }).joined(separator: "&")
-    let urlString = baseURL.appending(path)
-      .appending("?")
-      .appending(params)
-    return URL(string: urlString) ?? URL.init(fileURLWithPath: "")
-  }
+    var composedURL: URL {
+        let params = parameters.map({ "\($0.key)=\($0.value)" }).joined(separator: "&")
+        let urlString = baseURL.appending(path)
+            .appending("?")
+            .appending(params)
+        return URL(string: urlString) ?? URL.init(fileURLWithPath: "")
+    }
+}
+
+public enum HTTPMethod {
+    case get
+    case post(body: Data? = nil)
+    case put
+    case delete
+    case patch
+    
+    var value: String {
+        switch self {
+        case .get: return "GET"
+        case .post: return "POST"
+        case .put: return "PUT"
+        case .delete: return "DELETE"
+        case .patch: return "PATCH"
+        }
+    }
 }

Modules/Common/Common/Sources/Common/Data/API/GiphyAPI.swift

@@ -29,7 +29,7 @@ extension GiphyAPI: APIFactory {
     }
   }
 
-  public var parameter: [String: Any] {
+  public var parameters: [String: Any] {
     var defaultParams: [String: Any] = ["api_key": APIConfig.giphyConfig.apiKey]
     switch self {
     case .search(let query) where query.count > 0:
@@ -39,4 +39,16 @@ extension GiphyAPI: APIFactory {
     }
     return defaultParams
   }
+  
+  public var method: HTTPMethod {
+     return .get // assuming all are GET requests
+   }
+
+   public var headers: [String: String] {
+     [:] // or provide default headers if needed
+   }
+
+   public var bodyData: Data? {
+     nil // not used in GET requests
+   }
 }

Modules/Common/Common/Sources/Common/Data/API/NetworkService.swift

@@ -1,6 +1,6 @@
 //
 //  NetworkService.swift
-//  
+//
 //
 //  Created by Uwais Alqadri on 10/17/21.
 //
@@ -11,18 +11,28 @@ import Alamofire
 
 public class NetworkService {
   public static let shared = NetworkService()
-
+  
   public func connect<T: Codable>(api: APIFactory, responseType: T.Type) async throws -> T {
     return try await withCheckedThrowingContinuation { continuation in
-      AF.request(api.composedURL)
+      var urlRequest = URLRequest(url: api.composedURL)
+      urlRequest.httpMethod = api.method.value
+      urlRequest.allHTTPHeaderFields = api.headers
+      urlRequest.setValue("application/json", forHTTPHeaderField: "Content-Type")
+      
+      if let body = api.bodyData {
+        urlRequest.httpBody = body
+      }
+      
+      AF.request(urlRequest)
+        .validate()
         .prettyPrintedJsonResponse(of: responseType)
         .responseDecodable(of: responseType) { response in
           switch response.result {
           case .success(let data):
-
+            
             print("[NETWORK][\(response.response?.statusCode ?? 0)] \(api)")
             continuation.resume(with: .success(data))
-
+            
           case .failure(let error):
             continuation.resume(with: .failure(error))
             print("[NETWORK][\(response.response?.statusCode ?? 0)] \(error)")

Modules/Common/Common/Sources/Common/Data/API/TenorAPI.swift

@@ -19,7 +19,7 @@ extension TenorAPI: APIFactory {
     }
   }
 
-  public var parameter: [String: Any] {
+  public var parameters: [String: Any] {
     var defaultParams: [String: Any] = ["key": APIConfig.tenorConfig.apiKey]
     switch self {
     case let .search(query, limit) where query.count > 0:
@@ -34,4 +34,16 @@ extension TenorAPI: APIFactory {
   public var baseURL: String {
     APIConfig.tenorConfig.baseUrl
   }
+  
+  public var method: HTTPMethod {
+     return .get // assuming all are GET requests
+   }
+
+   public var headers: [String: String] {
+     [:] // or provide default headers if needed
+   }
+
+   public var bodyData: Data? {
+     nil // not used in GET requests
+   }
 }