changes for alias

rudderlabs · Apr 9, 2020 · eb44395 · eb44395
1 parent c2831cd
commit eb44395
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 6 deletions.
diff --git a/Example/Rudder/_AppDelegate.m b/Example/Rudder/_AppDelegate.m
@@ -9,9 +9,9 @@
 #import "_AppDelegate.h"
 #import <Rudder/Rudder.h>
 
-static NSString *DATA_PLANE_URL = @"https://37815361.ngrok.io";
-static NSString *CONTROL_PLANE_URL = @"https://37815361.ngrok.io";
-static NSString *WRITE_KEY = @"1ZTkZgCMnZyXeWsFbcjGsOx4jnv";
+static NSString *DATA_PLANE_URL = @"https://94e4b60b.ngrok.io";
+static NSString *CONTROL_PLANE_URL = @"https://94e4b60b.ngrok.io";
+static NSString *WRITE_KEY = @"1aJ7rcn6Q7Ck1uOTfLjDd4AShrT";
 
 @implementation _AppDelegate
 

diff --git a/Example/Rudder/_ViewController.m b/Example/Rudder/_ViewController.m
@@ -35,6 +35,7 @@ - (void)viewDidLoad
     [[RudderClient sharedInstance] reset];
 
     [[RudderClient sharedInstance] track:@"reset_track_event"];
+    [[RudderClient sharedInstance] alias:@"Ruchira_new"];
 }
 
 - (void)didReceiveMemoryWarning

diff --git a/Rudder/Classes/RudderClient.m b/Rudder/Classes/RudderClient.m
@@ -10,6 +10,7 @@
 #import "EventRepository.h"
 #import "RudderMessageBuilder.h"
 #import "RudderElementCache.h"
+#import "RudderLogger.h"
 
 static RudderClient *_instance = nil;
 static EventRepository *_repository = nil;
@@ -116,6 +117,9 @@ - (void)group:(NSString *)groupId traits:(NSDictionary<NSString *,NSObject *> *)
 
 -(void)aliasWithMessage:(RudderMessage *)message {
     if(_repository != nil && message !=nil){
+        // update cached traits and persist
+               [RudderElementCache updateTraitsDict:message.context.traits];
+               [RudderElementCache persistTraits];
         message.type = @"alias";
         [_repository dump:message];
     }
@@ -128,6 +132,21 @@ -(void) aliasWithBuilder:(RudderMessageBuilder *)builder {
 - (void)alias:(NSString *)newId {
     RudderMessageBuilder *builder =[[RudderMessageBuilder alloc] init];
     [builder setUserId:newId];
+    RudderContext *rc = [RudderElementCache getContext];
+    [RudderLogger logDebug:@"Ruchira traits"];
+    [RudderLogger logDebug:[[NSString alloc] initWithFormat:@"dump: %@", rc]];
+
+       NSMutableDictionary<NSString*,NSObject*>* traits = rc.traits;
+      [RudderLogger logDebug:[[NSString alloc] initWithFormat:@"dump: %@", traits]];
+
+        NSObject *prevId = [traits objectForKey:@"anonymousId"];
+         NSString *stringPrevId = [NSString stringWithFormat:@"%@", prevId];
+
+         [builder setPreviousId:stringPrevId];
+    RudderTraits* traitsCopy = [[RudderTraits alloc] init];
+    [traitsCopy setUserId:newId];
+     [builder setTraits:traitsCopy];
+
     [self aliasWithMessage:[builder build]];
 
 
@@ -138,12 +157,20 @@ - (void)alias:(NSString *)newId options:(NSDictionary<NSString *,NSObject *> *)o
     [builder setUserId:newId];
 
     RudderContext *rc = [RudderElementCache getContext];
+    [RudderLogger logDebug:@"Ruchira traits"];
+       [RudderLogger logDebug:[[NSString alloc] initWithFormat:@"dump: %@", rc]];
     NSMutableDictionary<NSString*,NSObject*>* traits = rc.traits;
+      [RudderLogger logDebug:[[NSString alloc] initWithFormat:@"dump: %@", traits]];
+    NSObject *prevId = [traits objectForKey:@"userId"];
 
-    NSString *prevId = [traits objectForKey:@"userId"].description;
-
-    [builder setPreviousId:prevId];
+    NSString *stringPrevId = [NSString stringWithFormat:@"%@", prevId];
 
+    [builder setPreviousId:stringPrevId];
+      RudderOption *optionsObj = [[RudderOption alloc] initWithDict:options];
+    [builder setRudderOption:optionsObj];
+    RudderTraits* traitsCopy = [[RudderTraits alloc] init];
+    [traitsCopy setUserId:newId];
+     [builder setTraits:traitsCopy];
     [self aliasWithMessage:[builder build]];
 
 

diff --git a/Rudder/Classes/RudderMessage.m b/Rudder/Classes/RudderMessage.m
@@ -20,6 +20,7 @@ - (instancetype)init
         _channel = @"mobile";
         _context = [RudderElementCache getContext];
         _originalTimestamp = [Utils getTimestamp];
+        _previousId = [[NSString alloc]init];
         _anonymousId = [[NSString alloc] initWithFormat:@"%@", [_context.traits objectForKey:@"anonymousId"]];
         NSObject *userIdObj = [_context.traits objectForKey:@"userId"];
         if (userIdObj != nil) {
@@ -38,6 +39,7 @@ - (instancetype)init
     [tempDict setValue:_type forKey:@"type"];
     [tempDict setValue:_action forKey:@"action"];
     [tempDict setValue:_originalTimestamp forKey:@"originalTimestamp"];
+    [tempDict setValue:_previousId forKey:@"previousId"];
     [tempDict setValue:_anonymousId forKey:@"anonymousId"];
     if (_userId != nil) {
         [tempDict setValue:_userId forKey:@"userId"];