Skip to content

refactor: Simplify customer center events #5717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
facumenzella wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

refactor: Simplify customer center events #5717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion RevenueCatUI/CustomerCenter/Abstractions/CustomerCenterPurchasesType.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ import SwiftUI
promotionalOffer: PromotionalOffer?
) async throws -> PurchaseResultData

func track(customerCenterEvent: any CustomerCenterEventType)
func track(customerCenterEvent: CustomerCenterEvent)

func loadCustomerCenter() async throws -> CustomerCenterConfigData

Expand Down
2 changes: 1 addition & 1 deletion RevenueCatUI/CustomerCenter/Data/CustomerCenterPurchases.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ final class CustomerCenterPurchases: CustomerCenterPurchasesType {
}
}

func track(customerCenterEvent: any CustomerCenterEventType) {
func track(customerCenterEvent: CustomerCenterEvent) {
Purchases.shared.track(customerCenterEvent: customerCenterEvent)
}

Expand Down
4 changes: 2 additions & 2 deletions RevenueCatUI/CustomerCenter/Mocks/MockCustomerCenterPurchases.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ final class MockCustomerCenterPurchases: @unchecked Sendable, CustomerCenterPurc

var trackCallCount = 0
var trackError: Error?
var trackedEvents: [CustomerCenterEventType] = []
func track(customerCenterEvent: any CustomerCenterEventType) {
var trackedEvents: [CustomerCenterEvent] = []
func track(customerCenterEvent: CustomerCenterEvent) {
trackCallCount += 1
trackedEvents.append(customerCenterEvent)
}
Expand Down
18 changes: 10 additions & 8 deletions RevenueCatUI/CustomerCenter/ViewModels/CustomerCenterViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ import Foundation
internal var currentTask: Task<Void, Never>?

private var error: Error?
private var impressionData: CustomerCenterEvent.Data?
private var hasTrackedImpression = false

init(
actionWrapper: CustomerCenterActionWrapper,
Expand Down Expand Up @@ -229,17 +229,19 @@ import Foundation
}

func trackImpression(darkMode: Bool, displayMode: CustomerCenterPresentationMode) {
guard impressionData == nil else {
guard !hasTrackedImpression else {
return
}

let eventData = CustomerCenterEvent.Data(locale: .current,
darkMode: darkMode,
isSandbox: purchasesProvider.isSandbox,
displayMode: displayMode)
defer { self.impressionData = eventData }
hasTrackedImpression = true

let event = CustomerCenterEvent.impression(
locale: .current,
darkMode: darkMode,
isSandbox: purchasesProvider.isSandbox,
displayMode: displayMode
)

let event = CustomerCenterEvent.impression(CustomerCenterEventCreationData(), eventData)
purchasesProvider.track(customerCenterEvent: event)
}
}
Expand Down
23 changes: 11 additions & 12 deletions RevenueCatUI/CustomerCenter/ViewModels/FeedbackSurveyViewModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,18 +120,17 @@ private extension FeedbackSurveyViewModel {
darkMode: Bool,
displayMode: CustomerCenterPresentationMode,
locale: Locale) {
let isSandbox = purchasesProvider.isSandbox
let surveyOptionData = CustomerCenterAnswerSubmittedEvent.Data(locale: locale,
darkMode: darkMode,
isSandbox: isSandbox,
displayMode: displayMode,
path: feedbackSurveyData.path.type,
url: feedbackSurveyData.path.url,
surveyOptionID: option.id,
additionalContext: nil,
revisionID: 0)
let event = CustomerCenterAnswerSubmittedEvent.answerSubmitted(CustomerCenterEventCreationData(),
surveyOptionData)
let event = CustomerCenterEvent.answerSubmitted(
locale: locale,
darkMode: darkMode,
isSandbox: purchasesProvider.isSandbox,
displayMode: displayMode,
path: feedbackSurveyData.path.type,
url: feedbackSurveyData.path.url,
surveyOptionID: option.id,
additionalContext: nil,
revisionID: 0
)
purchasesProvider.track(customerCenterEvent: event)
}

Expand Down
Loading