[IP-146] NH partitions - RFC 72 (step 3)

Author: gquadrati

HandleNHCreateOrUpdateInstallationCallOrchestrator/__tests__/handler.test.ts

@@ -125,7 +125,7 @@ describe("HandleNHCreateOrUpdateInstallationCallOrchestrator", () => {
     );
   });
 
-  it("should call CreateOrUpdate activity with legacy parameters if user is a test user", async () => {
+  it("should call CreateOrUpdate activity with new NH parameters if user is a test user", async () => {
     const orchestratorHandler = getHandler({
       createOrUpdateActivity: mockCreateOrUpdateActivity,
       isUserInActiveTestSubsetActivity: mockIsUserATestUserActivityTrue,
@@ -146,11 +146,17 @@ describe("HandleNHCreateOrUpdateInstallationCallOrchestrator", () => {
             platform: aCreateOrUpdateInstallationMessage.platform,
             tags: aCreateOrUpdateInstallationMessage.tags,
             pushChannel: aCreateOrUpdateInstallationMessage.pushChannel,
-            notificationHubConfig: legacyNotificationHubConfig
+            notificationHubConfig: newNotificationHubConfig
           })
         );
 
-        expect(mockDeleteInstallationActivitySuccess).not.toHaveBeenCalled();
+        expect(mockDeleteInstallationActivitySuccess).toBeCalledWith(
+          expect.any(Object),
+          expect.objectContaining({
+            installationId: aCreateOrUpdateInstallationMessage.installationId,
+            notificationHubConfig: legacyNotificationHubConfig
+          })
+        );
       }
     );
   });
@@ -195,16 +201,16 @@ describe("HandleNHCreateOrUpdateInstallationCallOrchestrator", () => {
     };
     mockGetInput.mockImplementationOnce(() => input);
 
-    const orchestratorHandler = getHandler({
-      createOrUpdateActivity: mockCreateOrUpdateActivity,
-      isUserInActiveTestSubsetActivity: mockIsUserATestUserActivityFalse,
-      legacyNotificationHubConfig: legacyNotificationHubConfig,
-      notificationHubConfigPartitionChooser: _ => newNotificationHubConfig,
-      deleteInstallationActivity: mockDeleteInstallationActivitySuccess
-    })(contextMockWithDf);
-
-    expect.assertions(2);
     try {
+      const orchestratorHandler = getHandler({
+        createOrUpdateActivity: mockCreateOrUpdateActivity,
+        isUserInActiveTestSubsetActivity: mockIsUserATestUserActivityFalse,
+        legacyNotificationHubConfig: legacyNotificationHubConfig,
+        notificationHubConfigPartitionChooser: _ => newNotificationHubConfig,
+        deleteInstallationActivity: mockDeleteInstallationActivitySuccess
+      })(contextMockWithDf);
+
+      expect.assertions(2);
       consumeGenerator(orchestratorHandler);
     } catch (err) {
       expect(OrchestratorInvalidInputFailure.is(err)).toBe(true);

HandleNHCreateOrUpdateInstallationCallOrchestrator/handler.ts

@@ -1,8 +1,10 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import { Task } from "durable-functions/lib/src/classes";
 import * as t from "io-ts";
+import { toString } from "fp-ts/lib/function";
 
 import * as o from "../utils/durable/orchestrators";
+import { failureUnhandled } from "../utils/durable/orchestrators";
 
 import {
   getNotificationHubPartitionConfig,
@@ -70,14 +72,58 @@ export const getHandler = ({
 
       if (isUserATestUser.value) {
         logger.info(`TEST_USER:${installationId}`);
-      }
 
-      yield* createOrUpdateActivity(context, {
-        installationId,
-        notificationHubConfig: legacyNotificationHubConfig,
-        platform,
-        pushChannel,
-        tags
-      });
+        const notificationHubConfigPartition = notificationHubConfigPartitionChooser(
+          installationId
+        );
+
+        try {
+          yield* createOrUpdateActivity(context, {
+            installationId,
+            notificationHubConfig: notificationHubConfigPartition,
+            platform,
+            pushChannel,
+            tags
+          });
+
+          // Always delete installation from legacy Notification Hub
+          yield* deleteInstallationActivity(context, {
+            installationId,
+            notificationHubConfig: legacyNotificationHubConfig
+          });
+        } catch (err) {
+          // ^In case of exception, delete from partition and restore into legacy NH
+
+          logger.error(
+            failureUnhandled(
+              `ERROR|TEST_USER ${installationId}: ${toString(err)}`
+            )
+          );
+
+          yield* createOrUpdateActivity(context, {
+            installationId,
+            notificationHubConfig: legacyNotificationHubConfig,
+            platform,
+            pushChannel,
+            tags
+          });
+
+          yield* deleteInstallationActivity(context, {
+            installationId,
+            notificationHubConfig: notificationHubConfigPartition
+          });
+
+          throw err;
+        }
+      } else {
+        // Call legacy Notification Hub otherwise
+        yield* createOrUpdateActivity(context, {
+          installationId,
+          notificationHubConfig: legacyNotificationHubConfig,
+          platform,
+          pushChannel,
+          tags
+        });
+      }
     }
   );

HandleNHDeleteInstallationCallOrchestrator/__tests__/handler.test.ts

@@ -129,7 +129,7 @@ describe("HandleNHDeleteInstallationCallOrchestrator", () => {
       deleteInstallationActivity: mockDeleteInstallationActivitySuccess,
       legacyNotificationHubConfig: legacyNotificationHubConfig,
       notificationHubConfigPartitionChooser: _ => newNotificationHubConfig
-    })(contextMockWithDf as any);
+    })(contextMockWithDf);
 
     expect.assertions(2);
     try {