Revert "Remove impressions for Campaigns delivered by backend service (#1402)"

This reverts commit f03383a.

Author: JasonAHeron

firebase-inappmessaging/src/androidTest/java/com/google/firebase/inappmessaging/FirebaseInAppMessagingFlowableTest.java

@@ -596,17 +596,43 @@ public void onUnsupportedCampaign_doesNotNotify() {
   }
 
   @Test
-  public void whenImpressedButReceivedFromBackend_doesNotFilterCampaign()
+  public void whenImpressed_filtersCampaign()
       throws ExecutionException, InterruptedException, TimeoutException {
+    CampaignMetadata otherMetadata =
+        new CampaignMetadata("otherCampaignId", "otherName", IS_NOT_TEST_MESSAGE);
+    BannerMessage otherMessage = createBannerMessageCustomMetadata(otherMetadata);
+    VanillaCampaignPayload otherCampaign =
+        VanillaCampaignPayload.newBuilder(vanillaCampaign.build())
+            .setCampaignId(otherMetadata.getCampaignId())
+            .setCampaignName(otherMetadata.getCampaignName())
+            .build();
+    ThickContent otherContent =
+        ThickContent.newBuilder(thickContent)
+            .setContent(BANNER_MESSAGE_PROTO)
+            .setIsTestCampaign(IS_NOT_TEST_MESSAGE)
+            .clearVanillaPayload()
+            .clearTriggeringConditions()
+            .addTriggeringConditions(
+                TriggeringCondition.newBuilder().setEvent(Event.newBuilder().setName("event2")))
+            .setVanillaPayload(otherCampaign)
+            .build();
+    FetchEligibleCampaignsResponse response =
+        FetchEligibleCampaignsResponse.newBuilder(eligibleCampaigns)
+            .addMessages(otherContent)
+            .build();
+    GoodFiamService impl = new GoodFiamService(response);
+    grpcServerRule.getServiceRegistry().addService(impl);
+
     Task<Void> logImpressionTask =
         displayCallbacksFactory
             .generateDisplayCallback(MODAL_MESSAGE_MODEL, ANALYTICS_EVENT_NAME)
             .impressionDetected();
     Tasks.await(logImpressionTask, 1000, TimeUnit.MILLISECONDS);
     analyticsConnector.invokeListenerOnEvent(ANALYTICS_EVENT_NAME);
+    analyticsConnector.invokeListenerOnEvent("event2");
     waitUntilNotified(subscriber);
 
-    assertSubsriberExactly(MODAL_MESSAGE_MODEL, subscriber);
+    assertSubsriberExactly(otherMessage, subscriber);
   }
 
   // There is not a purely functional way to determine if our clients inject the impressed
@@ -816,7 +842,6 @@ public void logImpression_logsToEngagementMetrics() {
   }
 
   @Test
-  @Ignore("Broken due to Impression Store changes. Needs fixing.")
   public void whenlogImpressionFails_doesNotFilterCampaign()
       throws ExecutionException, InterruptedException, TimeoutException, FileNotFoundException {
     doThrow(new NullPointerException("e1")).when(application).openFileInput(IMPRESSIONS_STORE_FILE);
@@ -943,7 +968,6 @@ public void whenlogEventLimitIncrementSuccess_writesLimitsToDisk() {
   }
 
   @Test
-  @Ignore("Broken due to Impression Store changes. Needs fixing.")
   public void onImpressionLog_cachesImpressionsInMemory()
       throws ExecutionException, InterruptedException, TimeoutException, FileNotFoundException {
     CampaignMetadata otherMetadata =
@@ -999,7 +1023,6 @@ public void onCorruptImpressionStore_doesNotFilter()
   }
 
   @Test
-  @Ignore("Broken due to Impression Store changes. Needs fixing.")
   public void onImpressionStoreReadFailure_doesNotFilter()
       throws ExecutionException, InterruptedException, TimeoutException, IOException {
     doThrow(new NullPointerException("e1")).when(application).openFileInput(IMPRESSIONS_STORE_FILE);
@@ -1015,7 +1038,6 @@ public void onImpressionStoreReadFailure_doesNotFilter()
   // We work around this by failing hard on the fake service if we do not find an empty impression
   // list
   @Test
-  @Ignore("Broken due to Impression Store changes. Needs fixing.")
   public void whenImpressionStorageClientFails_injectsEmptyImpressionListUpstream()
       throws ExecutionException, InterruptedException, TimeoutException, FileNotFoundException {
     VanillaCampaignPayload otherCampaign =

firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/ImpressionStorageClient.java

@@ -18,12 +18,10 @@
 import com.google.internal.firebase.inappmessaging.v1.CampaignProto;
 import com.google.internal.firebase.inappmessaging.v1.sdkserving.CampaignImpression;
 import com.google.internal.firebase.inappmessaging.v1.sdkserving.CampaignImpressionList;
-import com.google.internal.firebase.inappmessaging.v1.sdkserving.FetchEligibleCampaignsResponse;
 import io.reactivex.Completable;
 import io.reactivex.Maybe;
 import io.reactivex.Observable;
 import io.reactivex.Single;
-import java.util.HashSet;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -98,40 +96,4 @@ public Single<Boolean> isImpressed(CampaignProto.ThickContent content) {
         .map(CampaignImpression::getCampaignId)
         .contains(campaignId);
   }
-
-  /**
-   * Clears impressions for all campaigns found in the provided {@link
-   * FetchEligibleCampaignsResponse} This is done because we trust the server to deliver campaigns
-   * which should be shown again for scheduled campaigns.
-   */
-  public Completable clearImpressions(FetchEligibleCampaignsResponse response) {
-    HashSet<String> idsToClear = new HashSet<>();
-    for (CampaignProto.ThickContent content : response.getMessagesList()) {
-      String id =
-          content.getPayloadCase().equals(CampaignProto.ThickContent.PayloadCase.VANILLA_PAYLOAD)
-              ? content.getVanillaPayload().getCampaignId()
-              : content.getExperimentalPayload().getCampaignId();
-      idsToClear.add(id);
-    }
-    Logging.logd("Potential impressions to clear: " + idsToClear.toString());
-    return getAllImpressions()
-        .defaultIfEmpty(EMPTY_IMPRESSIONS)
-        .flatMapCompletable(
-            (storedImpressions) -> {
-              Logging.logd("Existing impressions: " + storedImpressions.toString());
-              CampaignImpressionList.Builder clearedImpressionListBuilder =
-                  CampaignImpressionList.newBuilder();
-              for (CampaignImpression storedImpression :
-                  storedImpressions.getAlreadySeenCampaignsList()) {
-                if (!idsToClear.contains(storedImpression.getCampaignId())) {
-                  clearedImpressionListBuilder.addAlreadySeenCampaigns(storedImpression);
-                }
-              }
-              CampaignImpressionList clearedImpressionList = clearedImpressionListBuilder.build();
-              Logging.logd("New cleared impression list: " + clearedImpressionList.toString());
-              return storageClient
-                  .write(clearedImpressionList)
-                  .doOnComplete(() -> initInMemCache(clearedImpressionList));
-            });
-  }
 }

firebase-inappmessaging/src/main/java/com/google/firebase/inappmessaging/internal/InAppMessageStreamManager.java

@@ -242,8 +242,6 @@ public Flowable<TriggeredInAppMessage> createFirebaseInAppMessageStream() {
                                           Locale.US,
                                           "Successfully fetched %d messages from backend",
                                           resp.getMessagesList().size())))
