Merge branch 'trunk' into task/remove-timeout-from-POSSettingsLocalCatalogViewModelTests

Author: staskus

CHANGELOG.md

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "2600"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES"
+      buildArchitectures = "Automatic">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "PointOfSale"
+               BuildableName = "PointOfSale"
+               BlueprintName = "PointOfSale"
+               ReferencedContainer = "container:">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <TestPlans>
+         <TestPlanReference
+            reference = "container:Tests/PointOfSaleTests/PointOfSale.xctestplan"
+            default = "YES">
+         </TestPlanReference>
+      </TestPlans>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "PointOfSale"
+            BuildableName = "PointOfSale"
+            BlueprintName = "PointOfSale"
+            ReferencedContainer = "container:">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

Modules/.swiftpm/xcode/xcshareddata/xcschemes/PointOfSale.xcscheme

@@ -67,6 +67,10 @@ let package = Package(
             name: "Yosemite",
             targets: ["Yosemite"]
         ),
+        .library(
+            name: "PointOfSale",
+            targets: ["PointOfSale"]
+        ),
     ],
     dependencies: [
         .package(url: "https://github.com/Alamofire/Alamofire", from: "5.2.0"),
@@ -182,7 +186,8 @@ let package = Package(
             dependencies: [
                 "WooFoundationCore",
                 .product(name: "Kingfisher", package: "Kingfisher")
-            ]
+            ],
+            resources: [.process("Resources")]
         ),
         .target(
             name: "WooFoundationCore",
@@ -230,6 +235,18 @@ let package = Package(
                 .product(name: "WordPressEditor", package: "AztecEditor-iOS"),
             ]
         ),
+        .target(
+            name: "PointOfSale",
+            dependencies: [
+                "Experiments",
+                "WooFoundation",
+                "Yosemite",
+                .product(name: "CocoaLumberjackSwift", package: "CocoaLumberjack"),
+                .product(name: "Shimmer", package: "SwiftUI-Shimmer"),
+                .product(name: "Kingfisher", package: "Kingfisher"),
+            ],
+            resources: [.process("Resources")]
+        ),
         .testTarget(
             name: "ExperimentsTests",
             dependencies: [
@@ -295,7 +312,17 @@ let package = Package(
                 .process("Resources"),
                 .process("../NetworkingTests/Responses")
             ]
-        )
+        ),
+        .testTarget(
+            name: "PointOfSaleTests",
+            dependencies: [
+                .target(name: "PointOfSale"),
+                "Codegen",
+                "Fakes",
+                "TestKit",
+                "WooFoundation"
+            ]
+        ),
     ]
 )
 
