Connecting training quiz results back up, accidentally added to State…

… but that seems deprecated

src/read-models/shared-state/get-equipment.ts

@@ -1,7 +1,7 @@
 import {pipe} from 'fp-ts/lib/function';
 import * as O from 'fp-ts/Option';
 import {BetterSQLite3Database} from 'drizzle-orm/better-sqlite3';
-import {eq} from 'drizzle-orm';
+import {eq, isNull} from 'drizzle-orm';
 import {SharedReadModel} from '.';
 import * as RA from 'fp-ts/ReadonlyArray';
 import {
@@ -10,7 +10,9 @@ import {
   membersTable,
   trainedMemberstable,
   trainersTable,
+  trainingQuizTable,
 } from './state';
+import { P } from 'pino';
 
 export const getEquipment =
   (db: BetterSQLite3Database): SharedReadModel['equipment']['get'] =>
@@ -57,11 +59,33 @@ export const getEquipment =
         }))
       );
 
+    const getTrainingQuizResults = () => 
+      pipe(
+        db
+          .select()
+          .from(trainingQuizTable)
+          .leftJoin( // If member info is null then this is an orphaned result.
+
+          )
+          .where(eq(trainingQuizTable.equipmentId, id))
+          .all(),
+      );
+
+    const getOrphanedTrainingQuizes = () => 
+      pipe(
+        db
+          .select().from(trainingQuizTable)
+          .where(isNull(trainingQuizTable.memberNumber))
+          .all(),
+      );
+
     return pipe(
       db.select().from(equipmentTable).where(eq(equipmentTable.id, id)).get(),
       O.fromNullable,
       O.let('trainers', getTrainers),
       O.let('trainedMembers', getTrainedMembers),
+      O.let('membersAwaitingTraining', getTrainingQuizResults),
+      O.let('orphanedPassedQuizes', getOrphanedTrainingQuizes),
       O.bind('area', ({areaId}) => getArea(areaId)),
       foo => foo
     );

src/read-models/shared-state/index.ts

@@ -10,7 +10,6 @@ import {getEquipment} from './get-equipment';
 import {Client} from '@libsql/client/.';
 import {asyncRefresh} from './async-refresh';
 import {updateState} from './update-state';
-import { TrainingQuizResults, getTrainingQuizResults } from './training-results';
 
 export {replayState} from './deprecated-replay';
 

src/read-models/shared-state/return-types.ts

@@ -1,15 +1,46 @@
 import * as O from 'fp-ts/Option';
 import {EmailAddress, GravatarHash} from '../../types';
+import { DateTime } from 'luxon';
+
+type OrphanedPassedQuiz = {
+  id: string;
+  score: number;
+  maxScore: number;
+  percentage: number;
+  passed: boolean;
+  timestamp: DateTime;
+
+  memberNumberProvided: O.Option<number>;
+  emailProvided: O.Option<string>;
+};
+
+type FailedQuizAttempt = MemberCoreInfo & {
+  quizId: string;
+  score: number;
+  maxScore: number;
+  percentage: number;
+  timestamp: DateTime;
+  quizAnswers: Record<string, string>;
+}
+
+type TrainedMember = MemberCoreInfo & {
+  trainedBy: number;
+  trainedSince: DateTime;
+}
 
 export type Equipment = {
   id: string;
   name: string;
   trainers: ReadonlyArray<MemberCoreInfo>;
-  trainedMembers: ReadonlyArray<MemberCoreInfo>;
+  trainedMembers: ReadonlyArray<TrainedMember>;
   area: {
     id: string;
     name: string;
   };
+  membersAwaitingTraining: ReadonlyArray<MemberAwaitingTraining>;
+  orphanedPassedQuizes: ReadonlyArray<OrphanedPassedQuiz>;
+  failedQuizAttempts: ReadonlyArray<FailedQuizAttempt>;
+  trainingSheetId: O.Option<string>;
 };
 
 type TrainedOn = {
@@ -35,6 +66,12 @@ type MemberCoreInfo = {
   gravatarHash: GravatarHash;
 };
 
+type MemberAwaitingTraining = MemberCoreInfo & {
+  quizId: string;
+  memberNumber: number;
+  waitingSince: DateTime;
+};
+
 export type Member = MemberCoreInfo & {
   trainedOn: ReadonlyArray<TrainedOn>;
   ownerOf: ReadonlyArray<OwnerOf>;

src/read-models/shared-state/state.ts

@@ -42,13 +42,15 @@ export const equipmentTable = sqliteTable('equipment', {
   areaId: text('areaId')
     .notNull()
     .references(() => areasTable.id),
+  trainingSheetId: text('trainingSheetId'),
 });
 
 const createEquipmentTable = sql`
   CREATE TABLE IF NOT EXISTS equipment (
   id TEXT,
   name TEXT,
-  areaId TEXT
+  areaId TEXT,
+  trainingSheetId TEXT
   );
 `;
 
@@ -178,26 +180,10 @@ type Area = {
   owners: Set<number>;
 };
 
-type UserAwaitingTraining = {
-  // Implies the user has passed the quiz.
-  quizId: string;
-  memberNumber: number;
-  waitingSince: DateTime;
-}
-
-type TrainedUser = {
-  memberNumber: number,
-  trainedSince: DateTime,
-  trainedByMemberNumber: number;
-}
-
 type Equipment = {
   id: string;
   name: string;
   areaId: Area['id'];
-  trainedUsers: ReadonlyArray<TrainedUser>;
-  usersAwaitingTraining: ReadonlyArray<UserAwaitingTraining>;
-  orphanedPassedQuizes: ReadonlyArray<UserAwaitingTraining>;
 };
 
 type FailedLinking = {

src/read-models/shared-state/update-state.ts

@@ -8,6 +8,7 @@ import {
   ownersTable,
   trainedMemberstable,
   trainersTable,
+  trainingQuizTable,
 } from './state';
 import {BetterSQLite3Database} from 'drizzle-orm/better-sqlite3';
 import {eq} from 'drizzle-orm';
@@ -116,7 +117,23 @@ export const updateState =
           })
           .run();
         break;
+      case 'EquipmentTrainingQuizResult':
+        db.insert(trainingQuizTable)
+          .values({
+            memberNumberProvided: event.memberNumberProvided,
+
 
+          })
+          .run();
+      case 'EquipmentTrainingQuizEmailUpdated':
+      case 'EquipmentTrainingQuizMemberNumberUpdated':
+        break;
+      case 'EquipmentTrainingSheetRegistered':
+        db.update(equipmentTable)
+          .set({trainingSheetId: event.trainingSheetId})
+          .where(eq(equipmentTable.id, event.equipmentId))
+          .run();
+        break;
       default:
         break;
     }