-                          .doOnSuccess(
-                              resp -> impressionStorageClient.clearImpressions(resp).subscribe())
                           .doOnSuccess(analyticsEventsManager::updateContextualTriggers)
                           .doOnSuccess(testDeviceHelper::processCampaignFetch)
                           .doOnError(e -> Logging.logw("Service fetch error: " + e.getMessage()))

firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/ImpressionStorageClientTest.java

@@ -25,7 +25,6 @@
 import com.google.internal.firebase.inappmessaging.v1.CampaignProto.ThickContent;
 import com.google.internal.firebase.inappmessaging.v1.sdkserving.CampaignImpression;
 import com.google.internal.firebase.inappmessaging.v1.sdkserving.CampaignImpressionList;
-import com.google.internal.firebase.inappmessaging.v1.sdkserving.FetchEligibleCampaignsResponse;
 import com.google.protobuf.Parser;
 import io.reactivex.Completable;
 import io.reactivex.Maybe;
@@ -279,45 +278,5 @@ public void isImpressed_onError_notifiesError() {
     subscriber.assertError(IOException.class);
   }
 
-  @Test
-  public void clearImpressions_clearsImpressionsForFetchedCampaign() {
-    // verify campaign is impressed.
-    TestSubscriber<Boolean> subscriber =
-        impressionStorageClient.isImpressed(vanillaCampaign).toFlowable().test();
-    assertThat(subscriber.getEvents().get(0)).containsExactly(true);
-
-    // clear impressions for a fetch response containing that campaign.
-    // This simulates having received the campaign again from the server.
-    impressionStorageClient
-        .clearImpressions(
-            FetchEligibleCampaignsResponse.newBuilder().addMessages(vanillaCampaign).build())
-        .subscribe();
-
-    // Verify campaign is no longer impressed.
-    TestSubscriber<Boolean> subscriber2 =
-        impressionStorageClient.isImpressed(vanillaCampaign).toFlowable().test();
-    assertThat(subscriber2.getEvents().get(0)).containsExactly(false);
-  }
-
-  @Test
-  public void clearImpressions_doesNotClearImpressionForUnfetchedCampaign() {
-    // verify initial campaign is impressed.
-    TestSubscriber<Boolean> subscriber =
-        impressionStorageClient.isImpressed(vanillaCampaign).toFlowable().test();
-    assertThat(subscriber.getEvents().get(0)).containsExactly(true);
-
-    // clear impressions for a fetch response containing a different campaign.
-    // This simulates having received the campaign again from the server.
-    impressionStorageClient
-        .clearImpressions(
-            FetchEligibleCampaignsResponse.newBuilder().addMessages(experimentalCampaign).build())
-        .subscribe();
-
-    // Verify campaign is still impressed.
-    TestSubscriber<Boolean> subscriber2 =
-        impressionStorageClient.isImpressed(vanillaCampaign).toFlowable().test();
-    assertThat(subscriber2.getEvents().get(0)).containsExactly(true);
-  }
-
   interface CampaignImpressionsParser extends Parser<CampaignImpressionList> {}
 }

firebase-inappmessaging/src/test/java/com/google/firebase/inappmessaging/internal/InAppMessageStreamManagerTest.java

@@ -198,8 +198,6 @@ public void setup() {
             abtIntegrationHelper);
     subscriber = streamManager.createFirebaseInAppMessageStream().test();
     when(application.getApplicationContext()).thenReturn(application);
-    when(impressionStorageClient.clearImpressions(any(FetchEligibleCampaignsResponse.class)))
-        .thenReturn(Completable.complete());
     when(rateLimiterClient.isRateLimited(appForegroundRateLimit)).thenReturn(Single.just(false));
     when(campaignCacheClient.get()).thenReturn(Maybe.empty());
     when(campaignCacheClient.put(any(FetchEligibleCampaignsResponse.class)))