@@ -374,6 +401,7 @@ enum XcodeSupport {
                     "WordPressUI",
                     "WPMediaPicker",
                     "Yosemite",
+                    "PointOfSale",
                     .product(name: "Alamofire", package: "Alamofire"),
                     .product(name: "Algorithms", package: "swift-algorithms"),
                     .product(name: "AutomatticAbout", package: "AutomatticAbout-swift"),

Modules/Package.resolved

@@ -1,26 +1,27 @@
 import Foundation
 import Yosemite
+import struct WooFoundation.WooAnalyticsEvent
 
-struct POSOrderListFetchAnalytics: POSOrderListFetchAnalyticsTracking {
+public struct POSOrderListFetchAnalytics: POSOrderListFetchAnalyticsTracking {
     private let analytics: POSAnalyticsProviding
 
-    init(analytics: POSAnalyticsProviding) {
+    public init(analytics: POSAnalyticsProviding) {
         self.analytics = analytics
     }
 
-    func trackOrdersFetchComplete(millisecondsSinceRequestSent: Int) {
+    public func trackOrdersFetchComplete(millisecondsSinceRequestSent: Int) {
         analytics.track(event: WooAnalyticsEvent.PointOfSale.ordersListFetched(
             millisecondsSinceRequestSent: millisecondsSinceRequestSent
         ))
     }
 
-    func trackOrdersSearchResultsFetchComplete(millisecondsSinceRequestSent: Int) {
+    public func trackOrdersSearchResultsFetchComplete(millisecondsSinceRequestSent: Int) {
         analytics.track(event: WooAnalyticsEvent.PointOfSale.ordersListSearchResultsFetched(
             millisecondsSinceRequestSent: millisecondsSinceRequestSent
         ))
     }
 
-    func trackOrdersNextPageLoaded(pageNumber: Int) {
+    public func trackOrdersNextPageLoaded(pageNumber: Int) {
         analytics.track(event: WooAnalyticsEvent.PointOfSale.ordersListNextPageLoaded(
             pageNumber: pageNumber
         ))

Modules/Package.swift

@@ -6,9 +6,10 @@ import struct Yosemite.POSSimpleProduct
 import struct Yosemite.POSVariation
 import enum WooFoundation.CountryCode
 import enum Yosemite.PaymentMethod
+import struct WooFoundation.WooAnalyticsEvent
 
 extension WooAnalyticsEvent {
-    enum PointOfSale {
+    public enum PointOfSale {
         /// Event property Key.
         private enum Key {
             static let paymentsOnboardingState = "onboarding_state"
@@ -207,11 +208,11 @@ extension WooAnalyticsEvent {
         /// Tracks the time elapsed preparing reader for payment, after successful order creation
         /// - Parameter waitingTime: Elapsed time from Order creation to card ready for payment
         ///
-        static func cardReaderReadyForCardPayment(waitingTime: Double) -> WooAnalyticsEvent {
+        public static func cardReaderReadyForCardPayment(waitingTime: Double) -> WooAnalyticsEvent {
             WooAnalyticsEvent(statName: .pointOfSaleReaderReadyForCardPayment, properties: [Key.waitingTime: "\(waitingTime)"])
         }
 
-        static func cardPresentCollectPaymentSuccess(forGatewayID: String?,
+        public static func cardPresentCollectPaymentSuccess(forGatewayID: String?,
                                                      countryCode: CountryCode,
                                                      paymentMethod: PaymentMethod,
                                                      cardReaderModel: String?,
@@ -224,7 +225,7 @@ extension WooAnalyticsEvent {
                 Key.cardReaderModel: readerModel(for: cardReaderModel),
                 Key.countryCode: countryCode.rawValue,
                 Key.gatewayID: safeGatewayID(for: forGatewayID),
-                Key.paymentMethodType: paymentMethod.analyticsValue,
+                Key.paymentMethodType: analyticsValue(for: paymentMethod),
                 Key.millisecondsSinceCustomerInteractionStarted: "\(millisecondsSinceCustomerIteractionStarted)",
                 Key.millisecondsSinceOrderSyncSuccess: "\(millisecondsSinceOrderSyncSuccess)",
                 Key.millisecondsSinceReaderReadyToCollect: "\(millisecondsSinceReaderReadyToCollect)",
@@ -233,7 +234,18 @@ extension WooAnalyticsEvent {
             ])
         }
 
-        static func cashCollectPaymentSuccess(millisecondsSinceCustomerIteractionStarted: Double) -> WooAnalyticsEvent {
+        static func analyticsValue(for paymentMethod: PaymentMethod) -> String {
+            switch paymentMethod {
+            case .card, .cardPresent:
+                return "card"
+            case .interacPresent:
+                return "card_interac"
+            case .unknown:
+                return "unknown"
+            }
+        }
+
+        public static func cashCollectPaymentSuccess(millisecondsSinceCustomerIteractionStarted: Double) -> WooAnalyticsEvent {
             WooAnalyticsEvent(statName: .pointOfSaleCashCollectPaymentSuccess, properties: [
                 Key.millisecondsSinceCustomerInteractionStarted: "\(millisecondsSinceCustomerIteractionStarted)",
             ])

WooCommerce/Classes/POS/Analytics/POSCollectOrderPaymentAnalyticsTracking.swift renamed to Modules/Sources/PointOfSale/Analytics/POSCollectOrderPaymentAnalyticsTracking.swift

@@ -1,3 +1,5 @@
+import struct WooFoundation.WooAnalyticsEvent
+
 extension WooAnalyticsEvent {
     enum PointOfSaleIneligibleUI {
         /// Event property key.

WooCommerce/Classes/POS/Analytics/POSItemFetchAnalytics.swift renamed to Modules/Sources/PointOfSale/Analytics/POSItemFetchAnalytics.swift

@@ -6,4 +6,9 @@ public struct CardPresentPaymentCardReader: Equatable {
     /// The reader's battery level, if available.
     /// This is an unformatted percentage as a float, e.g. 0.0-1.0
     let batteryLevel: Float?
+
+    public init(name: String, batteryLevel: Float?) {
+        self.name = name
+        self.batteryLevel = batteryLevel
+    }
 }