Update Request Field Names and Format

Appended date in GMT format to branch_sdk_request_uuid in order to match it with Gateway format.
BranchMetrics · Oct 3, 2024 · c2082f9 · c2082f9
1 parent c114e12
commit c2082f9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/Sources/BranchSDK/BNCServerRequest.m b/Sources/BranchSDK/BNCServerRequest.m
@@ -14,8 +14,9 @@ @implementation BNCServerRequest
 
 - (id) init {
     if ((self = [super init])) {
-        _requestUUID = [[NSUUID UUID ] UUIDString];
-        _requestCreationTimeStamp = BNCWireFormatFromDate([NSDate date]);
+        NSDate *timeStampDate = [NSDate date];
+        _requestUUID = [self generateRequestUUIDFromDate:timeStampDate];
+        _requestCreationTimeStamp = BNCWireFormatFromDate(timeStampDate);
     }
     return self;
 }
@@ -52,4 +53,15 @@ + (BOOL)supportsSecureCoding {
     return YES;
 }
 
+- (NSString *) generateRequestUUIDFromDate:(NSDate *) localDate {
+    NSString *uuid = [[NSUUID UUID ] UUIDString];
+
+    NSTimeZone *gmt = [NSTimeZone timeZoneWithAbbreviation:@"GMT"];
+    NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+    dateFormatter.dateFormat = @"'-'yyyyMMddHH";
+    [dateFormatter setTimeZone:gmt];
+
+    return [uuid stringByAppendingString:[dateFormatter stringFromDate:localDate]];
+}
+
 @end
diff --git a/Sources/BranchSDK/BranchConstants.m b/Sources/BranchSDK/BranchConstants.m
@@ -166,6 +166,6 @@
 NSString * const BRANCH_REQUEST_KEY_DMA_AD_PEROSALIZATION = @"dma_ad_personalization";
 NSString * const BRANCH_REQUEST_KEY_DMA_AD_USER_DATA = @"dma_ad_user_data";
 
-NSString * const BRANCH_REQUEST_KEY_REQUEST_UUID = @"request_uuid";
-NSString * const BRANCH_REQUEST_KEY_REQUEST_CREATION_TIME_STAMP = @"request_creation_time_stamp";
+NSString * const BRANCH_REQUEST_KEY_REQUEST_UUID = @"branch_sdk_request_uuid";
+NSString * const BRANCH_REQUEST_KEY_REQUEST_CREATION_TIME_STAMP = @"branch_sdk_request_creation_time_stamp";