Merge pull request #594 from BranchMetrics/SDK-1045/add-standard-events

[SDK-1045] Additional standard v2 events

Author: jdee

android/src/main/java/io/branch/rnbranch/RNBranchModule.java

@@ -55,6 +55,8 @@ public class RNBranchModule extends ReactContextBaseJavaModule {
     private static final String STANDARD_EVENT_ADD_PAYMENT_INFO = "STANDARD_EVENT_ADD_PAYMENT_INFO";
     private static final String STANDARD_EVENT_PURCHASE = "STANDARD_EVENT_PURCHASE";
     private static final String STANDARD_EVENT_SPEND_CREDITS = "STANDARD_EVENT_SPEND_CREDITS";
+    private static final String STANDARD_EVENT_VIEW_AD = "STANDARD_EVENT_VIEW_AD";
+    private static final String STANDARD_EVENT_CLICK_AD = "STANDARD_EVENT_CLICK_AD";
 
     private static final String STANDARD_EVENT_SEARCH = "STANDARD_EVENT_SEARCH";
     private static final String STANDARD_EVENT_VIEW_ITEM = "STANDARD_EVENT_VIEW_ITEM";
@@ -66,6 +68,11 @@ public class RNBranchModule extends ReactContextBaseJavaModule {
     private static final String STANDARD_EVENT_COMPLETE_TUTORIAL = "STANDARD_EVENT_COMPLETE_TUTORIAL";
     private static final String STANDARD_EVENT_ACHIEVE_LEVEL = "STANDARD_EVENT_ACHIEVE_LEVEL";
     private static final String STANDARD_EVENT_UNLOCK_ACHIEVEMENT = "STANDARD_EVENT_UNLOCK_ACHIEVEMENT";
+    private static final String STANDARD_EVENT_INVITE = "STANDARD_EVENT_INVITE";
+    private static final String STANDARD_EVENT_LOGIN = "STANDARD_EVENT_LOGIN";
+    private static final String STANDARD_EVENT_RESERVE = "STANDARD_EVENT_RESERVE";
+    private static final String STANDARD_EVENT_SUBSCRIBE = "STANDARD_EVENT_SUBSCRIBE";
+    private static final String STANDARD_EVENT_START_TRIAL = "STANDARD_EVENT_START_TRIAL";
 
     private static final String IDENT_FIELD_NAME = "ident";
     public static final String UNIVERSAL_OBJECT_NOT_FOUND_ERROR_CODE = "RNBranch::Error::BUONotFound";
@@ -266,6 +273,8 @@ public Map<String, Object> getConstants() {
         constants.put(STANDARD_EVENT_ADD_PAYMENT_INFO, BRANCH_STANDARD_EVENT.ADD_PAYMENT_INFO.getName());
         constants.put(STANDARD_EVENT_PURCHASE, BRANCH_STANDARD_EVENT.PURCHASE.getName());
         constants.put(STANDARD_EVENT_SPEND_CREDITS, BRANCH_STANDARD_EVENT.SPEND_CREDITS.getName());
+        constants.put(STANDARD_EVENT_VIEW_AD, BRANCH_STANDARD_EVENT.VIEW_AD.getName());
+        constants.put(STANDARD_EVENT_CLICK_AD, BRANCH_STANDARD_EVENT.CLICK_AD.getName());
 
         // Content Events
 
@@ -281,6 +290,11 @@ public Map<String, Object> getConstants() {
         constants.put(STANDARD_EVENT_COMPLETE_TUTORIAL , BRANCH_STANDARD_EVENT.COMPLETE_TUTORIAL.getName());
         constants.put(STANDARD_EVENT_ACHIEVE_LEVEL, BRANCH_STANDARD_EVENT.ACHIEVE_LEVEL.getName());
         constants.put(STANDARD_EVENT_UNLOCK_ACHIEVEMENT, BRANCH_STANDARD_EVENT.UNLOCK_ACHIEVEMENT.getName());
+        constants.put(STANDARD_EVENT_INVITE, BRANCH_STANDARD_EVENT.INVITE.getName());
+        constants.put(STANDARD_EVENT_LOGIN , BRANCH_STANDARD_EVENT.LOGIN.getName());
+        constants.put(STANDARD_EVENT_RESERVE, BRANCH_STANDARD_EVENT.RESERVE.getName());
+        constants.put(STANDARD_EVENT_SUBSCRIBE, BRANCH_STANDARD_EVENT.SUBSCRIBE.getName());
+        constants.put(STANDARD_EVENT_START_TRIAL, BRANCH_STANDARD_EVENT.START_TRIAL.getName());
 
         return constants;
     }

ios/RNBranch.m

@@ -113,6 +113,8 @@ + (void)setupBranchInstance:(Branch *)instance
              @"STANDARD_EVENT_ADD_PAYMENT_INFO": BranchStandardEventAddPaymentInfo,
              @"STANDARD_EVENT_PURCHASE": BranchStandardEventPurchase,
              @"STANDARD_EVENT_SPEND_CREDITS": BranchStandardEventSpendCredits,
+             @"STANDARD_EVENT_VIEW_AD": BranchStandardEventViewAd,
+             @"STANDARD_EVENT_CLICK_AD": BranchStandardEventClickAd,
 
              // Content Events
              @"STANDARD_EVENT_SEARCH": BranchStandardEventSearch,
@@ -125,7 +127,12 @@ + (void)setupBranchInstance:(Branch *)instance
              @"STANDARD_EVENT_COMPLETE_REGISTRATION": BranchStandardEventCompleteRegistration,
              @"STANDARD_EVENT_COMPLETE_TUTORIAL": BranchStandardEventCompleteTutorial,
              @"STANDARD_EVENT_ACHIEVE_LEVEL": BranchStandardEventAchieveLevel,
-             @"STANDARD_EVENT_UNLOCK_ACHIEVEMENT": BranchStandardEventUnlockAchievement
+             @"STANDARD_EVENT_UNLOCK_ACHIEVEMENT": BranchStandardEventUnlockAchievement,
+             @"STANDARD_EVENT_INVITE": BranchStandardEventInvite,
+             @"STANDARD_EVENT_LOGIN": BranchStandardEventLogin,
+             @"STANDARD_EVENT_RESERVE": BranchStandardEventReserve,
+             @"STANDARD_EVENT_SUBSCRIBE": BranchStandardEventSubscribe,
+             @"STANDARD_EVENT_START_TRIAL": BranchStandardEventStartTrial
              };
 }
 

native-tests/ios/NativeTestsTests/RNBranchTests.m

@@ -98,7 +98,7 @@ - (void)testStandardRateEventConstant
     ASSERT_CONSTANT(@"STANDARD_EVENT_RATE", BranchStandardEventRate);
 }
 
