Merge branch 'trunk' into task/WOOMOB-1290-remove-IAP-usage

Author: iamgabrielma

.swiftlint.yml

@@ -1,6 +1,7 @@
 swiftlint_version: 0.58.2
 
 excluded:
+  - build
   - BuildTools/.build
   - DerivedData
   - fastlane

Modules/Sources/Experiments/DefaultFeatureFlagService.swift

@@ -86,8 +86,6 @@ public struct DefaultFeatureFlagService: FeatureFlagService {
             return false
         case .productImageOptimizedHandling:
             return true
-        case .pointOfSaleAsATabi2:
-            return true
         case .pointOfSaleOrdersi1:
             return true
         case .pointOfSaleOrdersi2:

Modules/Sources/Experiments/FeatureFlag.swift

@@ -179,10 +179,6 @@ public enum FeatureFlag: Int {
     ///
     case inventoryProductLabelsInPOS
 
-    /// Enables displaying POS as a tab in the tab bar for stores in eligible countries
-    ///
-    case pointOfSaleAsATabi2
-
     /// Enables displaying Point Of Sale details in order list and order details
     ///
     case pointOfSaleOrdersi1

Modules/Sources/Networking/Model/Bookings/Booking.swift

@@ -137,6 +137,10 @@ public struct Booking: Codable, GeneratedCopiable, Equatable, GeneratedFakeable
     }
 }
 
+extension Booking: Identifiable {
+    public var id: Int64 { bookingID }
+}
+
 /// Defines all of the Booking CodingKeys
 ///
 private extension Booking {
@@ -180,6 +184,5 @@ public enum BookingStatus: String, CaseIterable {
     case cancelled
     case pendingConfirmation = "pending-confirmation"
     case confirmed
-    case inCart = "in-cart"
     case unknown
 }

Modules/Sources/NetworkingCore/Model/OrderItem.swift

@@ -127,8 +127,18 @@ public struct OrderItem: Codable, Equatable, Hashable, Sendable, GeneratedFakeab
                                                               forKey: .attributes)
             .first(where: { $0.key == "_pao_ids" })?.value ?? []
 
-        // Order item product image
-        let image = try container.decodeIfPresent(OrderItemProductImage.self, forKey: .image)
+        // Order item product image can be either a string URL or an object with src field
+        // Use failsafeDecodeIfPresent with alternative types to handle both formats gracefully
+        let image: OrderItemProductImage? = {
+            if let imageObject = container.failsafeDecodeIfPresent(OrderItemProductImage.self, forKey: .image) {
+                return imageObject
+            }
+            if let urlString = container.failsafeDecodeIfPresent(stringForKey: .image),
+               !urlString.isEmpty {
+                return OrderItemProductImage(src: urlString)
+            }
+            return nil
+        }()
 
         // Product Bundle extension properties:
         // If the order item is part of a product bundle, `bundledBy` is the parent order item (product bundle).
