Update commands to return TE

Lan2u · Lan2u · commit a2dcebe5ffa9 · 2026-03-28T09:24:15.000Z
diff --git a/src/authentication/verify-email/landing-page.ts b/src/authentication/verify-email/landing-page.ts
@@ -61,17 +61,27 @@ export const landing =
 
       // Note that we don't need to check isAuthorized here because we are authorised
       // by the user clicking the verification link.
-      const resultantEvents = verifyEmail.process({
+      const resultantEvents = await verifyEmail.process({
         events: resourceEvents.right.events,
         command: {
           emailAddress: decoded.right.emailAddress,
           memberNumber: decoded.right.memberNumber,
           actor: {'tag': 'system'}
-        }
-      });
+        },
+        deps,
+      })();
+
+      if (E.isLeft(resultantEvents)) {
+        deps.logger.error(
+          resultantEvents.left,
+          'Failed to process verification link'
+        );
+        res.send(invalidLink());
+        return;
+      }
 
-      if (O.isSome(resultantEvents)) {
-        const commitEvent = await deps.commitEvent(resource, resourceEvents.right.version)(resultantEvents.value)();
+      if (O.isSome(resultantEvents.right)) {
+        const commitEvent = await deps.commitEvent(resource, resourceEvents.right.version)(resultantEvents.right.value)();
         if (E.isLeft(commitEvent)) {
           deps.logger.error(
             commitEvent.left,
diff --git a/src/commands/area/add-owner.ts b/src/commands/area/add-owner.ts
@@ -3,6 +3,7 @@ import * as RA from 'fp-ts/ReadonlyArray';
 import * as t from 'io-ts';
 import * as tt from 'io-ts-types';
 import * as O from 'fp-ts/Option';
+import * as TE from 'fp-ts/TaskEither';
 import {pipe} from 'fp-ts/lib/function';
 import {Command} from '../command';
 import {isAdminOrSuperUser} from '../is-admin-or-super-user';
@@ -16,10 +17,10 @@ export type AddOwner = t.TypeOf<typeof codec>;
 
 const process: Command<AddOwner>['process'] = input => {
   if (input.events.length === 0) {
-    return O.none;
+    return TE.right(O.none);
   }
   if (pipe(input.events, RA.some(isEventOfType('AreaRemoved')))) {
-    return O.none;
+    return TE.right(O.none);
   }
 
   const happyPathEvent = pipe(
@@ -39,7 +40,8 @@ const process: Command<AddOwner>['process'] = input => {
         case 'OwnerRemoved':
           return happyPathEvent;
       }
-    })
+    }),
+    TE.right
   );
 };
 
diff --git a/src/commands/area/remove-area.ts b/src/commands/area/remove-area.ts
@@ -1,5 +1,6 @@
 import {constructEvent, isEventOfType} from '../../types';
 import * as RA from 'fp-ts/ReadonlyArray';
+import * as TE from 'fp-ts/TaskEither';
 import * as t from 'io-ts';
 import * as tt from 'io-ts-types';
 import * as O from 'fp-ts/Option';
@@ -15,15 +16,16 @@ type RemoveArea = t.TypeOf<typeof codec>;
 
 const process: Command<RemoveArea>['process'] = input => {
   if (input.events.length === 0) {
-    return O.none;
+    return TE.right(O.none);
   }
   return pipe(
     input.events,
     RA.filter(isEventOfType('AreaRemoved')),
     RA.match(
       () => O.some(constructEvent('AreaRemoved')(input.command)),
       () => O.none
-    )
+    ),
+    TE.right,
   );
 };
 
diff --git a/src/commands/area/remove-owner.ts b/src/commands/area/remove-owner.ts
@@ -1,6 +1,7 @@
 import * as t from 'io-ts';
 import * as tt from 'io-ts-types';
 import * as O from 'fp-ts/Option';
+import * as TE from 'fp-ts/TaskEither';
 import {Command} from '../command';
 import {isAdminOrSuperUser} from '../is-admin-or-super-user';
 import {pipe} from 'fp-ts/lib/function';
@@ -16,7 +17,7 @@ type RemoveOwner = t.TypeOf<typeof codec>;
 
 const process: Command<RemoveOwner>['process'] = input => {
    if (pipe(input.events, RA.some(isEventOfType('AreaRemoved')))) {
-     return O.none;
+     return TE.right(O.none);
    }
 
   return pipe(
@@ -36,7 +37,8 @@ const process: Command<RemoveOwner>['process'] = input => {
     }),
     RA.last,
     O.filter(isEventOfType('OwnerAdded')),
-    O.map(() => constructEvent('OwnerRemoved')(input.command))
+    O.map(() => constructEvent('OwnerRemoved')(input.command)),
+    TE.right,
   );
 }
 
