V3 Identity Map test

Author: aulme

pom.xml

@@ -90,7 +90,7 @@
         <dependency>
             <groupId>com.uid2</groupId>
             <artifactId>uid2-client</artifactId>
-            <version>4.3.22</version>
+            <version>4.6.8-alpha-29-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>

src/test/java/app/component/Operator.java

@@ -25,6 +25,7 @@
 import java.time.Clock;
 import java.time.Instant;
 import java.util.Base64;
+import java.util.List;
 
 public class Operator extends App {
     public enum Type {
@@ -266,6 +267,12 @@ public JsonNode v2IdentityMap(String payload) throws Exception {
         return v2DecryptEncryptedResponse(encryptedResponse, envelope.nonce(), getClientApiSecret());
     }
 
+    public IdentityMapV3Response v3IdentityMap(List<String> emails, List<String> phones, List<String> emailHashes, List<String> phoneHashes) {
+        IdentityMapV3Client identityMapV3Client = new IdentityMapV3Client(getBaseUrl(), CLIENT_API_KEY, CLIENT_API_SECRET);
+        IdentityMapV3Input input = new IdentityMapV3Input().withEmails(emails).withPhones(phones).withHashedEmails(emailHashes).withHashedPhones(phoneHashes);
+        return identityMapV3Client.generateIdentityMap(input);
+    }
+
     public JsonNode v2IdentityBuckets(String payload) throws Exception {
         V2Envelope envelope = v2CreateEnvelope(payload, CLIENT_API_SECRET);
         String encryptedResponse = HttpClient.post(getBaseUrl() + "/v2/identity/buckets", envelope.envelope(), CLIENT_API_KEY);

src/test/java/suite/E2ELocalFullTestSuite.java

@@ -14,9 +14,9 @@
         BasicTest.class,
         CoreTest.class,
         CoreRefreshTest.class,
-        V2ApiOperatorTest.class,
-        V2ApiOperatorPublicOnlyTest.class,
-        V2ApiOperatorLocalOnlyTest.class,
+        OperatorTest.class,
+        OperatorPublicOnlyTest.class,
+        OperatorLocalOnlyTest.class,
         OptoutTest.class,
         V2ApiValidatorTest.class
 })

src/test/java/suite/E2EPrivateOperatorTestSuite.java

@@ -3,12 +3,12 @@
 import org.junit.platform.suite.api.SelectClasses;
 import org.junit.platform.suite.api.Suite;
 import suite.basic.BasicTest;
-import suite.operator.V2ApiOperatorTest;
+import suite.operator.OperatorTest;
 
 @Suite
 @SelectClasses({
         BasicTest.class,
-        V2ApiOperatorTest.class
+        OperatorTest.class
 })
 public class E2EPrivateOperatorTestSuite {
 }

src/test/java/suite/E2EPublicOperatorTestSuite.java

@@ -13,9 +13,9 @@
         BasicTest.class,
         CoreTest.class,
         CoreRefreshTest.class,
-        V2ApiOperatorTest.class,
-        V2ApiOperatorPublicOnlyTest.class,
-        V2ApiOperatorLocalOnlyTest.class,
+        OperatorTest.class,
+        OperatorPublicOnlyTest.class,
+        OperatorLocalOnlyTest.class,
         OptoutTest.class
 })
 public class E2EPublicOperatorTestSuite {

…operator/V2ApiOperatorLocalOnlyTest.java …uite/operator/OperatorLocalOnlyTest.javasrc/test/java/suite/operator/V2ApiOperatorLocalOnlyTest.java renamed to src/test/java/suite/operator/OperatorLocalOnlyTest.java src/test/java/suite/operator/V2ApiOperatorLocalOnlyTest.java renamed to src/test/java/suite/operator/OperatorLocalOnlyTest.java

@@ -3,8 +3,6 @@
 import app.component.App;
 import app.component.Operator;
 import com.uid2.client.*;
-import common.Const;
-import common.EnvUtil;
 import org.junit.jupiter.api.condition.EnabledIf;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -18,7 +16,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 @EnabledIf("common.EnabledCondition#isLocal")
-public class V2ApiOperatorLocalOnlyTest {
+public class OperatorLocalOnlyTest {
     @ParameterizedTest(name = "{index} ==> Sender {0} encrypts with {1}, recipient {2} decrypts with {3}, expected result is {4}")
     @MethodSource({
             "suite.operator.TestData#sharingArgs",

…perator/V2ApiOperatorPublicOnlyTest.java …ite/operator/OperatorPublicOnlyTest.javasrc/test/java/suite/operator/V2ApiOperatorPublicOnlyTest.java renamed to src/test/java/suite/operator/OperatorPublicOnlyTest.java src/test/java/suite/operator/V2ApiOperatorPublicOnlyTest.java renamed to src/test/java/suite/operator/OperatorPublicOnlyTest.java

@@ -13,7 +13,7 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 @SuppressWarnings("unused")
-public class V2ApiOperatorPublicOnlyTest {
+public class OperatorPublicOnlyTest {
     private static final String EMAIL_OPTOUT_ID = "[email protected]";
     private static final String PHONE_OPTOUT_ID = "+00000000001";
 

…va/suite/operator/V2ApiOperatorTest.java …st/java/suite/operator/OperatorTest.javasrc/test/java/suite/operator/V2ApiOperatorTest.java renamed to src/test/java/suite/operator/OperatorTest.java src/test/java/suite/operator/V2ApiOperatorTest.java renamed to src/test/java/suite/operator/OperatorTest.java

@@ -11,13 +11,15 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import java.time.Duration;
+import java.time.Instant;
 import java.util.List;
+import java.util.Objects;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
 @SuppressWarnings("unused")
-public class V2ApiOperatorTest {
+public class OperatorTest {
     /*
     TODO:
         /v2/token/generate - Add failure case
@@ -31,6 +33,7 @@ public class V2ApiOperatorTest {
 
     private static final ObjectMapper OBJECT_MAPPER = Mapper.getInstance();
     private static final String CLIENT_SITE_ID = EnvUtil.getEnv(Const.Config.Operator.CLIENT_SITE_ID);
+    private static final int RAW_UID_SIZE = 44;
 
     @ParameterizedTest(name = "/v2/token/generate - {0} - {2}")
     @MethodSource({
@@ -113,7 +116,7 @@ public void testV2IdentityMap(String label, Operator operator, String operatorNa
             "suite.operator.TestData#identityMapBigBatchArgs"
     })
     public void testV2IdentityMapLargeBatch(String label, Operator operator, String operatorName, String payload, List<String> diis) {
-        assertTimeoutPreemptively(Duration.ofSeconds(5), () ->  { // Validate we didn't make mapping too slow.
+        assertTimeoutPreemptively(Duration.ofSeconds(5), () -> { // Validate we didn't make mapping too slow.
             JsonNode response = operator.v2IdentityMap(payload);
 
             assertThat(response.at("/status").asText()).isEqualTo("success");
@@ -129,6 +132,50 @@ public void testV2IdentityMapLargeBatch(String label, Operator operator, String
         });
     }
 
+    @ParameterizedTest(name = "/v3/identity/map - {0} - {2}")
+    @MethodSource({
+            "suite.operator.TestData#identityMapV3BigBatchArgs"
+    })
+    public void testV3IdentityMapLargeBatch(
+            String label,
+            Operator operator,
+            String operatorName,
+            List<String> emails,
+            List<String> phones,
+            List<String> emailHashes,
+            List<String> phoneHashes,
+            List<String> diis
+    ) {
+        assertTimeoutPreemptively(Duration.ofSeconds(5), () -> { // Validate we didn't make mapping too slow.
+            var response = operator.v3IdentityMap(emails, phones, emailHashes, phoneHashes);
+
+            assertThat(response.isSuccess()).isTrue();
+
+            var allMappedDiis = response.getMappedIdentities();
+            assertThat(allMappedDiis.size()).isEqualTo(10_000);
+
+
+            for (var dii : diis) {
+                var mappedDii = allMappedDiis.get(dii);
+                assertThat(mappedDii).isNotNull();
+
+                // Current UID should always be there and should have correct length
+                assertThat(mappedDii.getCurrentRawUid().length()).isEqualTo(RAW_UID_SIZE);
+
+                // Previous UID is there for 90 days after rotation only, then it's null.
+                // If it's there, it should have the correct size
+                assertThat(mappedDii.getPreviousRawUid()).satisfiesAnyOf(
+                        uid -> assertThat(uid).isNull(),
+                        uid -> assertThat(uid).hasSize(RAW_UID_SIZE)
+                );
+
+                // Sanity check that refresh from is a date not too far in the past.
+                // If it is, either there is an Operator issue or salt rotation hasn't been running for a long time.
+                assertThat(mappedDii.getRefreshFrom()).isAfter(Instant.now().minus(Duration.ofDays(10)));
+            }
+        });
+    }
+
 
     @ParameterizedTest(name = "/v2/identity/map - VALIDATE EMAIL - {0} - {2}")
     @MethodSource({

src/test/java/suite/operator/TestData.java

@@ -103,8 +103,8 @@ public static Set<Arguments> tokenPhoneArgsSpecialOptout() {
         Set<Arguments> args = new HashSet<>();
         if (App.PHONE_SUPPORT) {
             for (Operator operator : operators) {
-                args.add(Arguments.of("optout special phone", operator, operator.getName(),  "phone", "+00000000000", true));
-                args.add(Arguments.of("optout special phone", operator, operator.getName(),  "phone", "+00000000000", false));
+                args.add(Arguments.of("optout special phone", operator, operator.getName(), "phone", "+00000000000", true));
+                args.add(Arguments.of("optout special phone", operator, operator.getName(), "phone", "+00000000000", false));
             }
         }
         return args;
@@ -356,6 +356,30 @@ public static Set<Arguments> identityMapBigBatchArgs() throws JsonProcessingExce
         return args;
     }
 
+    public static Set<Arguments> identityMapV3BigBatchArgs() {
+        Set<Operator> operators = AppsMap.getApps(Operator.class);
+
+        List<String> emails = new ArrayList<>();
+        List<String> phones = new ArrayList<>();
+        List<String> emailHashes = new ArrayList<>();
+        List<String> phoneHashes = new ArrayList<>();
+        for (int i = 0; i < 10_000; i++) {
+            emails.add(randomEmail());
+            phones.add(randomPhoneNumber());
+            emailHashes.add(randomHash());
+            phoneHashes.add(randomHash());
+        }
+
+        Set<Arguments> args = new HashSet<>();
+        for (Operator operator : operators) {
+            args.add(Arguments.of("10k emails", operator, operator.getName(), emails, List.of(), List.of(), List.of(), emails));
+            args.add(Arguments.of("10k phones", operator, operator.getName(), List.of(), phones, List.of(), List.of(), phones));
+            args.add(Arguments.of("10k email hashes", operator, operator.getName(), List.of(), List.of(), emailHashes, List.of(), emailHashes));
+            args.add(Arguments.of("10k phone hashes", operator, operator.getName(), List.of(), List.of(), List.of(), phoneHashes, phoneHashes));
+        }
+        return args;
+    }
+
     private static String identityMapPayload(ObjectMapper mapper, String field, List<String> diis) throws JsonProcessingException {
         var json = mapper.createObjectNode().putPOJO(field, diis).put("policy", 1);
         return mapper.writeValueAsString(json);