@@ -240,16 +250,20 @@ private struct OrderItemProductAddOnContainer: Decodable {
 // MARK: - Order Item Product Image
 //
 public struct OrderItemProductImage: Codable, Equatable, Hashable, Sendable {
-    public let src: String?
+    public let src: String
+
+    public init(src: String) {
+        self.src = src
+    }
 
     public init(from decoder: Decoder) throws {
         let container = try decoder.container(keyedBy: CodingKeys.self)
-        self.src = try? container.decodeIfPresent(String.self, forKey: .src)
+        self.src = try container.decode(String.self, forKey: .src)
     }
 
     public func encode(to encoder: Encoder) throws {
         var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encodeIfPresent(src, forKey: .src)
+        try container.encode(src, forKey: .src)
     }
 
     private enum CodingKeys: String, CodingKey {

Modules/Sources/NetworkingCore/Network/AlamofireNetwork.swift

@@ -34,12 +34,8 @@ public class AlamofireNetwork: Network {
     /// authentication mode for requests
     public private(set) var authenticationMode: RequestAuthenticationMode?
 
-    /// Lazy-initialized session manager. Use ensuresSessionManagerIsInitialized=true to avoid race conditions with concurrent requests.
-    private lazy var alamofireSession: Alamofire.Session = {
-        let sessionConfiguration = URLSessionConfiguration.default
-        let sessionManager = makeSession(configuration: sessionConfiguration)
-        return sessionManager
-    }()
+    /// Session manager used for Alamofire requests.
+    private let alamofireSession: Alamofire.Session
 
     private let credentials: Credentials?
 
@@ -71,14 +67,11 @@ public class AlamofireNetwork: Network {
     ///   - selectedSite: Publisher for site selection changes.
     ///   This is necessary if you wish to enable network switching to direct requests while authenticated with WPCOM for better performance.
     ///   - sessionManager: Optional pre-configured session manager.
-    ///   - ensuresSessionManagerIsInitialized: If true, the session is always set during initialization immediately to avoid lazy initialization race conditions.
-    ///     Defaults to false for backward compatibility. Set to true when making concurrent requests immediately after initialization.
     public required init(credentials: Credentials?,
                          selectedSite: AnyPublisher<JetpackSite?, Never>?,
                          appPasswordSupportState: AnyPublisher<Bool, Never>?,
                          userDefaults: UserDefaults = .standard,
-                         sessionManager: Alamofire.Session? = nil,
-                         ensuresSessionManagerIsInitialized: Bool = false) {
+                         sessionManager: Alamofire.Session? = nil) {
         self.credentials = credentials
         self.selectedSite = selectedSite
         self.userDefaults = userDefaults
@@ -96,11 +89,12 @@ public class AlamofireNetwork: Network {
             }()
             return RequestConverter(siteAddress: siteAddress)
         }()
-        self.requestAuthenticator = RequestProcessor(requestAuthenticator: DefaultRequestAuthenticator(credentials: credentials))
+        let requestAuthenticator = RequestProcessor(requestAuthenticator: DefaultRequestAuthenticator(credentials: credentials))
+        self.requestAuthenticator = requestAuthenticator
         if let sessionManager {
             self.alamofireSession = sessionManager
-        } else if ensuresSessionManagerIsInitialized {
-            self.alamofireSession = makeSession(configuration: URLSessionConfiguration.default)
+        } else {
+            self.alamofireSession = Alamofire.Session(configuration: .default, interceptor: requestAuthenticator)
         }
 
         let authenticationMode: RequestAuthenticationMode? = {
@@ -294,12 +288,6 @@ private extension AlamofireNetwork {
         }
     }
 
-    /// Creates a session manager with request retrier and adapter
-    ///
-    func makeSession(configuration sessionConfiguration: URLSessionConfiguration) -> Alamofire.Session {
-        Alamofire.Session(configuration: sessionConfiguration, interceptor: requestAuthenticator)
-    }
-
     /// Updates `requestConverter` and `requestAuthenticator` when selected site changes
     ///
     func observeSelectedSite(_ selectedSite: AnyPublisher<JetpackSite?, Never>) {

Modules/Sources/Storage/Model/MIGRATIONS.md

@@ -238,96 +238,96 @@ This file documents changes in the WCiOS Storage data model. Please explain any
 - @rachelmcr 2022-12-15
     - Added `SiteSummaryStats` entity.
 
-## Model 79 (Release 11.7.0.0)
+## Model 79 (Release 11.7.0.0) - Deleted
 - @rachelmcr 2022-12-12
     - Added `views` attribute to `SiteVisitStatsItem` entity.
 
-## Model 78 (Release 11.4.0.0)
+## Model 78 (Release 11.4.0.0) - Deleted
 - @rachelmcr 2022-11-18
     - Added `averageOrderValue` attribute to `OrderStatsV4Totals` entity.
 
-## Model 77 (Release 11.2.0.0)
+## Model 77 (Release 11.2.0.0) - Deleted
 - @ealeksandrov 2022-11-07
     - Added `frameNonce` attribute to `Site` entity.
 
-## Model 76 (Release 11.0.0.0)
+## Model 76 (Release 11.0.0.0) - Deleted
 - @ealeksandrov 2022-10-26
     - Added `loginURL` attribute to `Site` entity.
 
-## Model 75 (Release 10.9.0.0)
+## Model 75 (Release 10.9.0.0) - Deleted
 - @iamgabrielma 2022-10-17
     - Added `siteID` attribute to `Customer` entity.
     - Added `siteID` attribute to `CustomerSearchResult` entity.
     - Added `keyword` attribute to `CustomerSearchResult` entity.
     - Removed `customerID` attribute from `CustomerSearchResult` entity.
     - Added `WooCommerceModelV74toV75` mapping model.
 
-## Model 74 (Release 10.8.0.0)
+## Model 74 (Release 10.8.0.0) - Deleted
 - @iamgabrielma 2022-10-12
     - Added `Customer` entity.
     - Added `CustomerSearchResult` entity.
 
-## Model 73 (Release 10.6.0.0)
+## Model 73 (Release 10.6.0.0) - Deleted
 - @jaclync 2022-09-14
     - Added `filterKey` attribute to `ProductSearchResults` entity.
 
-## Model 72 (Release 9.6.0.0)
+## Model 72 (Release 9.6.0.0) - Deleted
 - @joshheald 2022-08-19
     - Added `instructions` attribute to `PaymentGateway` entity.
 
-## Model 71 (Release 9.6.0.0)
+## Model 71 (Release 9.6.0.0) - Deleted
 - @rachelmcr 2022-07-07
     - Added `OrderMetaData` entity.
     - Added `customFields` to-many relationship from `Order` to `OrderMetaData`.
 
-## Model 70 (Release 9.5.0.0)
+## Model 70 (Release 9.5.0.0) - Deleted
 - @toupper 2022-06-22
     - Update `OrderItemRefund` entity to include the `refundedItemID` property.
 
-## Model 69 (Release 9.4.0.0)
+## Model 69 (Release 9.4.0.0) - Deleted
 - @ecarrion 2022-06-08
     - Update `Order` entity to include the `needsProcessing`, `needsPayment`, and `isEditable` properties.
 
-## Model 68 (Release 9.2.0.0)
+## Model 68 (Release 9.2.0.0) - Deleted
 - @pmusolino 2022-05-05
     - Update `Coupon` entity and make `usageLimit`, `usageLimitPerUser` and `limitUsageToXItems` properties as optional with default value equal to `null`.
 
-## Model 67 (Release 8.9.0.0)
+## Model 67 (Release 8.9.0.0) - Deleted
 - @ecarrion 2022-04-06
     - Update `Order` entity to include the `paymentURL` property.
 
-## Model 66 (Release 8.8.0.0)
+## Model 66 (Release 8.8.0.0) - Deleted
 - @pmusolino 2022-03-09
     - Update `Order`'s `items` relationship to be ordered.
 
-## Model 65 (Release 8.6.0.0)
+## Model 65 (Release 8.6.0.0) - Deleted
 - @joshheald 2022-02-14
     - Added `WCPayCharge` entity.
     - Added `WCPayCardPresentPaymentDetails` entity.
     - Added `WCPayCardPaymentDetails` entity.
     - Added `WCPayCardPresentReceiptDetails` entity.
 
-## Model 64 (Release 8.6.0.0)
+## Model 64 (Release 8.6.0.0) - Deleted
 - @pmusolino 2022-02-09
     - Added `InboxNote` entity.
     - Added `InboxAction` entity.
     - Added `actions` relationship from `InboxNote` to `[InboxAction]`.
 
-## Model 63 (Release 8.5.0.0)
+## Model 63 (Release 8.5.0.0) - Deleted
 - @joshheald 2022-01-31
     - Added `chargeID` attribute to `Order` entity.
 
-## Model 62 (Release 8.5.0.0)
+## Model 62 (Release 8.5.0.0) - Deleted
 - @itsmeichigo 2022-01-25
     - Added `CouponSearchResult` entity.
     - Added `searchResults` relationship from `Coupon` to `CouponSearchResult`.
 
-## Model 61 (Release 8.4.0.0)
+## Model 61 (Release 8.4.0.0) - Deleted
 - @selanthiraiyan 2022-01-13
     - Added `OrderTaxLine` entity.
     - Added `taxes` relationship from `Order` to `OrderTaxLine`.
 
-## Model 60 (Release 8.3.0.0)
+## Model 60 (Release 8.3.0.0) - Deleted
 - @ecarrion 2021-12-22
     - Added `OrderKey` attribute to `Order` entity.