cleanup

RevenueCat · Nov 27, 2024 · 6a7d6e8 · 6a7d6e8
1 parent a710691
commit 6a7d6e8
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 26 deletions.
diff --git a/RevenueCatUI/CustomerCenter/Abstractions/CustomerCenterPurchasesType.swift b/RevenueCatUI/CustomerCenter/Abstractions/CustomerCenterPurchasesType.swift
@@ -34,4 +34,7 @@ protocol CustomerCenterPurchasesType: Sendable {
         promotionalOffer: PromotionalOffer
     ) async throws -> PurchaseResultData
 
+    @Sendable
+    func track(customerCenterEvent: CustomerCenterEvent) async throws
+
 }
diff --git a/RevenueCatUI/CustomerCenter/Abstractions/ManageSubscriptionsPurchaseType.swift b/RevenueCatUI/CustomerCenter/Abstractions/ManageSubscriptionsPurchaseType.swift
@@ -34,7 +34,4 @@ protocol ManageSubscriptionsPurchaseType: Sendable {
     @Sendable
     func beginRefundRequest(forProduct productID: String) async throws -> RefundRequestStatus
 
-    @Sendable
-    func trackImpression(_ eventData: CustomerCenterEvent.Data) async throws
-
 }
diff --git a/RevenueCatUI/CustomerCenter/Data/CustomerCenterPurchases.swift b/RevenueCatUI/CustomerCenter/Data/CustomerCenterPurchases.swift
@@ -43,4 +43,9 @@ final class CustomerCenterPurchases: CustomerCenterPurchasesType {
             promotionalOffer: promotionalOffer
         )
     }
+
+    func track(customerCenterEvent: CustomerCenterEvent) async throws {
+        await Purchases.shared.track(customerCenterEvent: customerCenterEvent)
+    }
+
 }
diff --git a/RevenueCatUI/CustomerCenter/ViewModels/CustomerCenterViewModel.swift b/RevenueCatUI/CustomerCenter/ViewModels/CustomerCenterViewModel.swift
@@ -26,7 +26,6 @@ import RevenueCat
     // We fail open.
     private static let defaultAppIsLatestVersion = true
 
-    typealias CustomerInfoFetcher = @Sendable () async throws -> CustomerInfo
     typealias CurrentVersionFetcher = () -> String?
 
     private lazy var currentAppVersion: String? = currentVersionFetcher()
@@ -37,6 +36,7 @@ import RevenueCat
     private(set) var hasAppleEntitlement: Bool = false
     @Published
     private(set) var appIsLatestVersion: Bool = defaultAppIsLatestVersion
+    private(set) var purchasesProvider: CustomerCenterPurchasesType
 
     // @PublicForExternalTesting
     @Published
@@ -68,26 +68,22 @@ import RevenueCat
         return state != .notLoaded && configuration != nil
     }
 
-    private var customerInfoFetcher: CustomerInfoFetcher
     private let currentVersionFetcher: CurrentVersionFetcher
     internal let customerCenterActionHandler: CustomerCenterActionHandler?
 
     private var error: Error?
 
     init(
         customerCenterActionHandler: CustomerCenterActionHandler?,
-        customerInfoFetcher: @escaping CustomerInfoFetcher = {
-            guard Purchases.isConfigured else { throw PaywallError.purchasesNotConfigured }
-            return try await Purchases.shared.customerInfo()
-        },
         currentVersionFetcher: @escaping CurrentVersionFetcher = {
             Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String
-        }
+        },
+        purchasesProvider: CustomerCenterPurchasesType = CustomerCenterPurchases()
     ) {
         self.state = .notLoaded
-        self.customerInfoFetcher = customerInfoFetcher
         self.currentVersionFetcher = currentVersionFetcher
         self.customerCenterActionHandler = customerCenterActionHandler
+        self.purchasesProvider = purchasesProvider
     }
 
     #if DEBUG
@@ -106,7 +102,7 @@ import RevenueCat
 
     func loadHasActivePurchases() async {
         do {
-            let customerInfo = try await self.customerInfoFetcher()
+            let customerInfo = try await purchasesProvider.customerInfo()
             self.hasActiveProducts = customerInfo.activeSubscriptions.count > 0 ||
                                 customerInfo.nonSubscriptions.count > 0
             self.hasAppleEntitlement = customerInfo.entitlements.active.contains { entitlement in
@@ -139,9 +135,12 @@ import RevenueCat
         }
     }
 
-    func trackImpression() {
-        // swiftlint:disable:next todo
-        // TODO: implement tracking impression
+    func trackImpression(_ eventData: CustomerCenterEvent.Data) {
+        let event = CustomerCenterEvent.impression(CustomerCenterEvent.CreationData(), eventData)
+
+        Task.detached(priority: .background) { [purchasesProvider = self.purchasesProvider] in
+            try await purchasesProvider.track(customerCenterEvent: event)
+        }
     }
 
 }

diff --git a/RevenueCatUI/CustomerCenter/ViewModels/ManageSubscriptionsViewModel.swift b/RevenueCatUI/CustomerCenter/ViewModels/ManageSubscriptionsViewModel.swift
@@ -259,10 +259,6 @@ private final class ManageSubscriptionPurchases: ManageSubscriptionsPurchaseType
         await Purchases.shared.products(productIdentifiers)
     }
 
-    func trackImpression(_ eventData: CustomerCenterEvent.Data) async throws {
-        await Purchases.shared.track(customerCenterEvent: CustomerCenterEvent.impression(.init(), eventData))
-    }
-
 }
 
 #endif
diff --git a/RevenueCatUI/CustomerCenter/Views/CustomerCenterView.swift b/RevenueCatUI/CustomerCenter/Views/CustomerCenterView.swift
@@ -122,7 +122,10 @@ private extension CustomerCenterView {
     }
 
     func trackImpression() {
-        viewModel.trackImpression()
+        let eventData = CustomerCenterEvent.Data(sessionID: CustomerCenterEvent.SessionID(),
+                                                 locale: .current,
+                                                 darkMode: self.colorScheme == .dark)
+        viewModel.trackImpression(eventData)
     }
 
 }

diff --git a/Sources/CustomerCenter/Events/CustomerCenterEvent.swift b/Sources/CustomerCenter/Events/CustomerCenterEvent.swift
@@ -47,8 +47,8 @@ extension CustomerCenterEvent {
     public struct CreationData {
 
         // swiftlint:disable missing_docs
-        public var id: ID
-        public var date: Date
+        var id: ID
+        var date: Date
 
         public init(
             id: ID = .init(),
@@ -68,11 +68,10 @@ extension CustomerCenterEvent {
     public struct Data {
 
         // swiftlint:disable missing_docs
-        public var sessionIdentifier: SessionID
-        public var localeIdentifier: String
-        public var darkMode: Bool
+        var sessionIdentifier: SessionID
+        var localeIdentifier: String
+        var darkMode: Bool
 
-        @available(iOS 15.0, macOS 12.0, tvOS 15.0, watchOS 8.0, *)
         public init(
             sessionID: SessionID,
             locale: Locale,