fix: forward original event names to UI for kits with mapped events #301
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -801,7 +801,7 @@ - (MPKitFilter *)filter:(id<MPExtensionKitProtocol>)kitRegister forCommerceEvent | |
|
|
||
| if (!projectedEvents.empty()) { | ||
| for (auto &projectedEvent : projectedEvents) { | ||
| kitFilter = [[MPKitFilter alloc] initWithEvent:projectedEvent shouldFilter:NO appliedProjections:appliedProjectionsArray eventCopy:nil commerceEventCopy:commerceEvent]; | ||
| [self attemptToLogEventToKit:kitRegister kitFilter:kitFilter selector:@selector(logEvent:) parameters:nil messageType:MPMessageTypeEvent userInfo:[[NSDictionary alloc] init]]; | ||
| } | ||
| } | ||
|
|
@@ -905,7 +905,7 @@ - (MPKitFilter *)filter:(id<MPExtensionKitProtocol>)kitRegister forEvent:(MPEven | |
| NSArray<MPEventProjection *> *appliedProjectionsArray = !appliedProjections.empty() ? [NSArray arrayWithObjects:&appliedProjections[0] count:appliedProjections.size()] : nil; | ||
|
|
||
| for (auto &projectedEvent : projectedEvents) { | ||
| kitFilter = [[MPKitFilter alloc] initWithEvent:projectedEvent shouldFilter:shouldFilter appliedProjections:appliedProjectionsArray eventCopy:event commerceEventCopy:nil]; | ||
| SEL mutableSelector = selector; | ||
| if (selector == @selector(logScreen:)) { | ||
| for (int i = 0; i < appliedProjectionsArray.count; i += 1) { | ||
|
|
@@ -2212,13 +2212,7 @@ - (void)attemptToLogCommerceEventToKit:(id<MPExtensionKitProtocol>)kitRegister k | |
| if (execStatus.success && ![lastKit isEqualToNumber:currentKit]) { | ||
| lastKit = currentKit; | ||
|
|
||
| [self forwardCommerceEventRecord:kitFilter execStatus:execStatus commerceEvent:kitFilter.originalCommerceEvent]; | ||
| MPILogDebug(@"Forwarded logCommerceEvent call to kit: %@", kitRegister.name); | ||
| } | ||
| }); | ||
|
|
@@ -2339,28 +2333,49 @@ - (void)attemptToLogEventToKit:(id<MPExtensionKitProtocol>)kitRegister kitFilter | |
| if (execStatus.success && ![lastKit isEqualToNumber:currentKit] && messageType != MPMessageTypeUnknown && messageType != MPMessageTypeMedia) { | ||
| lastKit = currentKit; | ||
|
|
||
| if (!kitFilter.appliedProjections) { | ||
| [self forwardEventRecord:kitFilter messageType:messageType userInfo:userInfo execStatus:execStatus event:kitFilter.originalEvent]; | ||
| } else if (kitFilter.originalCommerceEventCopy) { | ||
| [self forwardCommerceEventRecord:kitFilter execStatus:execStatus commerceEvent:kitFilter.originalCommerceEventCopy]; | ||
| } else if (kitFilter.originalEventCopy) { | ||
| [self forwardEventRecord:kitFilter messageType:messageType userInfo:userInfo execStatus:execStatus event:kitFilter.originalEventCopy]; | ||
| } | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| - (void)forwardEventRecord:(MPKitFilter *)kitFilter messageType:(MPMessageType)messageType userInfo:(NSDictionary *)userInfo execStatus:(MPKitExecStatus*) execStatus event:(MPBaseEvent *)event{ | ||
| MPForwardRecord *forwardRecord = nil; | ||
|
|
||
| if (messageType == MPMessageTypeOptOut || messageType == MPMessageTypePushRegistration) { | ||
| forwardRecord = [[MPForwardRecord alloc] initWithMessageType:messageType | ||
| execStatus:execStatus | ||
| stateFlag:[userInfo[@"state"] boolValue]]; | ||
| } else { | ||
|
|
||
| forwardRecord = [[MPForwardRecord alloc] initWithMessageType:messageType | ||
| execStatus:execStatus | ||
| kitFilter:kitFilter | ||
| originalEvent:event]; | ||
| } | ||
|
|
||
| if (forwardRecord != nil) { | ||
| dispatch_async([MParticle messageQueue], ^{ | ||
| [[MParticle sharedInstance].persistenceController saveForwardRecord:forwardRecord]; | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| - (void)forwardCommerceEventRecord:(MPKitFilter *)kitFilter execStatus:(MPKitExecStatus*) execStatus commerceEvent:(MPCommerceEvent *)commerceEvent{ | ||
| MPForwardRecord *forwardRecord = [[MPForwardRecord alloc] initWithMessageType:MPMessageTypeCommerceEvent | ||
| execStatus:execStatus | ||
| kitFilter:kitFilter | ||
| originalEvent:commerceEvent]; | ||
| dispatch_async([MParticle messageQueue], ^{ | ||
| [[MParticle sharedInstance].persistenceController saveForwardRecord:forwardRecord]; | ||
| }); | ||
| } | ||
|
|
||
| - (void)forwardSDKCall:(SEL)selector userAttributeKey:(NSString *)key value:(id)value kitHandler:(void (^)(id<MPKitProtocol> kit, MPKitConfiguration * _Nonnull kitConfiguration))kitHandler { | ||
| NSArray<id<MPExtensionKitProtocol>> *activeKitsRegistry = [self activeKitsRegistry]; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,8 @@ | |
| @property (nonatomic, strong, readonly, nullable) NSDictionary *filteredAttributes; | ||
| @property (nonatomic, strong, readonly, nullable) MPCommerceEvent *originalCommerceEvent; | ||
| @property (nonatomic, strong, readonly, nullable) MPBaseEvent *originalEvent; | ||
| @property (nonatomic, strong, readonly, nullable) MPCommerceEvent *originalCommerceEventCopy; | ||
| @property (nonatomic, strong, readonly, nullable) MPBaseEvent *originalEventCopy; | ||
| @property (nonatomic, strong, readonly, nullable) MPCommerceEvent *forwardCommerceEvent; | ||
| @property (nonatomic, strong, readonly, nullable) MPBaseEvent *forwardEvent; | ||
| @property (nonatomic, strong, readonly, nullable) MPConsentState *forwardConsentState; | ||
|
|
@@ -19,7 +21,7 @@ | |
| - (nonnull instancetype)initWithFilter:(BOOL)shouldFilter; | ||
| - (nonnull instancetype)initWithFilter:(BOOL)shouldFilter filteredAttributes:(nullable NSDictionary *)filteredAttributes; | ||
| - (nonnull instancetype)initWithEvent:(nonnull MPBaseEvent *)event shouldFilter:(BOOL)shouldFilter; | ||
| - (nonnull instancetype)initWithEvent:(nonnull MPBaseEvent *)event shouldFilter:(BOOL)shouldFilter appliedProjections:(nullable NSArray<MPEventProjection *> *)appliedProjections eventCopy:(nullable MPBaseEvent *)eventCopy commerceEventCopy:(nullable MPCommerceEvent *)commerceEventCopy; | ||
| - (nonnull instancetype)initWithCommerceEvent:(nonnull MPCommerceEvent *)commerceEvent shouldFilter:(BOOL)shouldFilter; | ||
| - (nonnull instancetype)initWithCommerceEvent:(nonnull MPCommerceEvent *)commerceEvent shouldFilter:(BOOL)shouldFilter appliedProjections:(nullable NSArray<MPEventProjection *> *)appliedProjections; | ||
| - (nonnull instancetype)initWithConsentState:(nonnull MPConsentState *)state shouldFilter:(BOOL)shouldFilter; | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,10 +27,10 @@ - (instancetype)initWithFilter:(BOOL)shouldFilter filteredAttributes:(NSDictiona | |
| } | ||
|
|
||
| - (instancetype)initWithEvent:(MPBaseEvent *)event shouldFilter:(BOOL)shouldFilter { | ||
| return [self initWithEvent:event shouldFilter:shouldFilter appliedProjections:nil eventCopy:nil commerceEventCopy:nil]; | ||
| } | ||
|
|
||
| - (instancetype)initWithEvent:(MPEvent *)event shouldFilter:(BOOL)shouldFilter appliedProjections:(NSArray<MPEventProjection *> *)appliedProjections eventCopy:(MPEvent *)eventCopy commerceEventCopy:(MPCommerceEvent *)commerceEventCopy{ | ||
| self = [self initWithFilter:shouldFilter filteredAttributes:event.customAttributes]; | ||
| if (!self) { | ||
| return nil; | ||
|
|
@@ -39,6 +39,8 @@ - (instancetype)initWithEvent:(MPEvent *)event shouldFilter:(BOOL)shouldFilter a | |
| _originalEvent = event; | ||
| _forwardEvent = event; | ||
| _appliedProjections = appliedProjections; | ||
| _originalEventCopy = eventCopy; | ||
| _originalCommerceEventCopy = commerceEventCopy; | ||
|
|
||
| return self; | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You should check that
originalEventis anMPEventbefore casting it.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added as well