Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion Sources/UDFAnalytics/Analytics.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public protocol Analytics<Event> {

func setName(for screen: Screen, screenClass: String, with: [String: Any]?)
func setUserProperties(_ userInfo: [String: Any], userId: String?)
func logRevenue(productId: String, productTitle: String, productItem: RevenueProduct?, value: NSNumber, currency: String)
func logRevenue(productId: String, productTitle: String, productItem: RevenueProduct?, value: NSNumber, currency: String, additionalParams: [String: Any]?)

func setupTracking(with status: ATTrackingManager.AuthorizationStatus)
func applicationDidBecomeActive()
Expand All @@ -46,4 +46,9 @@ public extension Analytics {
func setName(for screen: Screen, screenClass: String) {
setName(for: screen, screenClass: screenClass, with: nil)
}

func logRevenue(productId: String, productTitle: String, productItem: RevenueProduct?, value: NSNumber, currency: String) {
logRevenue(productId: productId, productTitle: productTitle, productItem: productItem, value: value, currency: currency, additionalParams: nil)
}

}
4 changes: 2 additions & 2 deletions Sources/UDFAnalytics/AnalyticsComposite.swift
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ public extension AnalyticsComposite {
components.forEach { $0.setUserProperties(userInfo, userId: userId) }
}

func logRevenue(productId: String, productTitle: String, productItem: RevenueProduct?, value: NSNumber, currency: String) {
func logRevenue(productId: String, productTitle: String, productItem: RevenueProduct?, value: NSNumber, currency: String, additionalParams: [String: Any]?) {
components.forEach {
$0.logRevenue(productId: productId, productTitle: productTitle, productItem: productItem, value: value, currency: currency)
$0.logRevenue(productId: productId, productTitle: productTitle, productItem: productItem, value: value, currency: currency, additionalParams: additionalParams)
}
}

Expand Down
8 changes: 7 additions & 1 deletion Sources/UDFAnalyticsAmplitude/AnalyticsAmplitude.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public struct AnalyticsAmplitude<Event: RawRepresentable>: Analytics where Event
amplitude.identity.userProperties = userInfo
}

public func logRevenue(productId: String, productTitle: String, productItem: RevenueProduct?, value: NSNumber, currency: String) {
public func logRevenue(productId: String, productTitle: String, productItem: RevenueProduct?, value: NSNumber, currency: String, additionalParams: [String: Any]?) {
let revenue = Revenue()
revenue.productId = productId

Expand All @@ -62,6 +62,12 @@ public struct AnalyticsAmplitude<Event: RawRepresentable>: Analytics where Event
params.merge(productItem.params) { current, _ in current }
}

if let additionalParams {
additionalParams.forEach { tuple in
params[tuple.key] = tuple.value
}
}

revenue.properties = params
revenue.price = value.doubleValue
revenue.currency = currency
Expand Down
9 changes: 8 additions & 1 deletion Sources/UDFAnalyticsAppsFlyer/AnalyticsAppsFlyer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public struct AnalyticsAppsFlyer<Event: RawRepresentable>: UDFAnalytics.Analytic
appsFlyer.customData = userInfo
}

public func logRevenue(productId: String, productTitle: String, productItem: RevenueProduct?, value: NSNumber, currency: String) {
public func logRevenue(productId: String, productTitle: String, productItem: RevenueProduct?, value: NSNumber, currency: String, additionalParams: [String: Any]?) {
var parameters: [String: Any] = [
AFEventParamContentId: productId,
AFEventParamContentType: productTitle,
Expand All @@ -93,6 +93,13 @@ public struct AnalyticsAppsFlyer<Event: RawRepresentable>: UDFAnalytics.Analytic
parameters[tuple.key] = tuple.value
}
}

if let additionalParams {
additionalParams.forEach { tuple in
parameters[tuple.key] = tuple.value
}
}

appsFlyer.logEvent(AFEventPurchase, withValues: parameters)
}

Expand Down
19 changes: 14 additions & 5 deletions Sources/UDFAnalyticsFacebook/AnalyticsFacebook.swift
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,23 @@ public struct AnalyticsFacebook<Event: RawRepresentable>: UDFAnalytics.Analytics
}
}

public func logRevenue(productId: String, productTitle: String, productItem: UDFAnalytics.RevenueProduct?, value: NSNumber, currency: String) {
public func logRevenue(productId: String, productTitle: String, productItem: UDFAnalytics.RevenueProduct?, value: NSNumber, currency: String, additionalParams: [String: Any]?) {

var parameters: [AppEvents.ParameterName: Any] = [
AppEvents.ParameterName.contentID: productId,
AppEvents.ParameterName.contentType: "product",
]

if let additionalParams {
additionalParams.forEach { tuple in
parameters[.init(rawValue: tuple.key)] = tuple.value
}
}

facebook.logPurchase(
amount: Double(truncating: value),
currency: currency,
parameters: [
AppEvents.ParameterName.contentID: productId,
AppEvents.ParameterName.contentType: productTitle
]
parameters: parameters
)
}

Expand Down
10 changes: 8 additions & 2 deletions Sources/UDFAnalyticsFirebase/AnalyticsFirebase.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public struct AnalyticsFirebase<Event: RawRepresentable>: UDFAnalytics.Analytics
}
}

public func logRevenue(productId: String, productTitle: String, productItem: RevenueProduct?, value: NSNumber, currency: String) {
public func logRevenue(productId: String, productTitle: String, productItem: RevenueProduct?, value: NSNumber, currency: String, additionalParams: [String: Any]?) {
var item: [String: Any] = [
AnalyticsParameterItemID: productId,
AnalyticsParameterItemName: productTitle
Expand All @@ -65,12 +65,18 @@ public struct AnalyticsFirebase<Event: RawRepresentable>: UDFAnalytics.Analytics
}
}

let parameters: [String: Any] = [
var parameters: [String: Any] = [
AnalyticsParameterValue: value,
AnalyticsParameterCurrency: currency,
AnalyticsParameterItems: [item]
]

if let additionalParams {
additionalParams.forEach { tuple in
parameters[tuple.key] = tuple.value
}
}

FAnalytics.logEvent(AnalyticsEventPurchase, parameters: parameters)
}

Expand Down
16 changes: 13 additions & 3 deletions Sources/UDFAnalyticsMixpanel/AnalyticsMixpanel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,21 @@ public struct AnalyticsMixpanel<Event: RawRepresentable>: UDFAnalytics.Analytics
}
}

public func logRevenue(productId: String, productTitle: String, productItem: RevenueProduct?, value: NSNumber, currency: String) {
public func logRevenue(productId: String, productTitle: String, productItem: RevenueProduct?, value: NSNumber, currency: String, additionalParams: [String: Any]?) {
var params: [String: Any] = [:]

if let productItem {
mixpanel.people.trackCharge(amount: value.doubleValue, properties: toMixpanelProperties(productItem.params))
} else {
params.merge(productItem.params) { current, _ in current }
}

if let additionalParams {
params.merge(additionalParams) { current, _ in current }
}

if params.isEmpty {
mixpanel.people.trackCharge(amount: value.doubleValue)
} else {
mixpanel.people.trackCharge(amount: value.doubleValue, properties: toMixpanelProperties(params))
}
}

Expand Down