feat: SQDSDKS-7423 - Add event mapping functionality and new MPRoktEventMapper class #16
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 | ||
|---|---|---|---|---|
|
|
@@ -8,10 +8,12 @@ | |||
|
|
||||
| /* Begin PBXBuildFile section */ | ||||
| 2502325C2D7A7BF3004794A2 /* Rokt-Widget in Frameworks */ = {isa = PBXBuildFile; productRef = 2502325B2D7A7BF3004794A2 /* Rokt-Widget */; }; | ||||
| 7E15B20B2D9AE82600C1FF3E /* Rokt-Widget in Frameworks */ = {isa = PBXBuildFile; productRef = 7E15B20A2D9AE82600C1FF3E /* Rokt-Widget */; }; | ||||
| 7EDDAAB02E05A88E00D089CF /* mParticle-Apple-SDK in Frameworks */ = {isa = PBXBuildFile; productRef = 7EDDAAAF2E05A88E00D089CF /* mParticle-Apple-SDK */; }; | ||||
| 7EDDAAB22E05A89B00D089CF /* mParticle-Apple-SDK in Frameworks */ = {isa = PBXBuildFile; productRef = 7EDDAAB12E05A89B00D089CF /* mParticle-Apple-SDK */; }; | ||||
| 7EE7F13E2DA95BEE006C5440 /* OCMock in Frameworks */ = {isa = PBXBuildFile; productRef = 7EE7F13D2DA95BEE006C5440 /* OCMock */; }; | ||||
| B34CE55A2E04356F00712DE1 /* MPRoktEventMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D778512E02845700D887A4 /* MPRoktEventMapper.swift */; }; | ||||
| B3D778532E02845700D887A4 /* MPRoktEventMapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = B3D778512E02845700D887A4 /* MPRoktEventMapper.swift */; }; | ||||
| DBB01A601DC1478A00A7B188 /* mParticle_Rokt.h in Headers */ = {isa = PBXBuildFile; fileRef = DBB01A5E1DC1478A00A7B188 /* mParticle_Rokt.h */; settings = {ATTRIBUTES = (Public, ); }; }; | ||||
| DBB01A681DC1480700A7B188 /* MPKitRokt.h in Headers */ = {isa = PBXBuildFile; fileRef = DBB01A661DC1480700A7B188 /* MPKitRokt.h */; }; | ||||
| DBB01A691DC1480700A7B188 /* MPKitRokt.m in Sources */ = {isa = PBXBuildFile; fileRef = DBB01A671DC1480700A7B188 /* MPKitRokt.m */; }; | ||||
|
|
@@ -30,6 +32,7 @@ | |||
| /* End PBXContainerItemProxy section */ | ||||
|
|
||||
| /* Begin PBXFileReference section */ | ||||
| B3D778512E02845700D887A4 /* MPRoktEventMapper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPRoktEventMapper.swift; sourceTree = "<group>"; }; | ||||
| DBB01A5B1DC1478A00A7B188 /* mParticle_Rokt.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = mParticle_Rokt.framework; sourceTree = BUILT_PRODUCTS_DIR; }; | ||||
| DBB01A5E1DC1478A00A7B188 /* mParticle_Rokt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mParticle_Rokt.h; sourceTree = "<group>"; }; | ||||
| DBB01A5F1DC1478A00A7B188 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; | ||||
|
|
@@ -45,18 +48,18 @@ | |||
| isa = PBXFrameworksBuildPhase; | ||||
| buildActionMask = 2147483647; | ||||
| files = ( | ||||
| 7EDDAAB02E05A88E00D089CF /* mParticle-Apple-SDK in Frameworks */, | ||||
| 2502325C2D7A7BF3004794A2 /* Rokt-Widget in Frameworks */, | ||||
| ); | ||||
| runOnlyForDeploymentPostprocessing = 0; | ||||
| }; | ||||
| FF0BB638217A84E800B0556C /* Frameworks */ = { | ||||
| isa = PBXFrameworksBuildPhase; | ||||
| buildActionMask = 2147483647; | ||||
| files = ( | ||||
| FF0BB640217A84E800B0556C /* mParticle_Rokt.framework in Frameworks */, | ||||
| 7EE7F13E2DA95BEE006C5440 /* OCMock in Frameworks */, | ||||
| 7EDDAAB22E05A89B00D089CF /* mParticle-Apple-SDK in Frameworks */, | ||||
| 7E15B20B2D9AE82600C1FF3E /* Rokt-Widget in Frameworks */, | ||||
| ); | ||||
| runOnlyForDeploymentPostprocessing = 0; | ||||
|
|
@@ -86,6 +89,7 @@ | |||
| DBB01A5D1DC1478A00A7B188 /* mParticle-Rokt */ = { | ||||
| isa = PBXGroup; | ||||
| children = ( | ||||
| B3D778512E02845700D887A4 /* MPRoktEventMapper.swift */, | ||||
| DBB01A661DC1480700A7B188 /* MPKitRokt.h */, | ||||
| DBB01A671DC1480700A7B188 /* MPKitRokt.m */, | ||||
| DBB01A5E1DC1478A00A7B188 /* mParticle_Rokt.h */, | ||||
|
|
@@ -140,8 +144,8 @@ | |||
| ); | ||||
| name = "mParticle-Rokt"; | ||||
| packageProductDependencies = ( | ||||
| 2502325B2D7A7BF3004794A2 /* Rokt-Widget */, | ||||
| 7EDDAAAF2E05A88E00D089CF /* mParticle-Apple-SDK */, | ||||
| ); | ||||
| productName = "mParticle-Rokt"; | ||||
| productReference = DBB01A5B1DC1478A00A7B188 /* mParticle_Rokt.framework */; | ||||
|
|
@@ -176,10 +180,12 @@ | |||
| TargetAttributes = { | ||||
| DBB01A5A1DC1478A00A7B188 = { | ||||
| CreatedOnToolsVersion = 8.0; | ||||
| LastSwiftMigration = 1640; | ||||
| ProvisioningStyle = Automatic; | ||||
| }; | ||||
| FF0BB63A217A84E800B0556C = { | ||||
| CreatedOnToolsVersion = 10.0; | ||||
| LastSwiftMigration = 1640; | ||||
| ProvisioningStyle = Automatic; | ||||
| }; | ||||
| }; | ||||
|
|
@@ -194,9 +200,9 @@ | |||
| ); | ||||
| mainGroup = DBB01A511DC1478A00A7B188; | ||||
| packageReferences = ( | ||||
| 2502325A2D7A7BF3004794A2 /* XCRemoteSwiftPackageReference "rokt-sdk-ios" */, | ||||
| 7EE7F13C2DA95BEE006C5440 /* XCRemoteSwiftPackageReference "ocmock" */, | ||||
| 7EDDAAAE2E05A88E00D089CF /* XCRemoteSwiftPackageReference "mparticle-apple-sdk" */, | ||||
| ); | ||||
| productRefGroup = DBB01A5C1DC1478A00A7B188 /* Products */; | ||||
| projectDirPath = ""; | ||||
|
|
@@ -230,6 +236,7 @@ | |||
| isa = PBXSourcesBuildPhase; | ||||
| buildActionMask = 2147483647; | ||||
| files = ( | ||||
| B34CE55A2E04356F00712DE1 /* MPRoktEventMapper.swift in Sources */, | ||||
| DBB01A691DC1480700A7B188 /* MPKitRokt.m in Sources */, | ||||
| ); | ||||
| runOnlyForDeploymentPostprocessing = 0; | ||||
|
|
@@ -238,6 +245,7 @@ | |||
| isa = PBXSourcesBuildPhase; | ||||
| buildActionMask = 2147483647; | ||||
| files = ( | ||||
| B3D778532E02845700D887A4 /* MPRoktEventMapper.swift in Sources */, | ||||
|
There was a problem hiding this comment. MPRoktEventMapper.swift is listed twice under PBXSourcesBuildPhase, leading to duplicate file references. Remove the extra entry.
Suggested change
|
||||
| FF0BB63E217A84E800B0556C /* mParticle_RoktTests.m in Sources */, | ||||
| ); | ||||
| runOnlyForDeploymentPostprocessing = 0; | ||||
|
|
@@ -278,6 +286,7 @@ | |||
| COPY_PHASE_STRIP = NO; | ||||
| CURRENT_PROJECT_VERSION = 1; | ||||
| DEBUG_INFORMATION_FORMAT = dwarf; | ||||
| DEFINES_MODULE = YES; | ||||
| ENABLE_STRICT_OBJC_MSGSEND = YES; | ||||
| ENABLE_TESTABILITY = YES; | ||||
| GCC_C_LANGUAGE_STANDARD = gnu99; | ||||
|
|
@@ -329,6 +338,7 @@ | |||
| COPY_PHASE_STRIP = NO; | ||||
| CURRENT_PROJECT_VERSION = 1; | ||||
| DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; | ||||
| DEFINES_MODULE = YES; | ||||
| ENABLE_NS_ASSERTIONS = NO; | ||||
| ENABLE_STRICT_OBJC_MSGSEND = YES; | ||||
| GCC_C_LANGUAGE_STANDARD = gnu99; | ||||
|
|
@@ -352,6 +362,7 @@ | |||
| DBB01A641DC1478A00A7B188 /* Debug */ = { | ||||
| isa = XCBuildConfiguration; | ||||
| buildSettings = { | ||||
| CLANG_ENABLE_MODULES = YES; | ||||
| CODE_SIGN_IDENTITY = ""; | ||||
| DEFINES_MODULE = YES; | ||||
| DYLIB_COMPATIBILITY_VERSION = 1; | ||||
|
|
@@ -371,12 +382,15 @@ | |||
| PRODUCT_BUNDLE_IDENTIFIER = "com.mparticle.mParticle-Rokt"; | ||||
| PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; | ||||
| SKIP_INSTALL = YES; | ||||
| SWIFT_OPTIMIZATION_LEVEL = "-Onone"; | ||||
| SWIFT_VERSION = 6.0; | ||||
| }; | ||||
| name = Debug; | ||||
| }; | ||||
| DBB01A651DC1478A00A7B188 /* Release */ = { | ||||
| isa = XCBuildConfiguration; | ||||
| buildSettings = { | ||||
| CLANG_ENABLE_MODULES = YES; | ||||
| CODE_SIGN_IDENTITY = ""; | ||||
| DEFINES_MODULE = YES; | ||||
| DYLIB_COMPATIBILITY_VERSION = 1; | ||||
|
|
@@ -396,6 +410,7 @@ | |||
| PRODUCT_BUNDLE_IDENTIFIER = "com.mparticle.mParticle-Rokt"; | ||||
| PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; | ||||
| SKIP_INSTALL = YES; | ||||
| SWIFT_VERSION = 6.0; | ||||
| }; | ||||
| name = Release; | ||||
| }; | ||||
|
|
@@ -404,6 +419,7 @@ | |||
| buildSettings = { | ||||
| CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; | ||||
| CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; | ||||
| CLANG_ENABLE_MODULES = YES; | ||||
| CLANG_ENABLE_OBJC_WEAK = YES; | ||||
| CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; | ||||
| CLANG_WARN_COMMA = YES; | ||||
|
|
@@ -433,6 +449,8 @@ | |||
| MTL_FAST_MATH = YES; | ||||
| PRODUCT_BUNDLE_IDENTIFIER = "com.mparticle.mParticle-RoktTests"; | ||||
| PRODUCT_NAME = "$(TARGET_NAME)"; | ||||
| SWIFT_OPTIMIZATION_LEVEL = "-Onone"; | ||||
| SWIFT_VERSION = 6.0; | ||||
| TARGETED_DEVICE_FAMILY = "1,2"; | ||||
| }; | ||||
| name = Debug; | ||||
|
|
@@ -442,6 +460,7 @@ | |||
| buildSettings = { | ||||
| CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; | ||||
| CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; | ||||
| CLANG_ENABLE_MODULES = YES; | ||||
| CLANG_ENABLE_OBJC_WEAK = YES; | ||||
| CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; | ||||
| CLANG_WARN_COMMA = YES; | ||||
|
|
@@ -470,6 +489,7 @@ | |||
| MTL_FAST_MATH = YES; | ||||
| PRODUCT_BUNDLE_IDENTIFIER = "com.mparticle.mParticle-RoktTests"; | ||||
| PRODUCT_NAME = "$(TARGET_NAME)"; | ||||
| SWIFT_VERSION = 6.0; | ||||
| TARGETED_DEVICE_FAMILY = "1,2"; | ||||
| }; | ||||
| name = Release; | ||||
|
|
@@ -515,9 +535,9 @@ | |||
| minimumVersion = 4.8.1; | ||||
| }; | ||||
| }; | ||||
| 7EDDAAAE2E05A88E00D089CF /* XCRemoteSwiftPackageReference "mparticle-apple-sdk" */ = { | ||||
| isa = XCRemoteSwiftPackageReference; | ||||
| repositoryURL = "https://github.com/mParticle/mparticle-apple-sdk.git"; | ||||
| requirement = { | ||||
| kind = upToNextMajorVersion; | ||||
| minimumVersion = 8.4.0; | ||||
|
|
@@ -539,20 +559,20 @@ | |||
| package = 2502325A2D7A7BF3004794A2 /* XCRemoteSwiftPackageReference "rokt-sdk-ios" */; | ||||
| productName = "Rokt-Widget"; | ||||
| }; | ||||
| 7E15B20A2D9AE82600C1FF3E /* Rokt-Widget */ = { | ||||
| isa = XCSwiftPackageProductDependency; | ||||
| package = 2502325A2D7A7BF3004794A2 /* XCRemoteSwiftPackageReference "rokt-sdk-ios" */; | ||||
| productName = "Rokt-Widget"; | ||||
| }; | ||||
| 7EDDAAAF2E05A88E00D089CF /* mParticle-Apple-SDK */ = { | ||||
| isa = XCSwiftPackageProductDependency; | ||||
| package = 7EDDAAAE2E05A88E00D089CF /* XCRemoteSwiftPackageReference "mparticle-apple-sdk" */; | ||||
| productName = "mParticle-Apple-SDK"; | ||||
| }; | ||||
| 7EDDAAB12E05A89B00D089CF /* mParticle-Apple-SDK */ = { | ||||
| isa = XCSwiftPackageProductDependency; | ||||
| package = 7EDDAAAE2E05A88E00D089CF /* XCRemoteSwiftPackageReference "mparticle-apple-sdk" */; | ||||
| productName = "mParticle-Apple-SDK"; | ||||
| }; | ||||
| 7EE7F13D2DA95BEE006C5440 /* OCMock */ = { | ||||
| isa = XCSwiftPackageProductDependency; | ||||
|
|
||||
This file contains hidden or 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 hidden or 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 |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| import Foundation | ||
| import mParticle_Apple_SDK | ||
| import Rokt_Widget | ||
|
|
||
| /// Utility class for mapping Rokt events to mParticle events | ||
| @objc(MPRoktEventMapper) | ||
| @objcMembers | ||
| public class MPRoktEventMapper: NSObject { | ||
|
|
||
| /// Maps a RoktEvent to the corresponding MPRoktEvent | ||
| /// - Parameter event: The RoktEvent to map | ||
| /// - Returns: The mapped MPRoktEvent, or nil if mapping fails | ||
| @objc(mapEvent:) | ||
| public static func mapEvent(_ event: RoktEvent) -> MPRoktEvent? { | ||
| switch event { | ||
| case let initComplete as RoktEvent.InitComplete: | ||
| return MPRoktEvent.MPRoktInitComplete(success: initComplete.success) | ||
|
|
||
| case is RoktEvent.ShowLoadingIndicator: | ||
| return MPRoktEvent.MPRoktShowLoadingIndicator() | ||
|
|
||
| case is RoktEvent.HideLoadingIndicator: | ||
| return MPRoktEvent.MPRoktHideLoadingIndicator() | ||
|
|
||
| case let placementInteractive as RoktEvent.PlacementInteractive: | ||
| return MPRoktEvent.MPRoktPlacementInteractive(placementId: placementInteractive.placementId) | ||
|
|
||
| case let placementReady as RoktEvent.PlacementReady: | ||
| return MPRoktEvent.MPRoktPlacementReady(placementId: placementReady.placementId) | ||
|
|
||
| case let offerEngagement as RoktEvent.OfferEngagement: | ||
| return MPRoktEvent.MPRoktOfferEngagement(placementId: offerEngagement.placementId) | ||
|
|
||
| case let openUrl as RoktEvent.OpenUrl: | ||
| return MPRoktEvent.MPRoktOpenUrl(placementId: openUrl.placementId, url: openUrl.url) | ||
|
|
||
| case let positiveEngagement as RoktEvent.PositiveEngagement: | ||
| return MPRoktEvent.MPRoktPositiveEngagement(placementId: positiveEngagement.placementId) | ||
|
|
||
| case let placementClosed as RoktEvent.PlacementClosed: | ||
| return MPRoktEvent.MPRoktPlacementClosed(placementId: placementClosed.placementId) | ||
|
|
||
| case let placementCompleted as RoktEvent.PlacementCompleted: | ||
| return MPRoktEvent.MPRoktPlacementCompleted(placementId: placementCompleted.placementId) | ||
|
|
||
| case let placementFailure as RoktEvent.PlacementFailure: | ||
| return MPRoktEvent.MPRoktPlacementFailure(placementId: placementFailure.placementId) | ||
|
|
||
| case let firstPositiveEngagement as RoktEvent.FirstPositiveEngagement: | ||
| return MPRoktEvent.MPRoktFirstPositiveEngagement( | ||
| placementId: firstPositiveEngagement.placementId | ||
| ) | ||
|
|
||
| case let cartItemInstantPurchase as RoktEvent.CartItemInstantPurchase: | ||
| return MPRoktEvent.MPRoktCartItemInstantPurchase( | ||
| placementId: cartItemInstantPurchase.placementId, | ||
| name: cartItemInstantPurchase.name ?? "", | ||
| cartItemId: cartItemInstantPurchase.cartItemId, | ||
| catalogItemId: cartItemInstantPurchase.catalogItemId, | ||
| currency: cartItemInstantPurchase.currency, | ||
| description: cartItemInstantPurchase.description, | ||
| linkedProductId: cartItemInstantPurchase.linkedProductId, | ||
| providerData: cartItemInstantPurchase.providerData, | ||
| quantity: cartItemInstantPurchase.quantity, | ||
| totalPrice: cartItemInstantPurchase.totalPrice, | ||
| unitPrice: cartItemInstantPurchase.unitPrice | ||
| ) | ||
|
|
||
| default: | ||
| return nil | ||
| } | ||
| } | ||
| } |
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
The podspec declares Swift version '5.3' but the Xcode project is set to Swift 6.0. Align the podspec
swift_versionwith the project to avoid compatibility issues.