diff --git a/src/commands/equipment/add.ts b/src/commands/equipment/add.ts
@@ -3,6 +3,7 @@ import * as RA from 'fp-ts/ReadonlyArray';
 import * as t from 'io-ts';
 import * as tt from 'io-ts-types';
 import * as O from 'fp-ts/Option';
+import * as TE from 'fp-ts/TaskEither';
 import {pipe} from 'fp-ts/lib/function';
 import {Command} from '../command';
 import {isAdminOrSuperUser} from '../is-admin-or-super-user';
@@ -21,7 +22,8 @@ const process: Command<AddEquipment>['process'] = input =>
     RA.match(
       () => O.some(constructEvent('EquipmentAdded')(input.command)),
       () => O.none
-    )
+    ),
+    TE.right
   );
 
 const resource: Command<AddEquipment>['resource'] = command => ({
diff --git a/src/commands/equipment/register-training-sheet.ts b/src/commands/equipment/register-training-sheet.ts
@@ -1,6 +1,7 @@
 import * as t from 'io-ts';
 import * as tt from 'io-ts-types';
 import * as O from 'fp-ts/Option';
+import * as TE from 'fp-ts/TaskEither';
 import {DomainEvent, constructEvent} from '../../types';
 import {Actor} from '../../types/actor';
 import {Command, WithActor} from '../command';
@@ -18,9 +19,9 @@ export type RegisterTrainingSheet = t.TypeOf<typeof codec>;
 const process = (input: {
   command: WithActor<RegisterTrainingSheet>;
   events: ReadonlyArray<DomainEvent>;
-}): O.Option<DomainEvent> =>
+}) =>
   // No idempotency check required here currently. If the training sheet already matches the current then we still record the duplicate event.
