Merge branch 'trunk' into woomob-449-refund-integrate-refund-api

Author: itsmeichigo

.swiftlint.yml

@@ -1,8 +1,10 @@
-swiftlint_version: 0.54.0
+swiftlint_version: 0.58.2
 
 excluded:
+  - BuildTools/.build
   - DerivedData
   - fastlane
+  - Modules/.build
   - Pods
   - Scripts
   # Automattic's CI caching setup may generate this in the project folder

BuildTools/.sourcery.yml

@@ -0,0 +1,19 @@
+# At the time of writing and with Sourcery 2.2.6, running the tool via `swift
+# package plugin` ignores the --config parameter, looking instead for the
+# .sourcery.yml configuration file.
+#
+# That means we cannot invoke Sourcery individually for each target.
+#
+# Luckily, the configuration files supports child configurations, so we can
+# achieve the same result this way.
+configurations:
+  - child: ../CodeGeneration/Sourcery/Copiable/Hardware-Copiable.sourcery.yaml
+  - child: ../CodeGeneration/Sourcery/Copiable/Networking-Copiable.sourcery.yaml
+  - child: ../CodeGeneration/Sourcery/Copiable/Storage-Copiable.sourcery.yaml
+  - child: ../CodeGeneration/Sourcery/Copiable/WooCommerce-Copiable.sourcery.yaml
+  - child: ../CodeGeneration/Sourcery/Copiable/WooFoundation-Copiable.sourcery.yaml
+  - child: ../CodeGeneration/Sourcery/Copiable/Yosemite-Copiable.sourcery.yaml
+  - child: ../CodeGeneration/Sourcery/Fakes/Hardware-Fakes.yaml
+  - child: ../CodeGeneration/Sourcery/Fakes/Networking-Fakes.yaml
+  - child: ../CodeGeneration/Sourcery/Fakes/WooFoundation-Fakes.yaml
+  - child: ../CodeGeneration/Sourcery/Fakes/Yosemite-Fakes.yaml

BuildTools/Empty.swift

@@ -0,0 +1,2 @@
+// Here only to satisfy SwiftPM requirement.
+// See https://github.com/nicklockwood/SwiftFormat#1-create-a-buildtools-folder-and-packageswift

BuildTools/Package.resolved

@@ -0,0 +1,38 @@
+// swift-tools-version:6.0
+import Foundation
+import PackageDescription
+
+let package = Package(
+    name: "BuildTools",
+    platforms: [.macOS(.v10_13)],
+    dependencies: [
+        .package(url: "https://github.com/SimplyDanny/SwiftLintPlugins", exact: loadSwiftLintVersion()),
+        .package(url: "https://github.com/krzysztofzablocki/Sourcery.git", from: "2.2.6")
+    ],
+    targets: [.target(name: "BuildTools", path: "")]
+)
+
+func loadSwiftLintVersion() -> Version {
+    let swiftLintConfigURL = URL(fileURLWithPath: #filePath)
+        .deletingLastPathComponent()
+        .appendingPathComponent("..")
+        .appendingPathComponent(".swiftlint.yml")
+
+    guard let yamlString = try? String(contentsOf: swiftLintConfigURL) else {
+        fatalError("Failed to read SwiftLint config file at \(swiftLintConfigURL).")
+    }
+
+    guard let versionLine = yamlString.components(separatedBy: .newlines)
+        .first(where: { $0.contains("swiftlint_version") }) else {
+        fatalError("SwiftLint version not found in YAML file.")
+    }
+
+    // Assumes the format `swiftlint_version: <version>`
+    guard let version = Version(versionLine.components(separatedBy: ":")
+        .last?
+        .trimmingCharacters(in: .whitespaces) ?? "") else {
+        fatalError("Failed to extract SwiftLint version.")
+    }
+
+    return version
+}

BuildTools/Package.swift

@@ -130,6 +130,12 @@ extension PaymentGateway: Codable {
     }
 }
 
