Mark member trained form

Makespace · Sep 20, 2024 · 68c1c31 · 68c1c31
1 parent c4e6cb1
commit 68c1c31
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 239 deletions.
diff --git a/src/commands/trainers/mark-member-trained-form.ts b/src/commands/trainers/mark-member-trained-form.ts
@@ -1,20 +1,21 @@
 import {pipe} from 'fp-ts/lib/function';
 import * as E from 'fp-ts/Either';
+import * as O from 'fp-ts/Option';
 import {html, safe, sanitizeString} from '../../types/html';
 import {User} from '../../types';
 import {Form} from '../../types/form';
 import {pageTemplate} from '../../templates';
-import {getEquipmentName} from '../equipment/get-equipment-name';
 import {getEquipmentIdFromForm} from '../equipment/get-equipment-id-from-form';
-import {UUID} from 'io-ts-types';
 import {memberInput} from '../../templates/member-input';
 import {readModels} from '../../read-models';
 import {Member} from '../../read-models/members';
+import {Equipment} from '../../read-models/shared-state/return-types';
+import {failureWithStatus} from '../../types/failure-with-status';
+import {StatusCodes} from 'http-status-codes';
 
 type ViewModel = {
   user: User;
-  equipmentId: UUID;
-  equipmentName: string;
+  equipment: Equipment;
   members: ReadonlyArray<Member>;
 };
 
@@ -25,13 +26,13 @@ const renderForm = (viewModel: ViewModel) =>
   pipe(
     html`
       <h1>
-        Mark a member as trained on ${sanitizeString(viewModel.equipmentName)}
+        Mark a member as trained on ${sanitizeString(viewModel.equipment.name)}
       </h1>
       <form action="/equipment/mark-member-trained" method="post">
         <input
           type="hidden"
           name="equipmentId"
-          value="${viewModel.equipmentId}"
+          value="${viewModel.equipment.id}"
         />
         ${memberInput(viewModel.members)}
         <button type="submit">Confirm</button>
@@ -42,14 +43,20 @@ const renderForm = (viewModel: ViewModel) =>
 
 const constructForm: Form<ViewModel>['constructForm'] =
   input =>
-  ({events, user}) =>
+  ({events, user, readModel}) =>
     pipe(
       {user},
       E.right,
-      E.bind('equipmentId', () => getEquipmentIdFromForm(input)),
-      E.bind('equipmentName', ({equipmentId}) =>
-        getEquipmentName(events, equipmentId)
-      ),
+      E.bind('equipment_id', () => getEquipmentIdFromForm(input)),
+      E.bind('equipment', ({equipment_id}) => {
+        const equipment = readModel.equipment.get(equipment_id);
+        if (O.isNone(equipment)) {
+          return E.left(
+            failureWithStatus('Unknown equipment', StatusCodes.NOT_FOUND)()
+          );
+        }
+        return E.right(equipment.value);
+      }),
       E.let('members', () => {
         const memberDetails = readModels.members.getAllDetails(events);
         return [...memberDetails.values()];

diff --git a/src/http/form-get.ts b/src/http/form-get.ts
@@ -32,7 +32,7 @@ export const formGet =
         events: deps.getAllEvents(),
       },
       sequenceS(TE.ApplyPar),
-      TE.let('readModelDb', () => deps.sharedReadModel.db),
+      TE.let('readModel', () => deps.sharedReadModel),
       TE.chainEitherK(form.constructForm({...req.query, ...req.params})),
       TE.map(form.renderForm),
       TE.matchW(

diff --git a/src/read-models/equipment/get-all.ts b/src/read-models/equipment/get-all.ts
diff --git a/src/read-models/equipment/get-for-area.ts b/src/read-models/equipment/get-for-area.ts
diff --git a/src/read-models/equipment/get-trained-on.ts b/src/read-models/equipment/get-trained-on.ts
diff --git a/src/read-models/equipment/get-training-sheet-id.ts b/src/read-models/equipment/get-training-sheet-id.ts
diff --git a/src/read-models/equipment/get.ts b/src/read-models/equipment/get.ts
diff --git a/src/read-models/equipment/index.ts b/src/read-models/equipment/index.ts
diff --git a/src/types/form.ts b/src/types/form.ts
@@ -11,6 +11,6 @@ export type Form<T> = {
   ) => (context: {
     user: User;
     events: ReadonlyArray<DomainEvent>;
-    readModelDb: SharedReadModel['db'];
+    readModel: SharedReadModel;
   }) => E.Either<FailureWithStatus, T>;
 };
diff --git a/tests/training-sheets/process-events.test.ts b/tests/training-sheets/process-events.test.ts
@@ -42,7 +42,7 @@ const pullNewEquipmentQuizResultsLocal = async (equipment: Equipment) =>
   )();
 
 const defaultEquipment = (): Equipment => ({
-  id: 'ebedee32-49f4-4d36-a350-4fa7848792bf',
+  id: 'ebedee32-49f4-4d36-a350-4fa7848792bf' as UUID,
   name: 'Metal Lathe',
   trainers: [],
   trainedMembers: [],
@@ -143,7 +143,7 @@ describe('Training sheets worker', () => {
           Partial<EventOfType<'EquipmentTrainingQuizResult'>>
         >({
           type: 'EquipmentTrainingQuizResult',
-          equipmentId: defaultEquipment().id as UUID,
+          equipmentId: defaultEquipment().id,
           trainingSheetId: gsheetData.METAL_LATHE.data.spreadsheetId!,
           ...gsheetData.METAL_LATHE.entries[0],
         });
@@ -156,7 +156,7 @@ describe('Training sheets worker', () => {
           EventOfType<'EquipmentTrainingQuizResult'>
         >[] = gsheetData.LASER_CUTTER.entries.map(e => ({
           type: 'EquipmentTrainingQuizResult',
-          equipmentId: defaultEquipment().id as UUID,
+          equipmentId: defaultEquipment().id,
           trainingSheetId: gsheetData.LASER_CUTTER.data.spreadsheetId!,
           actor: {
             tag: 'system',
@@ -182,7 +182,7 @@ describe('Training sheets worker', () => {
           EventOfType<'EquipmentTrainingQuizResult'>
         >[] = gsheetData.BAMBU.entries.map(e => ({
           type: 'EquipmentTrainingQuizResult',
-          equipmentId: defaultEquipment().id as UUID,
+          equipmentId: defaultEquipment().id,
           trainingSheetId: gsheetData.BAMBU.data.spreadsheetId!,
           actor: {
             tag: 'system',