-- (void)testStandardRateEventShareConstant
+- (void)testStandardShareEventConstant
 {
     ASSERT_CONSTANT(@"STANDARD_EVENT_SHARE", BranchStandardEventShare);
 }
@@ -123,4 +123,39 @@ - (void)testStandardUnlockAchievementEventConstant
     ASSERT_CONSTANT(@"STANDARD_EVENT_UNLOCK_ACHIEVEMENT", BranchStandardEventUnlockAchievement);
 }
 
+- (void)testStandardViewAdEventConstant
+{
+    ASSERT_CONSTANT(@"STANDARD_EVENT_VIEW_AD", BranchStandardEventViewAd);
+}
+
+- (void)testStandardClickAdEventConstant
+{
+    ASSERT_CONSTANT(@"STANDARD_EVENT_CLICK_AD", BranchStandardEventClickAd);
+}
+
+- (void)testStandardInviteEventConstant
+{
+    ASSERT_CONSTANT(@"STANDARD_EVENT_INVITE", BranchStandardEventInvite);
+}
+
+- (void)testStandardLoginEventConstant
+{
+    ASSERT_CONSTANT(@"STANDARD_EVENT_LOGIN", BranchStandardEventLogin);
+}
+
+- (void)testStandardSubscribeEventConstant
+{
+    ASSERT_CONSTANT(@"STANDARD_EVENT_SUBSCRIBE", BranchStandardEventSubscribe);
+}
+
+- (void)testStandardStartTrialEventConstant
+{
+    ASSERT_CONSTANT(@"STANDARD_EVENT_START_TRIAL", BranchStandardEventStartTrial);
+}
+
+- (void)testStandardReserveEventConstant
+{
+    ASSERT_CONSTANT(@"STANDARD_EVENT_RESERVE", BranchStandardEventReserve);
+}
+
 @end

src/BranchEvent.js

@@ -243,6 +243,18 @@ BranchEvent.Purchase = RNBranch.STANDARD_EVENT_PURCHASE
  */
 BranchEvent.SpendCredits = RNBranch.STANDARD_EVENT_SPEND_CREDITS
 
