Skip to content
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

Cleans up revenue logic #40

Merged
merged 2 commits into from
Oct 19, 2017
Merged

Cleans up revenue logic #40

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ee33c9
Cleans up revenue logic
Oct 19, 2017
8cefa18
Change variable type id to expected value types in Segment Spec
Oct 19, 2017
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
58 changes: 21 additions & 37 deletions Pod/Classes/SEGAmplitudeIntegration.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,62 +98,46 @@ - (void)trackRevenue:(NSDictionary *)properties andRevenueOrTotal:(NSNumber *)re
// Use logRevenueV2 with revenue properties.
if ([(NSNumber *)[self.settings objectForKey:@"useLogRevenueV2"] boolValue]) {
[self trackLogRevenueV2:properties andRevenueOrTotal:revenueOrTotal];
} else {
// fallback to logRevenue v1
id productId = [properties objectForKey:@"productId"] ?: [properties objectForKey:@"product_id"];
if (!productId || ![productId isKindOfClass:[NSString class]]) {
productId = nil;
}
id quantity = [properties objectForKey:@"quantity"];
if (!quantity || ![quantity isKindOfClass:[NSNumber class]]) {
quantity = [NSNumber numberWithInt:1];
}
id receipt = [properties objectForKey:@"receipt"];
if (!receipt || ![receipt isKindOfClass:[NSString class]]) {
receipt = nil;
}
[self.amplitude logRevenue:productId
quantity:[quantity integerValue]
price:revenueOrTotal
receipt:receipt];
SEGLog(@"[Amplitude logRevenue:%@ quantity:%d price:%@ receipt:%@];", productId, [quantity integerValue], revenueOrTotal, receipt);
return;
}

// fallback to logRevenue v1
NSString *productId = [properties objectForKey:@"productId"] ?: [properties objectForKey:@"product_id"] ?: nil;
NSNumber *quantity = [properties objectForKey:@"quantity"] ?: [NSNumber numberWithInt:1];
id receipt = [properties objectForKey:@"receipt"] ?: nil;
[self.amplitude logRevenue:productId
quantity:[quantity integerValue]
price:revenueOrTotal
receipt:receipt];
SEGLog(@"[Amplitude logRevenue:%@ quantity:%d price:%@ receipt:%@];", productId, [quantity integerValue], revenueOrTotal, receipt);
}

- (void)trackLogRevenueV2:(NSDictionary *)properties andRevenueOrTotal:(NSNumber *)revenueOrTotal
{
id price = [properties objectForKey:@"price"];
id quantity = [properties objectForKey:@"quantity"];

// if no price fallback to using revenue
if (!price || ![price isKindOfClass:[NSNumber class]]) {
price = revenueOrTotal;
quantity = [NSNumber numberWithInt:1];
} else if (!quantity || ![quantity isKindOfClass:[NSNumber class]]) {
quantity = [NSNumber numberWithInt:1];
}

NSNumber *price = [properties objectForKey:@"price"] ?: revenueOrTotal;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could use the shorthand properties[@"price"] syntax here

NSNumber *quantity = [properties objectForKey:@"quantity"] ?: [NSNumber numberWithInt:1];
[[self.amprevenue setPrice:price] setQuantity:[quantity integerValue]];
SEGLog(@"[[AMPRevenue revenue] setPrice:%@] setQuantity: %d];", price, [quantity integerValue]);

id productId = [properties objectForKey:@"productId"] ?: [properties objectForKey:@"product_id"];
if (productId && [productId isKindOfClass:[NSString class]] && ![productId isEqualToString:@""]) {
NSString *productId = [properties objectForKey:@"productId"] ?: [properties objectForKey:@"product_id"];
if (productId && ![productId isEqualToString:@""]) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is gonna crash if productId is not a NSString for some reason. You don't have compile time guarantee, so you're better off protecting against it.

[self.amprevenue setProductIdentifier:productId];
SEGLog(@"[[AMPRevenue revenue] setProductIdentifier:%@];", productId);
}

//Receipt is meant to be of type NSData
// Amplitude throws a warning that receipt is meant to be of type NSData. Previously, Segment checked for only type NSString. For backwards capability, removed the check
id receipt = [properties objectForKey:@"receipt"];
if (receipt && [receipt isKindOfClass:[NSString class]] && ![receipt isEqualToString:@""]) {
if (receipt) {
[self.amprevenue setReceipt:receipt];
SEGLog(@"[[AMPRevenue revenue] setReceipt:%@];", receipt);
}
id revenueType = [properties objectForKey:@"revenueType"] ?: [properties objectForKey:@"revenue_type"];
if (revenueType && [revenueType isKindOfClass:[NSString class]] && ![revenueType isEqualToString:@""]) {

NSString *revenueType = [properties objectForKey:@"revenueType"] ?: [properties objectForKey:@"revenue_type"];
if (revenueType && ![revenueType isEqualToString:@""]) {
[self.amprevenue setRevenueType:revenueType];
SEGLog(@"[AMPRevenue revenue] setRevenueType:%@];", revenueType);
}
NSLog(@"Price : %@, Quantity : %@", price, quantity);

[self.amplitude logRevenueV2:self.amprevenue];
SEGLog(@"[Amplitude logRevenueV2:%@];", self.amprevenue);
}
Expand Down