Merge pull request #880 from Iterable/bugfix/AUT_issue_multiple_users_created

MOB-10807 Fix AUT issue where multiple users are created

Author: evantk91

iterableapi/src/main/java/com/iterable/iterableapi/AnonymousUserManager.java

@@ -32,6 +32,7 @@ public class AnonymousUserManager implements IterableActivityMonitor.AppStateCal
     private IterableApi iterableApi = IterableApi.sharedInstance;
     private final IterableActivityMonitor activityMonitor;
     long lastCriteriaFetch = 0;
+    boolean isCriteriaMatched = false;
 
     AnonymousUserManager(IterableApi iterableApi) {
         this(iterableApi,
@@ -249,11 +250,13 @@ private void createAnonymousUser(String criteriaId) {
             }
 
         } catch (JSONException e) {
+            isCriteriaMatched = false;
             e.printStackTrace();
         }
     }
 
     private void handleTrackFailure(JSONObject data) {
+        isCriteriaMatched = false;
         if (data != null && data.has(IterableConstants.HTTP_STATUS_CODE)) {
             try {
                 int statusCode = (int) data.get(IterableConstants.HTTP_STATUS_CODE);
@@ -366,7 +369,8 @@ private void storeEventListToLocalStorage(JSONObject newDataObject) {
         String criteriaId = checkCriteriaCompletion();
         Log.i("TEST_USER", "criteriaId::" + String.valueOf(criteriaId));
 
-        if (criteriaId != null) {
+        if (criteriaId != null && !isCriteriaMatched) {
+            isCriteriaMatched = true;
             createAnonymousUser(criteriaId);
         }
         Log.i("criteriaId::", String.valueOf(criteriaId != null));

iterableapi/src/test/java/com/iterable/iterableapi/IterableApiMergeUserEmailTests.java

@@ -945,4 +945,35 @@ public void testIdentifiedEmailMergeTrue() throws Exception {
         // check that email was set
         assertEquals(email2, IterableApi.getInstance().getEmail());
     }
+
+    @Test
+    public void testCriteriaMetTwice() throws Exception {
+        // clear any pending requests
+        while (server.takeRequest(1, TimeUnit.SECONDS) != null) { }
+
+        // mock anon session response and track purchase response
+        addResponse(IterableConstants.ENDPOINT_TRACK_ANON_SESSION);
+        addResponse(IterableConstants.ENDPOINT_TRACK_PURCHASE);
+        addResponse(IterableConstants.ENDPOINT_TRACK_PURCHASE);
+
+        // trigger track purchase event
+        triggerTrackPurchaseEvent("test", "keyboard", 4.67, 3);
+        triggerTrackPurchaseEvent("test", "keyboard", 4.67, 3);
+        shadowOf(getMainLooper()).idle();
+
+        // check if only one request was sent to anon session endpoint
+        RecordedRequest anonSessionRequest = server.takeRequest(1, TimeUnit.SECONDS);
+        assertNotNull("Anon session request should not be null", anonSessionRequest);
+        assertEquals("/" + IterableConstants.ENDPOINT_TRACK_ANON_SESSION, anonSessionRequest.getPath());
+
+        // check if first request was sent to track purchase endpoint
+        RecordedRequest firstPurchaseRequest = server.takeRequest(1, TimeUnit.SECONDS);
+        assertNotNull("Purchase request should not be null", firstPurchaseRequest);
+        assertEquals("/" + IterableConstants.ENDPOINT_TRACK_PURCHASE, firstPurchaseRequest .getPath());
+
+        // check if second request was sent to track purchase endpoint
+        RecordedRequest secondPurchaseRequest = server.takeRequest(1, TimeUnit.SECONDS);
+        assertNotNull("Purchase request should not be null", secondPurchaseRequest);
+        assertEquals("/" + IterableConstants.ENDPOINT_TRACK_PURCHASE, secondPurchaseRequest.getPath());
+    }
 }