-  O.some(constructEvent('EquipmentTrainingSheetRegistered')(input.command));
+  TE.right(O.some(constructEvent('EquipmentTrainingSheetRegistered')(input.command)));
 
 const resource = (command: RegisterTrainingSheet) => ({
   type: 'Equipment',
diff --git a/src/commands/equipment/remove-training-sheet.ts b/src/commands/equipment/remove-training-sheet.ts
@@ -1,6 +1,7 @@
 import * as t from 'io-ts';
 import * as tt from 'io-ts-types';
 import * as O from 'fp-ts/Option';
+import * as TE from 'fp-ts/TaskEither';
 import {DomainEvent, constructEvent} from '../../types';
 import {Actor} from '../../types/actor';
 import {Command, WithActor} from '../command';
@@ -17,8 +18,8 @@ type RemoveTrainingSheet = t.TypeOf<typeof codec>;
 const process = (input: {
   command: WithActor<RemoveTrainingSheet>;
   events: ReadonlyArray<DomainEvent>;
-}): O.Option<DomainEvent> =>
-  O.some(constructEvent('EquipmentTrainingSheetRemoved')(input.command));
+}) =>
+  TE.right(O.some(constructEvent('EquipmentTrainingSheetRemoved')(input.command)));
 
 const resource = (command: RemoveTrainingSheet) => ({
   type: 'Equipment',
diff --git a/src/commands/members/verify-email.ts b/src/commands/members/verify-email.ts
@@ -1,4 +1,5 @@
 import * as O from 'fp-ts/Option';
+import * as TE from 'fp-ts/TaskEither';
 import * as t from 'io-ts';
 import {Command} from '../command';
 import {EmailAddressCodec, constructEvent} from '../../types';
@@ -18,22 +19,22 @@ const process: Command<VerifyMemberEmail>['process'] = input => {
     input.command.memberNumber
   );
   if (state === undefined) {
-    return O.none;
+    return TE.right(O.none);
   }
 
   const emailAddress = normaliseEmailAddress(input.command.emailAddress);
   const email = state.emails[emailAddress];
   if (!email || email.verified) {
-    return O.none;
+    return TE.right(O.none);
   }
 
-  return O.some(
+  return TE.right(O.some(
     constructEvent('MemberEmailVerified')({
       actor: input.command.actor,
       memberNumber: input.command.memberNumber,
       email: input.command.emailAddress,
     })
-  );
+  ));
 };
 
 const resource = () => ({
diff --git a/src/commands/super-user/declare.ts b/src/commands/super-user/declare.ts
@@ -2,6 +2,7 @@ import {constructEvent} from '../../types';
 import * as t from 'io-ts';
 import * as tt from 'io-ts-types';
 import * as O from 'fp-ts/Option';
+import * as TE from 'fp-ts/TaskEither';
 import {Command} from '../command';
 import {isAdminOrSuperUser} from '../is-admin-or-super-user';
 import {resource} from './resource';
@@ -13,7 +14,7 @@ const codec = t.strict({
 export type DeclareSuperUserCommand = t.TypeOf<typeof codec>;
 
 const process: Command<DeclareSuperUserCommand>['process'] = input =>
-  O.some(constructEvent('SuperUserDeclared')(input.command));
+  TE.right(O.some(constructEvent('SuperUserDeclared')(input.command)));
 
 export const declare: Command<DeclareSuperUserCommand> = {
   process,
diff --git a/src/commands/super-user/revoke.ts b/src/commands/super-user/revoke.ts
@@ -2,6 +2,7 @@ import {constructEvent} from '../../types';
 import * as t from 'io-ts';
 import * as tt from 'io-ts-types';
 import * as O from 'fp-ts/Option';
+import * as TE from 'fp-ts/TaskEither';
 import {Command} from '../command';
 import * as RA from 'fp-ts/ReadonlyArray';
 import {isAdminOrSuperUser} from '../is-admin-or-super-user';
@@ -27,7 +28,8 @@ const process: Command<RevokeSuperUser>['process'] = input =>
         event.type === 'SuperUserDeclared'
           ? O.some(constructEvent('SuperUserRevoked')(input.command))
           : O.none
-    )
+    ),
+    TE.right
   );
 
 export const revoke: Command<RevokeSuperUser> = {
diff --git a/src/commands/trainers/add-trainer.ts b/src/commands/trainers/add-trainer.ts
@@ -2,6 +2,7 @@ import {DomainEvent, constructEvent} from '../../types';
 import * as t from 'io-ts';
 import * as tt from 'io-ts-types';
 import * as O from 'fp-ts/Option';
+import * as TE from 'fp-ts/TaskEither';
 import {pipe} from 'fp-ts/lib/function';
 import {Command} from '../command';
 import {isAdminOrSuperUser} from '../is-admin-or-super-user';
@@ -16,7 +17,7 @@ const codec = t.strict({
 export type AddTrainer = t.TypeOf<typeof codec>;
 
 const process: Command<AddTrainer>['process'] = input =>
-  O.some(constructEvent('TrainerAdded')(input.command));
+  TE.right(O.some(constructEvent('TrainerAdded')(input.command)));
 
 const resource: Command<AddTrainer>['resource'] = command => ({
   type: 'Trainers',
diff --git a/src/commands/trainers/mark-member-trained-by.ts b/src/commands/trainers/mark-member-trained-by.ts
@@ -8,7 +8,7 @@ import {isAdminOrSuperUser} from '../is-admin-or-super-user';
 import {isEquipmentTrainer} from '../is-equipment-trainer';
 import {Actor} from '../../types/actor';
 import {DateTime} from 'luxon';
-import { FailureWithStatus, failureWithStatus } from '../../types/failure-with-status';
+import { failureWithStatus } from '../../types/failure-with-status';
 import { StatusCodes } from 'http-status-codes';
 
 const codec = t.strict({
diff --git a/src/commands/trainers/mark-member-trained.ts b/src/commands/trainers/mark-member-trained.ts
@@ -2,6 +2,7 @@ import {Actor, DomainEvent, constructEvent} from '../../types';
 import * as t from 'io-ts';
 import * as tt from 'io-ts-types';
 import * as O from 'fp-ts/Option';
+import * as TE from 'fp-ts/TaskEither';
 import {Command, WithActor} from '../command';
 import {isAdminOrSuperUser} from '../is-admin-or-super-user';
 import {isEquipmentTrainer} from '../is-equipment-trainer';
@@ -16,8 +17,8 @@ export type MarkMemberTrained = t.TypeOf<typeof codec>;
 const process = (input: {
   command: WithActor<MarkMemberTrained>;
   events: ReadonlyArray<DomainEvent>;
-}): O.Option<DomainEvent> =>
-  O.some(
+}) =>
+  TE.right(O.some(
     constructEvent('MemberTrainedOnEquipment')({
       trainedByMemberNumber:
         input.command.actor.tag === 'user'
@@ -28,7 +29,7 @@ const process = (input: {
       legacyImport: false,
       actor: input.command.actor,
     })
-  );
+  ));
 
 const resource = (command: MarkMemberTrained) => ({
   type: 'Equipment',
diff --git a/src/commands/trainers/revoke-member-trained.ts b/src/commands/trainers/revoke-member-trained.ts
@@ -2,6 +2,7 @@ import {Actor, DomainEvent, constructEvent} from '../../types';
 import * as t from 'io-ts';
 import * as tt from 'io-ts-types';
 import * as O from 'fp-ts/Option';
+import * as TE from 'fp-ts/TaskEither';
 import {Command, WithActor} from '../command';
 import {isAdminOrSuperUser} from '../is-admin-or-super-user';
 import {isEquipmentTrainer} from '../is-equipment-trainer';
@@ -16,8 +17,8 @@ export type RevokeMemberTrained = t.TypeOf<typeof codec>;
 const process = (input: {
   command: WithActor<RevokeMemberTrained>;
   events: ReadonlyArray<DomainEvent>;
-}): O.Option<DomainEvent> =>
-  O.some(
+}) =>
+  TE.right(O.some(
     constructEvent('RevokeTrainedOnEquipment')({
       revokedByMemberNumber:
         input.command.actor.tag === 'user'
@@ -27,7 +28,7 @@ const process = (input: {
       memberNumber: input.command.memberNumber,
       actor: input.command.actor,
     })
-  );
+  ));
 
 const resource = (command: RevokeMemberTrained) => ({
   type: 'Equipment',
diff --git a/src/init-dependencies/event-store/get-all-events.ts b/src/init-dependencies/event-store/get-all-events.ts
@@ -6,6 +6,7 @@ import {
 } from '../../types/failure-with-status';
 import * as TE from 'fp-ts/TaskEither';
 import * as E from 'fp-ts/Either';
+import * as O from 'fp-ts/Option';
 import * as RA from 'fp-ts/ReadonlyArray';
 import {EventExclusionsTable, EventsTable} from './events-table';
 import {eventsFromRows} from './events-from-rows';
@@ -15,6 +16,7 @@ import {StoredDomainEvent, StoredEventOfType} from '../../types';
 import {EventName} from '../../types/domain-event';
 import {dbExecute} from '../../util';
 import { exclusionEventsFromRows } from './exclusion-events-from-rows';
+import { UUID } from 'io-ts-types';
 
 export const getAllEvents =
   (dbClient: Client): Dependencies['getAllEvents'] =>
@@ -169,3 +171,38 @@ export const getAllExclusionEvents = (dbClient: Client): Dependencies['getAllExc
       TE.map(table => table.rows),
       TE.chainEitherK(exclusionEventsFromRows)
     );
+
+export const getEventById = (dbClient: Client): Dependencies['getEventById'] =>
+    (event_id: UUID) =>
+        pipe(
+          TE.tryCatch(
+            () =>
+              dbExecute(
+                dbClient,
+                `
+                SELECT events.*
+                FROM events
+                WHERE events.id = ?
+                `,
+                [event_id]
+              ),
+            failureWithStatus(
+              'Failed to query database',
+              StatusCodes.INTERNAL_SERVER_ERROR
+            )
+          ),
+          TE.chainEitherK(
+            flow(
+              EventsTable.decode,
+              E.mapLeft(internalCodecFailure('Failed to decode DB table'))
+            )
+          ),
+          TE.map(table => table.rows),
+          TE.chainEitherK(eventsFromRows),
+          TE.map(
+            RA.match(
+              () => O.none,
+              (events) => O.some(events[0])
+            )
+          )
+        );
diff --git a/src/init-dependencies/init-dependencies.ts b/src/init-dependencies/init-dependencies.ts
@@ -6,7 +6,7 @@ import * as O from 'fp-ts/Option';
 import createLogger, {LoggerOptions} from 'pino';
 import nodemailer from 'nodemailer';
 import {commitEvent} from './event-store/commit-event';
-import {getAllEvents, getAllEventsByType, getAllExclusionEvents} from './event-store/get-all-events';
+import {getAllEvents, getAllEventsByType, getAllExclusionEvents, getEventById} from './event-store/get-all-events';
 import {getResourceEvents} from './event-store/get-resource-events';
 import {Client} from '@libsql/client';
 
@@ -75,6 +75,7 @@ export const initDependencies = (
     getAllEvents: getAllEvents(eventDB),
     getAllExclusionEvents: getAllExclusionEvents(eventDB),
     getAllEventsByType: getAllEventsByType(eventDB),
+    getEventById: getEventById(eventDB),
     getResourceEvents: getResourceEvents(eventDB),
     sharedReadModel,
     rateLimitSendingOfEmails: createRateLimiter(5, 24 * 3600),
