test: add Subscription reaper tests

integration-tests/subscriptions.test.ts

@@ -5,13 +5,20 @@
  */
 
 import * as AWS from 'aws-sdk';
+import { AxiosInstance } from 'axios';
 import { SubscriptionsHelper } from './SubscriptionsHelper';
+import { getFhirClient, waitForMs } from './utils';
 
 jest.setTimeout(300_000);
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-const { SUBSCRIPTIONS_ENABLED, SUBSCRIPTIONS_NOTIFICATIONS_TABLE, SUBSCRIPTIONS_ENDPOINT, API_AWS_REGION } =
-    process.env;
+const {
+    SUBSCRIPTIONS_ENABLED,
+    SUBSCRIPTIONS_NOTIFICATIONS_TABLE,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    SUBSCRIPTIONS_ENDPOINT,
+    API_AWS_REGION,
+    MULTI_TENANCY_ENABLED,
+} = process.env;
 
 if (API_AWS_REGION === undefined) {
     throw new Error('API_AWS_REGION environment variable is not defined');
@@ -39,4 +46,39 @@ if (SUBSCRIPTIONS_ENABLED === 'true') {
             console.log(x);
         });
     });
+
+    let client: AxiosInstance;
+    describe('test subscription creation and deletion', () => {
+        beforeAll(async () => {
+            client = await getFhirClient({ tenant: MULTI_TENANCY_ENABLED ? 'tenant1' : undefined });
+        });
+
+        test('creation of almost expiring subscription should be deleted by reaper', async () => {
+            // OPERATE
+            const subscriptionResource = {
+                resourceType: 'Subscription',
+                status: 'requested',
+                // get a time 10 seconds (10000 ms) in the future
+                end: new Date(new Date().getTime() + 10000).toISOString(),
+                reason: 'Monitor Patients for Organization 123',
+                criteria: 'Patient?name=Smith',
+                channel: {
+                    type: 'rest-hook',
+                    endpoint: 'https://customer-endpoint.com',
+                    payload: 'application/fhir+json',
+                    header: ['Authorization: Bearer secret-token-abc-123'],
+                },
+            };
+            const postSubResult = await client.post('Subscription', subscriptionResource);
+            expect(postSubResult.status).toEqual(201); // ensure that the sub resource is created
+            const subResourceId = postSubResult.data.id;
+            // wait 4 min until reaper has had a chance to run
+            // (waiting 5 min would hit the timeout value above)
+            // it may be better to do a loop checking every minute or so or increasing the timeout
+            await waitForMs(4 * 60 * 1000);
+            await expect(client.get(`Subscription/${subResourceId}`)).rejects.toMatchObject({
+                response: { status: 404 },
+            });
+        });
+    });
 }

integration-tests/utils.ts

@@ -460,3 +460,7 @@ export const getResourcesFromBundleResponse = (
     });
     return resourceTypeToExpectedResource;
 };
+
+export const waitForMs = (milliseconds: number) => {
+    return new Promise((resolve) => setTimeout(resolve, milliseconds));
+};

src/subscriptions/reaperLambda/index.ts

@@ -12,5 +12,5 @@ const dbService = new DynamoDbDataService(DynamoDb);
  */
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 exports.handler = async (event: any) => {
-    return reaperHandler(dbService, dbServiceWithTenancy);
+    return reaperHandler(dbService, dbServiceWithTenancy, enableMultitenancy);
 };

src/subscriptions/reaperLambda/subscriptionReaper.test.ts

@@ -27,7 +27,7 @@ describe('subscriptionReaper', () => {
         const mockGetActiveSubscriptions = jest.fn();
         mockGetActiveSubscriptions.mockResolvedValueOnce(subResource);
         dbService.getActiveSubscriptions = mockGetActiveSubscriptions;
-        const actualResponse = await reaperHandler(dbService, dbServiceWithTenancy);
+        const actualResponse = await reaperHandler(dbService, dbServiceWithTenancy, false);
         expect(actualResponse).toEqual(expectedResponse);
     });
 
@@ -64,7 +64,7 @@ describe('subscriptionReaper', () => {
         mockDeleteResource.mockResolvedValueOnce({ success: true, message });
         dbService.getActiveSubscriptions = mockGetActiveSubscriptions;
         dbServiceWithTenancy.deleteResource = mockDeleteResource;
-        const actualResponse = await reaperHandler(dbService, dbServiceWithTenancy);
+        const actualResponse = await reaperHandler(dbService, dbServiceWithTenancy, true);
         expect(actualResponse).toEqual(expectedResponse);
     });
 
@@ -83,7 +83,7 @@ describe('subscriptionReaper', () => {
         const mockGetActiveSubscriptions = jest.fn();
         mockGetActiveSubscriptions.mockResolvedValueOnce(subResource);
         dbService.getActiveSubscriptions = mockGetActiveSubscriptions;
-        const actualResponse = await reaperHandler(dbService, dbServiceWithTenancy);
+        const actualResponse = await reaperHandler(dbService, dbServiceWithTenancy, false);
         expect(actualResponse).toEqual(expectedResponse);
     });
 });

src/subscriptions/reaperLambda/subscriptionReaper.ts

@@ -5,7 +5,11 @@
  */
 import { DynamoDbDataService } from 'fhir-works-on-aws-persistence-ddb';
 
-const reaperHandler = async (dbService: DynamoDbDataService, dbServiceWithTenancy: DynamoDbDataService) => {
+const reaperHandler = async (
+    dbService: DynamoDbDataService,
+    dbServiceWithTenancy: DynamoDbDataService,
+    multiTenancyEnabled: boolean,
+) => {
     const subscriptions = await dbService.getActiveSubscriptions({});
     const currentTime = new Date();
     // filter out subscriptions without a defined end time.
@@ -26,10 +30,12 @@ const reaperHandler = async (dbService: DynamoDbDataService, dbServiceWithTenanc
             })
             .map(async (subscription) => {
                 // delete the subscription as it has reached its end time
+                // multi-tenant deployments have the .id as {tenantid}|{id}
+                // eslint-disable-next-line no-underscore-dangle
+                const id = multiTenancyEnabled ? subscription._id : subscription.id;
                 return dbServiceWithTenancy.deleteResource({
                     resourceType: subscription.resourceType,
-                    // eslint-disable-next-line no-underscore-dangle
-                    id: subscription._id,
+                    id,
                     // _tenantId is an internal field, and getActiveSubscriptions returns the raw Record<string, any>
                     // eslint-disable-next-line no-underscore-dangle
                     tenantId: subscription._tenantId,