+extension PaymentGateway {
+    public enum Constants {
+        public static let cashOnDeliveryGatewayID = "cod"
+    }
+}
+
 // MARK: - Features Decodable
 extension PaymentGateway.Feature: RawRepresentable, Codable {
 

Networking/Networking/Model/PaymentGateway.swift

@@ -7,8 +7,7 @@ import Foundation
 public protocol CouponsRemoteProtocol {
     func loadAllCoupons(for siteID: Int64,
                         pageNumber: Int,
-                        pageSize: Int,
-                        completion: @escaping (Result<[Coupon], Error>) -> ())
+                        pageSize: Int) async throws -> [Coupon]
 
     func loadCoupons(for siteID: Int64,
                      by couponIDs: [Int64],
@@ -19,8 +18,7 @@ public protocol CouponsRemoteProtocol {
     func searchCoupons(for siteID: Int64,
                        keyword: String,
                        pageNumber: Int,
-                       pageSize: Int,
-                       completion: @escaping (Result<[Coupon], Error>) -> ())
+                       pageSize: Int) async throws -> [Coupon]
 
     func retrieveCoupon(for siteID: Int64,
                         couponID: Int64,
@@ -75,8 +73,7 @@ public final class CouponsRemote: Remote, CouponsRemoteProtocol {
     ///
     public func loadAllCoupons(for siteID: Int64,
                                pageNumber: Int = Default.pageNumber,
-                               pageSize: Int = Default.pageSize,
-                               completion: @escaping (Result<[Coupon], Error>) -> ()) {
+                               pageSize: Int = Default.pageSize) async throws -> [Coupon] {
         let parameters = [
             ParameterKey.page: String(pageNumber),
             ParameterKey.perPage: String(pageSize)
@@ -91,7 +88,7 @@ public final class CouponsRemote: Remote, CouponsRemoteProtocol {
 
         let mapper = CouponListMapper(siteID: siteID)
 
-        enqueue(request, mapper: mapper, completion: completion)
+        return try await enqueue(request, mapper: mapper)
     }
 
     /// Retrieves a specific list of `Coupon`s by `couponID`.
@@ -139,8 +136,7 @@ public final class CouponsRemote: Remote, CouponsRemoteProtocol {
     public func searchCoupons(for siteID: Int64,
                               keyword: String,
                               pageNumber: Int,
-                              pageSize: Int,
-                              completion: @escaping (Result<[Coupon], Error>) -> ()) {
+                              pageSize: Int) async throws -> [Coupon] {
         let parameters = [
             ParameterKey.page: String(pageNumber),
             ParameterKey.perPage: String(pageSize),
@@ -156,7 +152,7 @@ public final class CouponsRemote: Remote, CouponsRemoteProtocol {
 
         let mapper = CouponListMapper(siteID: siteID)
 
-        enqueue(request, mapper: mapper, completion: completion)
+        return try await enqueue(request, mapper: mapper)
     }
 
     /// Retrieves a `Coupon`.
@@ -372,23 +368,6 @@ public final class CouponsRemote: Remote, CouponsRemoteProtocol {
     }
 }
 
-extension CouponsRemote {
-    public func loadAllCoupons(for siteID: Int64,
-                               pageNumber: Int = CouponsRemote.Default.pageNumber,
-                               pageSize: Int = CouponsRemote.Default.pageSize) async throws -> [Coupon] {
-        try await withCheckedThrowingContinuation { continuation in
-            loadAllCoupons(for: siteID, pageNumber: pageNumber, pageSize: pageSize) { result in
-                switch result {
-                case .success(let coupons):
-                    continuation.resume(returning: coupons)
-                case .failure(let error):
-                    continuation.resume(throwing: error)
-                }
-            }
-        }
-    }
-}
-
 // MARK: - Constants
 //
 public extension CouponsRemote {