+/**
+ * Standard View Ad event
+ * @type {string}
+ */
+BranchEvent.ViewAd = RNBranch.STANDARD_EVENT_VIEW_AD
+
+/**
+ * Standard Click Ad event
+ * @type {string}
+ */
+BranchEvent.ClickAd = RNBranch.STANDARD_EVENT_CLICK_AD
+
 // Content events
 
 /**
@@ -300,3 +312,33 @@ BranchEvent.AchieveLevel = RNBranch.STANDARD_EVENT_ACHIEVE_LEVEL
  * @type {string}
  */
 BranchEvent.UnlockAchievement = RNBranch.STANDARD_EVENT_UNLOCK_ACHIEVEMENT
+
+/**
+ * Standard Invite event
+ * @type {string}
+ */
+BranchEvent.Invite = RNBranch.STANDARD_EVENT_INVITE
+
+/**
+ * Standard Login event
+ * @type {string}
+ */
+BranchEvent.Login = RNBranch.STANDARD_EVENT_LOGIN
+
+/**
+ * Standard Reserve event
+ * @type {string}
+ */
+BranchEvent.Reserve = RNBranch.STANDARD_EVENT_RESERVE
+
+/**
+ * Standard Subscribe event
+ * @type {string}
+ */
+BranchEvent.Subscribe = RNBranch.STANDARD_EVENT_SUBSCRIBE
+
+/**
+ * Standard Start Trial event
+ * @type {string}
+ */
+BranchEvent.StartTrial = RNBranch.STANDARD_EVENT_START_TRIAL

test/BranchEvent.test.js

@@ -68,6 +68,34 @@ test('UnlockAchievement is correct', () => {
   expect(BranchEvent.UnlockAchievement).toBe(RNBranch.STANDARD_EVENT_UNLOCK_ACHIEVEMENT)
 })
 
+test('ViewAd is correct', () => {
+  expect(BranchEvent.ViewAd).toBe(RNBranch.STANDARD_EVENT_VIEW_AD)
+})
+
+test('ClickAd is correct', () => {
+  expect(BranchEvent.ClickAd).toBe(RNBranch.STANDARD_EVENT_CLICK_AD)
+})
+
+test('Invite is correct', () => {
+  expect(BranchEvent.Invite).toBe(RNBranch.STANDARD_EVENT_INVITE)
+})
+
+test('Login is correct', () => {
+  expect(BranchEvent.Login).toBe(RNBranch.STANDARD_EVENT_LOGIN)
+})
+
+test('Reserve is correct', () => {
+  expect(BranchEvent.Reserve).toBe(RNBranch.STANDARD_EVENT_RESERVE)
+})
+
+test('Subscribe is correct', () => {
+  expect(BranchEvent.Subscribe).toBe(RNBranch.STANDARD_EVENT_SUBSCRIBE)
+})
+
+test('StartTrial is correct', () => {
+  expect(BranchEvent.StartTrial).toBe(RNBranch.STANDARD_EVENT_START_TRIAL)
+})
+
 // --- Field mapping
 
 test('Name mapping is correct', () => {

test/RNBranchMock.js

@@ -12,6 +12,8 @@ NativeModules.RNBranch = {
   STANDARD_EVENT_ADD_PAYMENT_INFO: 'ADD_PAYMENT_INFO',
   STANDARD_EVENT_PURCHASE: 'PURCHASE',
   STANDARD_EVENT_SPEND_CREDITS: 'SPEND_CREDITS',
+  STANDARD_EVENT_VIEW_AD: 'VIEW_AD',
+  STANDARD_EVENT_CLICK_AD: 'CLICK_AD',
 
   STANDARD_EVENT_SEARCH: 'SEARCH',
   STANDARD_EVENT_VIEW_ITEM: 'VIEW_ITEM',
@@ -23,6 +25,11 @@ NativeModules.RNBranch = {
   STANDARD_EVENT_COMPLETE_TUTORIAL: 'COMPLETE_TUTORIAL',
   STANDARD_EVENT_ACHIEVE_LEVEL: 'ACHIEVE_LEVEL',
   STANDARD_EVENT_UNLOCK_ACHIEVEMENT: 'UNLOCK_ACHIEVEMENT',
+  STANDARD_EVENT_INVITE: 'INVITE',
+  STANDARD_EVENT_LOGIN: 'LOGIN',
+  STANDARD_EVENT_RESERVE: 'RESERVE',
+  STANDARD_EVENT_SUBSCRIBE: 'SUBSCRIBE',
+  STANDARD_EVENT_START_TRIAL: 'START_TRIAL',
 
   redeemInitSessionResult: jest.fn(() => Promise.resolve({
     params: {