Event exclusion working

Author: Lan2u

src/init-dependencies/event-store/get-all-events.ts

@@ -22,7 +22,13 @@ export const getAllEvents =
         () =>
           dbExecute(
             dbClient,
-            "SELECT * FROM events WHERE event_type != 'EquipmentTrainingQuizResult'",
+            `
+            SELECT events.*
+            FROM events
+            LEFT JOIN events_exclusions ON events.id = events_exclusions.event_id
+            WHERE events_exclusions.event_id IS NULL
+            AND events.event_type != 'EquipmentTrainingQuizResult'
+            `,
             {}
           ),
         failureWithStatus(
@@ -46,9 +52,19 @@ export const getAllEventsByType =
     pipe(
       TE.tryCatch(
         () =>
-          dbExecute(dbClient, 'SELECT * FROM events WHERE event_type = ?;', [
-            eventType,
-          ]),
+          dbExecute(
+            dbClient,
+            `
+            SELECT *
+            FROM events
+            LEFT JOIN events_exclusions ON events.id = events_exclusions.event_id
+            WHERE events_exclusions.event_id IS NULL
+            AND event_type = ?;
+            `,
+            [
+              eventType,
+            ]
+          ),
         failureWithStatus(
           `Failed to query database for events of type '${eventType}'`,
           StatusCodes.INTERNAL_SERVER_ERROR
@@ -82,7 +98,13 @@ export const getAllEventsByTypes =
         () =>
           dbExecute(
             dbClient,
-            'SELECT * FROM events WHERE event_type = ? OR event_type = ?',
+            `
+            SELECT *
+            FROM events
+            LEFT JOIN events_exclusions ON events.id = events_exclusions.event_id
+            WHERE events_exclusions.event_id IS NULL
+            AND (event_type = ? OR event_type = ?)
+            `,
             [eventType, eventType2]
           ),
         failureWithStatus(

tests/init-dependencies/event-store/get-all-events.test.ts

@@ -97,7 +97,8 @@ describe('get all events', () => {
       await persistEvent(equipmentTrainingSheetRegistered);
     });
     it('returns all persisted events except EquipmentTrainingQuizResult', async () => {
-      expect(await initalisedGetAllEvents()).toStrictEqual([
+      const allEvents = await initalisedGetAllEvents();
+      expect(allEvents).toStrictEqual([
         memberNumberLinkedToEmail,
         equipmentTrainingSheetRegistered,
       ]);
@@ -203,12 +204,11 @@ describe('get all events', () => {
         await unPersistEvent(eventId, excludedBy, excludedByReason)
       });
       it('returns only events of the requested type excluding the excluded event', async () => {
-        expect(
-          await initalisedGetAllEventsByTypes(
-            'MemberNumberLinkedToEmail',
-            'EquipmentTrainingSheetRegistered'
-          )
-        ).toStrictEqual([
+        const events = await initalisedGetAllEventsByTypes(
+          'MemberNumberLinkedToEmail',
+          'EquipmentTrainingSheetRegistered'
+        );
+        expect(events).toStrictEqual([
           memberLinkedEvent,
         ]);
       });