release 7.0.0-rc1

criteo · Jul 22, 2024 · 1f79f21 · 1f79f21
1 parent fc9ad0b
commit 1f79f21
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,10 @@
 # Criteo Publisher SDK Changelog
+--------------------------------------------------------------------------------
+## Version [7.0.0]
+
+### Features
+- Add InventoryGroupId parameter, update register method
+
 --------------------------------------------------------------------------------
 ## Version [6.2.0]
 

diff --git a/CriteoGoogleAdapter/Sources/CriteoGoogleAdapter/CRGoogleMediationParameters.m b/CriteoGoogleAdapter/Sources/CriteoGoogleAdapter/CRGoogleMediationParameters.m
@@ -23,7 +23,7 @@
 static NSString *const criteoGoogleMediationPublisherIdKey = @"cpId";
 static NSString *const criteoGoogleMediationAdUnitIdKey = @"adUnitId";
 static NSString *const criteoGoogleMediationStoreIdKey = @"storeId";
-static NSString *const criteoGoogleMediationInventoryGroupIdKey = @"pubId";
+static NSString *const criteoGoogleMediationInventoryGroupIdKey = @"inventoryGroupId";
 
 static void setJSONParsingError(NSError **error) {
   if (error != nil) {

diff --git a/CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/CRBannerCustomEventTests.m b/CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/CRBannerCustomEventTests.m
@@ -55,7 +55,7 @@ - (instancetype)initWithBanner:(CRBannerView *)ad {
   @"{\"cpId\":\"testCpId\",\"adUnitId\":\"testAdUnitId\",\"storeId\":\"testStoreId\"}"
 
 #define SERVER_PARAMETER_WITH_INVENTORY_GROUP_ID \
-  @"{\"cpId\":\"testCpId\",\"pubId\":\"testInventoryGroupId\",\"adUnitId\":\"testAdUnitId\",\"storeId\":\"testStoreId\"}"
+  @"{\"cpId\":\"testCpId\",\"inventoryGroupId\":\"testInventoryGroupId\",\"adUnitId\":\"testAdUnitId\",\"storeId\":\"testStoreId\"}"
 
 @implementation CRBannerCustomEventTests
 

diff --git a/CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/CRGoogleMediationParametersTests.m b/CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/CRGoogleMediationParametersTests.m
@@ -29,7 +29,7 @@ - (void)testGoogleMediationParametersNormal {
   NSError *error;
   CRGoogleMediationParameters *gmp = [CRGoogleMediationParameters
       parametersFromJSONString:
-          @"{\"cpId\":\"B-056946\", \"pubId\":\"testInventoryGroupId\", \"adUnitId\": \"/140800857/Endeavour_320x50\", \"storeId\": \"B-056946\"}"
+          @"{\"cpId\":\"B-056946\", \"inventoryGroupId\":\"testInventoryGroupId\", \"adUnitId\": \"/140800857/Endeavour_320x50\", \"storeId\": \"B-056946\"}"
                          error:&error];
   XCTAssertNotNil(gmp);
   XCTAssertEqualObjects(gmp.publisherId, @"B-056946");
@@ -43,7 +43,7 @@ - (void)testGoogleMediationParametersErrorSetToNil {
   NSError *error = [NSError new];
   CRGoogleMediationParameters *gmp = [CRGoogleMediationParameters
       parametersFromJSONString:
-          @"{\"cpId\":\"B-056946\", \"pubId\":\"testInventoryGroupId\", \"adUnitId\": \"/140800857/Endeavour_320x50\", \"storeId\": \"B-056946\"}"
+          @"{\"cpId\":\"B-056946\", \"inventoryGroupId\":\"testInventoryGroupId\", \"adUnitId\": \"/140800857/Endeavour_320x50\", \"storeId\": \"B-056946\"}"
                          error:&error];
   XCTAssertNil(error);
 }
@@ -52,7 +52,7 @@ - (void)testGoogleMediationParametersErrorSetToNil {
 - (void)testGoogleMediationParametersNilError {
   CRGoogleMediationParameters *gmp = [CRGoogleMediationParameters
       parametersFromJSONString:
-          @"{\"cpId\":\"B-056946\", \"pubId\":\"testInventoryGroupId\", \"adUnitId\": \"/140800857/Endeavour_320x50\", \"storeId\": \"B-056946\"}"
+          @"{\"cpId\":\"B-056946\", \"inventoryGroupId\":\"testInventoryGroupId\", \"adUnitId\": \"/140800857/Endeavour_320x50\", \"storeId\": \"B-056946\"}"
                          error:nil];
   XCTAssertNotNil(gmp);
   XCTAssertEqualObjects(gmp.publisherId, @"B-056946");
@@ -150,12 +150,12 @@ - (void)testGoogleMediationParametersTotallyBadJson {
   XCTAssertEqual(error.code, GADErrorInvalidArgument);
 }
 
-// Blank pubId
-- (void)testGoogleMediationParametersBlankPubId {
+// Blank inventoryGroupId
+- (void)testGoogleMediationParametersBlankInventoryGroupId {
   NSError *error;
   CRGoogleMediationParameters *gmp = [CRGoogleMediationParameters
       parametersFromJSONString:
-          @"{\"cpId\":\"B-056946\", \"pubId\":\"\", \"adUnitId\": \"/140800857/Endeavour_320x50\", \"storeId\": \"B-056946\"}"
+          @"{\"cpId\":\"B-056946\", \"inventoryGroupId\":\"\", \"adUnitId\": \"/140800857/Endeavour_320x50\", \"storeId\": \"B-056946\"}"
                          error:&error];
   XCTAssertNotNil(gmp);
   XCTAssertEqualObjects(gmp.publisherId, @"B-056946");
@@ -164,8 +164,8 @@ - (void)testGoogleMediationParametersBlankPubId {
   XCTAssertEqualObjects(gmp.storeId, @"B-056946");
 }
 
-// Nil pubId
-- (void)testGoogleMediationParametersNilPubId {
+// Nil inventoryGroupId
+- (void)testGoogleMediationParametersNilInventoryGroupId {
   NSError *error;
   CRGoogleMediationParameters *gmp = [CRGoogleMediationParameters
       parametersFromJSONString:
@@ -178,12 +178,12 @@ - (void)testGoogleMediationParametersNilPubId {
   XCTAssertEqualObjects(gmp.storeId, @"B-056946");
 }
 
-// Non-string pubId
-- (void)testGoogleMediationParametersNonStringPubId {
+// Non-string inventoryGroupId
+- (void)testGoogleMediationParametersNonStringInventoryGroupId {
   NSError *error = [NSError new];
   CRGoogleMediationParameters *gmp = [CRGoogleMediationParameters
       parametersFromJSONString:
-          @"{\"cpId\":\"B-056946\", \"pubId\":1, \"adUnitID\": \"/140800857/Endeavour_320x50\", \"storeId\": \"B-056946\"}"
+          @"{\"cpId\":\"B-056946\", \"inventoryGroupId\":1, \"adUnitID\": \"/140800857/Endeavour_320x50\", \"storeId\": \"B-056946\"}"
                          error:&error];
   XCTAssertNil(gmp);
   XCTAssertEqual(error.code, GADErrorInvalidArgument);

diff --git a/CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/CRInterstitialCustomEventTests.m b/CriteoGoogleAdapter/Tests/CriteoGoogleAdapterTests/CRInterstitialCustomEventTests.m
@@ -59,7 +59,7 @@ - (instancetype)initWithInterstitial:(CRInterstitial *)interstitial {
   @"{\"cpId\":\"testCpId\",\"adUnitId\":\"testAdUnitId\",\"storeId\":\"testStoreId\"}"
 
 #define SERVER_PARAMETER_WITH_INVENTORY_GROUP_ID \
-  @"{\"cpId\":\"testCpId\",\"pubId\":\"testInventoryGroupId\",\"adUnitId\":\"testAdUnitId\",\"storeId\":\"testStoreId\"}"
+  @"{\"cpId\":\"testCpId\",\"inventoryGroupId\":\"testInventoryGroupId\",\"adUnitId\":\"testAdUnitId\",\"storeId\":\"testStoreId\"}"
 
 @implementation CRInterstitialCustomEventTests
 

diff --git a/CriteoPublisherSdk/Sources/Configuration/CR_RemoteConfigRequest.m b/CriteoPublisherSdk/Sources/Configuration/CR_RemoteConfigRequest.m
@@ -87,7 +87,7 @@ - (NSDictionary *)postBody {
   };
   [body setValuesForKeysWithDictionary:values];
   if (self.inventoryGroupId != nil) {
-    [body setObject:self.inventoryGroupId forKey:@"pubId"];
+    [body setObject:self.inventoryGroupId forKey:@"inventoryGroupId"];
   }
   return body;
 }

diff --git a/CriteoPublisherSdk/Sources/Network/CR_ApiQueryKeys.h b/CriteoPublisherSdk/Sources/Network/CR_ApiQueryKeys.h
@@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property(class, nonatomic, readonly) NSString *cdbCallEndElapsed;
 @property(class, nonatomic, readonly) NSString *cdbCallStartElapsed;
 @property(class, nonatomic, readonly) NSString *cpId;
-@property(class, nonatomic, readonly) NSString *pubId;
+@property(class, nonatomic, readonly) NSString *inventoryGroupId;
 @property(class, nonatomic, readonly) NSString *deviceModel;
 @property(class, nonatomic, readonly) NSString *deviceIdType;
 @property(class, nonatomic, readonly) NSString *deviceId;

diff --git a/CriteoPublisherSdk/Sources/Network/CR_ApiQueryKeys.m b/CriteoPublisherSdk/Sources/Network/CR_ApiQueryKeys.m
@@ -174,8 +174,8 @@ + (NSString *)api {
 + (NSString *)storeId {
   return @"storeId";
 }
-+ (NSString *)pubId {
-  return @"pubId";
++ (NSString *)inventoryGroupId {
+  return @"inventoryGroupId";
 }
 
 @end
diff --git a/CriteoPublisherSdk/Sources/Network/Serializers/CR_BidRequestSerializer.m b/CriteoPublisherSdk/Sources/Network/Serializers/CR_BidRequestSerializer.m
@@ -134,7 +134,7 @@ - (NSDictionary *)publisherWithConfig:(CR_Config *)config context:(CRContextData
   NSMutableDictionary *publisher = [NSMutableDictionary new];
   publisher[CR_ApiQueryKeys.bundleId] = config.appId;
   publisher[CR_ApiQueryKeys.cpId] = config.criteoPublisherId;
-  publisher[CR_ApiQueryKeys.pubId] = config.inventoryGroupId;
+  publisher[CR_ApiQueryKeys.inventoryGroupId] = config.inventoryGroupId;
   publisher[CR_ApiQueryKeys.ext] =
       [CR_BidRequestSerializer mergeToNestedStructure:@[ contextData.data ]];
   publisher[CR_ApiQueryKeys.storeId] = config.storeId;

diff --git a/CriteoPublisherSdk/Tests/UnitTests/Configuration/CR_RemoteConfigRequestTests.m b/CriteoPublisherSdk/Tests/UnitTests/Configuration/CR_RemoteConfigRequestTests.m
@@ -56,7 +56,7 @@ - (void)testToPostPayload_GivenConfig {
 - (void)testToPostPayloadWithInventoryGroupId_GivenConfig {
   CR_Config *config = OCMClassMock([CR_Config class]);
   OCMStub(config.criteoPublisherId).andReturn(@"myCpId");
-  OCMStub(config.inventoryGroupId).andReturn(@"myPubId");
+  OCMStub(config.inventoryGroupId).andReturn(@"myInventoryGroupId");
   OCMStub(config.sdkVersion).andReturn(@"1.3.3.7");
   OCMStub(config.appId).andReturn(@"myAppId");
   OCMStub(config.deviceModel).andReturn(@"myDeviceModel");
@@ -69,7 +69,7 @@ - (void)testToPostPayloadWithInventoryGroupId_GivenConfig {
 
   NSDictionary *expected = @{
     @"cpId" : @"myCpId",
-    @"pubId" : @"myPubId",
+    @"inventoryGroupId" : @"myInventoryGroupId",
     @"bundleId" : @"myAppId",
     @"sdkVersion" : @"1.3.3.7",
     @"rtbProfileId" : profileId,

diff --git a/CriteoPublisherSdk/Tests/UnitTests/Network/CR_ApiHandlerTests.m b/CriteoPublisherSdk/Tests/UnitTests/Network/CR_ApiHandlerTests.m
@@ -295,7 +295,7 @@ - (void)testCdbCallContainsSdkAndProfile {
 - (void)testCdbCallContainsPublisherInfo {
   NSDictionary *expected = @{
     CR_ApiQueryKeys.cpId : self.configMock.criteoPublisherId,
-    CR_ApiQueryKeys.pubId : self.configMock.inventoryGroupId,
+    CR_ApiQueryKeys.inventoryGroupId : self.configMock.inventoryGroupId,
     CR_ApiQueryKeys.bundleId : self.configMock.appId,
     CR_ApiQueryKeys.storeId : self.configMock.storeId,
     CR_ApiQueryKeys.ext : @{}

diff --git a/CriteoPublisherSdk/Tests/UnitTests/Network/CR_BidRequestSerializerSwiftTests.swift b/CriteoPublisherSdk/Tests/UnitTests/Network/CR_BidRequestSerializerSwiftTests.swift
@@ -80,7 +80,7 @@ class CR_BidRequestSerializerSwiftTests: XCTestCase {
     let expected: NSDictionary = [
       NSString.bundleIdKey: config.appId,
       NSString.cpIdKey: config.criteoPublisherId!,
-      NSString.pubIdKey: config.inventoryGroupId!,
+      NSString.inventoryGroupIdKey: config.inventoryGroupId!,
       "ext": NSDictionary()
     ]
     let body = generateBody()

diff --git a/CriteoPublisherSdk/Tests/Utility/Categories/NSString+APIKeys.h b/CriteoPublisherSdk/Tests/Utility/Categories/NSString+APIKeys.h
@@ -34,7 +34,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property(copy, nonatomic, class, readonly) NSString *bundleIdKey;
 @property(copy, nonatomic, class, readonly) NSString *cpIdKey;
-@property(copy, nonatomic, class, readonly) NSString *pubIdKey;
+@property(copy, nonatomic, class, readonly) NSString *inventoryGroupIdKey;
 
 #pragma mark User
 

diff --git a/CriteoPublisherSdk/Tests/Utility/Categories/NSString+APIKeys.m b/CriteoPublisherSdk/Tests/Utility/Categories/NSString+APIKeys.m
@@ -49,8 +49,8 @@ + (NSString *)cpIdKey {
   return @"cpId";
 }
 
-+ (NSString *)pubIdKey {
-  return @"pubId";
++ (NSString *)inventoryGroupIdKey {
+  return @"inventoryGroupId";
 }
 
 #pragma mark - User