OTT-1982: honor IFA over session_id if when ifa_type is absent (#895)

PubMatic-OpenWrap · Sep 21, 2024 · d2a3d3f · d2a3d3f
1 parent 3f5aaee
commit d2a3d3f
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 2 deletions.
diff --git a/modules/pubmatic/openwrap/device.go b/modules/pubmatic/openwrap/device.go
@@ -54,7 +54,7 @@ func updateDeviceIFADetails(dvc *models.DeviceCtx) {
 		} else {
 			deviceExt.DeleteIFAType()
 		}
-	} else if extSessionID != "" {
+	} else if extSessionID != "" && dvc.DeviceIFA == "" {
 		dvc.DeviceIFA = extSessionID
 		dvc.IFATypeID = ptrutil.ToPtr(models.DeviceIfaTypeIdSessionId)
 		deviceExt.SetIFAType(models.DeviceIFATypeSESSIONID)

diff --git a/modules/pubmatic/openwrap/device_test.go b/modules/pubmatic/openwrap/device_test.go
@@ -390,18 +390,61 @@ func TestUpdateDeviceIFADetails(t *testing.T) {
 					}(),
 				},
 			},
+			want: &models.DeviceCtx{
+				DeviceIFA: `existing_ifa_id`,
+				Ext: func() *models.ExtDevice {
+					deviceExt := &models.ExtDevice{}
+					deviceExt.SetSessionID(`sample_session_id`)
+					return deviceExt
+				}(),
+			},
+		},
+		{
+			name: `ifa_type_missing_ifa_empty_session_id_present`,
+			args: args{
+				dvc: &models.DeviceCtx{
+					DeviceIFA: "",
+					Ext: func() *models.ExtDevice {
+						deviceExt := &models.ExtDevice{}
+						deviceExt.SetSessionID(`sample_session_id`)
+						return deviceExt
+					}(),
+				},
+			},
 			want: &models.DeviceCtx{
 				IFATypeID: ptrutil.ToPtr(9),
 				DeviceIFA: `sample_session_id`,
 				Ext: func() *models.ExtDevice {
 					deviceExt := &models.ExtDevice{}
 					deviceExt.SetIFAType(models.DeviceIFATypeSESSIONID)
 					deviceExt.SetSessionID(`sample_session_id`)
-
 					return deviceExt
 				}(),
 			},
 		},
+		{
+			name: `ifa_type_missing_ifa_not_present_session_id_present`,
+			args: args{
+				dvc: &models.DeviceCtx{
+					Ext: func() *models.ExtDevice {
+						deviceExt := &models.ExtDevice{}
+						deviceExt.SetSessionID(`sample_session_id`)
+						return deviceExt
+					}(),
+				},
+			},
+			want: &models.DeviceCtx{
+				IFATypeID: ptrutil.ToPtr(9),
+				DeviceIFA: `sample_session_id`,
+				Ext: func() *models.ExtDevice {
+					deviceExt := &models.ExtDevice{}
+					deviceExt.SetIFAType(models.DeviceIFATypeSESSIONID)
+					deviceExt.SetSessionID(`sample_session_id`)
+					return deviceExt
+				}(),
+			},
+		},
+
 		// TODO: Add test cases.
 	}
 	for _, tt := range tests {