Merge branch 'main' into cleanup_test_noise

Lan2u · web-flow · commit 9eb470474363 · 2025-02-10T00:38:29.000+01:00
diff --git a/src/queries/super-users/construct-view-model.ts b/src/queries/super-users/construct-view-model.ts
@@ -8,22 +8,34 @@ import {
   failureWithStatus,
 } from '../../types/failure-with-status';
 import {StatusCodes} from 'http-status-codes';
-import {readModels} from '../../read-models';
+import {membersTable} from '../../read-models/shared-state/state';
+import {eq} from 'drizzle-orm';
 
 export const constructViewModel =
-  (deps: Dependencies) =>
+  (sharedReadModel: Dependencies['sharedReadModel']) =>
   (user: User): TE.TaskEither<FailureWithStatus, ViewModel> =>
     pipe(
-      deps.getAllEvents(),
-      TE.filterOrElse(
-        readModels.superUsers.is(user.memberNumber),
+      sharedReadModel.members.get(user.memberNumber),
+      TE.fromOption(
         failureWithStatus(
-          'Only super-users can see this page',
-          StatusCodes.FORBIDDEN
+          'Cannot find sufficent information about you to determine if you can access this page',
+          StatusCodes.UNAUTHORIZED
         )
       ),
-      TE.map(events => ({
+      TE.filterOrElse(
+        loggedInMember => loggedInMember.isSuperUser,
+        () =>
+          failureWithStatus(
+            'Only super-users can see this page',
+            StatusCodes.FORBIDDEN
+          )()
+      ),
+      TE.map(() => ({
         user: user,
-        superUsers: readModels.superUsers.getAll()(events),
+        superUsers: sharedReadModel.db
+          .select()
+          .from(membersTable)
+          .where(eq(membersTable.isSuperUser, true))
+          .all(),
       }))
     );
diff --git a/src/queries/super-users/index.ts b/src/queries/super-users/index.ts
@@ -8,7 +8,7 @@ import {safe, toLoggedInContent} from '../../types/html';
 export const superUsers: Query = deps => user =>
   pipe(
     user,
-    constructViewModel(deps),
+    constructViewModel(deps.sharedReadModel),
     TE.map(render),
     TE.map(toLoggedInContent(safe('Super Users')))
   );
diff --git a/src/queries/super-users/render.ts b/src/queries/super-users/render.ts
@@ -1,21 +1,28 @@
 import {pipe} from 'fp-ts/lib/function';
-import {html, joinHtml} from '../../types/html';
+import {html, joinHtml, safe, sanitizeString} from '../../types/html';
 import * as RA from 'fp-ts/ReadonlyArray';
 import {ViewModel} from './view-model';
 import {displayDate} from '../../templates/display-date';
 import {renderMemberNumber} from '../../templates/member-number';
 import {DateTime} from 'luxon';
+import * as O from 'fp-ts/Option';
 
 const renderSuperUsers = (superUsers: ViewModel['superUsers']) =>
   pipe(
     superUsers,
     RA.map(
-      user => html`
+      member => html`
         <tr>
-          <td>${renderMemberNumber(user.memberNumber)}</td>
-          <td>${displayDate(DateTime.fromJSDate(user.since))}</td>
+          <td>${renderMemberNumber(member.memberNumber)}</td>
+          <td>${sanitizeString(O.getOrElse(() => '-')(member.name))}</td>
+          <td>${safe(member.emailAddress)}</td>
           <td>
-            <a href="/super-users/revoke?memberNumber=${user.memberNumber}">
+            ${member.superUserSince
+              ? displayDate(DateTime.fromJSDate(member.superUserSince))
+              : safe('-')}
+          </td>
+          <td>
+            <a href="/super-users/revoke?memberNumber=${member.memberNumber}">
               Revoke
             </a>
           </td>
@@ -28,6 +35,8 @@ const renderSuperUsers = (superUsers: ViewModel['superUsers']) =>
         <table>
           <tr>
             <th>Member Number</th>
+            <th>Name</th>
+            <th>Email</th>
             <th>SU since</th>
             <th></th>
           </tr>
@@ -38,8 +47,7 @@ const renderSuperUsers = (superUsers: ViewModel['superUsers']) =>
   );
 
 export const render = (viewModel: ViewModel) => html`
-    <h1>Super-users</h1>
-    <a href="/super-users/declare">Declare a member to be a super-user</a>
-    </table>
-    ${renderSuperUsers(viewModel.superUsers)}
-  `;
+  <h1>Super-users</h1>
+  <a href="/super-users/declare">Declare a member to be a super-user</a>
+  ${renderSuperUsers(viewModel.superUsers)}
+`;
diff --git a/src/queries/super-users/view-model.ts b/src/queries/super-users/view-model.ts
@@ -1,9 +1,12 @@
 import {User} from '../../types';
+import * as O from 'fp-ts/Option';
 
 export type ViewModel = {
   user: User;
   superUsers: ReadonlyArray<{
     memberNumber: number;
-    since: Date;
+    name: O.Option<string>;
+    emailAddress: string;
+    superUserSince: Date | null;
   }>;
 };
diff --git a/src/read-models/shared-state/area/expand.ts b/src/read-models/shared-state/area/expand.ts
@@ -25,6 +25,7 @@ const expandOwners =
       RA.map(ownerDetails => ({
         ...ownerDetails.members,
         agreementSigned: O.fromNullable(ownerDetails.members.agreementSigned),
+        superUserSince: O.fromNullable(ownerDetails.members.superUserSince),
         ownershipRecordedAt: ownerDetails.owners.ownershipRecordedAt,
         markedOwnerBy: O.fromEither(
           Actor.decode(ownerDetails.owners.markedOwnerByActor)
diff --git a/src/read-models/shared-state/equipment/expand.ts b/src/read-models/shared-state/equipment/expand.ts
@@ -42,6 +42,7 @@ const expandTrainers =
       RA.map(member => ({
         ...member.members,
         agreementSigned: O.fromNullable(member.members.agreementSigned),
+        superUserSince: O.fromNullable(member.members.superUserSince),
         markedTrainerByActor: O.fromEither(
           Actor.decode(member.trainers.markedTrainerByActor)
         ),
@@ -84,6 +85,7 @@ const expandTrainedMembers =
           ),
           trainedSince: result.trainedMembers.trainedAt,
           agreementSigned: O.fromNullable(result.members.agreementSigned),
+          superUserSince: O.fromNullable(result.members.superUserSince),
           trainedByMemberNumber,
           trainedByEmail: pipe(
             trainedByMemberNumber,
@@ -143,6 +145,7 @@ const expandMembersAwaitingTraining =
         ...q.members,
         quizId: q.trainingQuizResults.quizId as UUID,
         agreementSigned: O.fromNullable(q.members.agreementSigned),
+        superUserSince: O.fromNullable(q.members.superUserSince),
         waitingSince: q.trainingQuizResults.timestamp,
       })),
       membersAwaitingTraining => ({
@@ -176,6 +179,7 @@ const expandFailedQuizAttempts =
       RA.map(q => ({
         ...q.members,
         agreementSigned: O.fromNullable(q.members.agreementSigned),
+        superUserSince: O.fromNullable(q.members.superUserSince),
         quizId: q.trainingQuizResults.quizId as UUID,
         score: q.trainingQuizResults.score,
         maxScore: q.trainingQuizResults.maxScore,
diff --git a/src/read-models/shared-state/member/get.ts b/src/read-models/shared-state/member/get.ts
@@ -9,12 +9,14 @@ import {membersTable} from '../state';
 const transformRow = <
   R extends {
     agreementSigned: Date | null | undefined;
+    superUserSince: Date | null | undefined;
   },
 >(
   row: R
 ) => ({
   ...row,
   agreementSigned: O.fromNullable(row.agreementSigned),
+  superUserSince: O.fromNullable(row.superUserSince),
 });
 
 export const getMemberCore =
diff --git a/src/read-models/shared-state/return-types.ts b/src/read-models/shared-state/return-types.ts
@@ -85,6 +85,7 @@ export type MemberCoreInfo = {
   pronouns: O.Option<string>;
   agreementSigned: O.Option<Date>;
   isSuperUser: boolean;
+  superUserSince: O.Option<Date>;
   gravatarHash: GravatarHash;
 };
 
diff --git a/src/read-models/shared-state/state.ts b/src/read-models/shared-state/state.ts
@@ -20,6 +20,7 @@ export const membersTable = sqliteTable('members', {
     .notNull()
     .$type<ReadonlyArray<EmailAddress>>(),
   isSuperUser: integer('isSuperUser', {mode: 'boolean'}).notNull(),
+  superUserSince: integer('superUserSince', {mode: 'timestamp_ms'}),
   agreementSigned: integer('agreementSigned', {mode: 'timestamp_ms'}),
 });
 
@@ -32,6 +33,7 @@ const createMembersTable = sql`
     pronouns BLOB,
     prevEmails BLOB,
     isSuperUser INTEGER,
+    superUserSince INTEGER,
     agreementSigned INTEGER
   );`;
 
diff --git a/src/read-models/shared-state/update-state.ts b/src/read-models/shared-state/update-state.ts
@@ -30,6 +30,7 @@ export const updateState =
             prevEmails: [],
             isSuperUser: false,
             agreementSigned: undefined,
+            superUserSince: undefined,
           })
           .run();
         break;
@@ -67,13 +68,13 @@ export const updateState =
       }
       case 'SuperUserDeclared':
         db.update(membersTable)
-          .set({isSuperUser: true})
+          .set({isSuperUser: true, superUserSince: event.recordedAt})
           .where(eq(membersTable.memberNumber, event.memberNumber))
           .run();
         break;
       case 'SuperUserRevoked':
         db.update(membersTable)
-          .set({isSuperUser: false})
+          .set({isSuperUser: false, superUserSince: null})
           .where(eq(membersTable.memberNumber, event.memberNumber))
           .run();
         break;
diff --git a/src/training-sheets/google.ts b/src/training-sheets/google.ts
@@ -17,6 +17,9 @@ import {lookup} from 'fp-ts/ReadonlyArray';
 const MIN_RECOGNISED_MEMBER_NUMBER = 0;
 const MAX_RECOGNISED_MEMBER_NUMBER = 10_000;
 
+const MAX_RECOGNISED_SCORE = 10_000;
+const MIN_RECOGNISED_SCORE = 0;
+
 const MIN_VALID_TIMESTAMP_EPOCH_MS =
   1546304461_000 as EpochTimestampMilliseconds; // Year 2019, Can't see any training results before this.
 
@@ -56,12 +59,21 @@ const extractScore = (
   }
 
   const score = parseInt(parts[0], 10);
-  if (isNaN(score) || score < 0 || score > 100) {
+  if (
+    isNaN(score) ||
+    score < MIN_RECOGNISED_SCORE ||
+    score > MAX_RECOGNISED_SCORE
+  ) {
     return O.none;
   }
 
   const maxScore = parseInt(parts[1], 10);
-  if (isNaN(maxScore) || maxScore < 1 || maxScore > 100 || maxScore < score) {
+  if (
+    isNaN(maxScore) ||
+    maxScore < MIN_RECOGNISED_SCORE ||
+    maxScore > MAX_RECOGNISED_SCORE ||
+    maxScore < score
+  ) {
     return O.none;
   }
 
diff --git a/tests/queries/super-users/construct-view-model.test.ts b/tests/queries/super-users/construct-view-model.test.ts
@@ -2,41 +2,49 @@ import * as E from 'fp-ts/Either';
 import {pipe} from 'fp-ts/lib/function';
 import {arbitraryUser} from '../../types/user.helper';
 import {constructViewModel} from '../../../src/queries/super-users/construct-view-model';
-import {Dependencies} from '../../../src/dependencies';
-import {happyPathAdapters} from '../../init-dependencies/happy-path-adapters.helper';
-import * as TE from 'fp-ts/TaskEither';
-import {constructEvent} from '../../../src/types';
 import * as T from 'fp-ts/Task';
 import * as RA from 'fp-ts/ReadonlyArray';
 import {getRightOrFail} from '../../helpers';
+import {
+  TestFramework,
+  initTestFramework,
+} from '../../read-models/test-framework';
 
 describe('construct-view-model', () => {
-  it('succeeds if the logged in user is not a super user', async () => {
-    const memberToBeSuperUser = arbitraryUser();
-    const deps: Dependencies = {
-      ...happyPathAdapters,
-      getAllEvents: () =>
-        TE.right([
-          constructEvent('SuperUserDeclared')({
-            memberNumber: memberToBeSuperUser.memberNumber,
-          }),
-        ]),
-    };
+  let framework: TestFramework;
+  beforeEach(async () => {
+    framework = await initTestFramework();
+  });
+
+  const loggedInUser = arbitraryUser();
+  beforeEach(async () => {
+    await framework.commands.memberNumbers.linkNumberToEmail({
+      memberNumber: loggedInUser.memberNumber,
+      email: loggedInUser.emailAddress,
+    });
+  });
+
+  it('succeeds if the logged in user is a super user', async () => {
+    await framework.commands.superUser.declare({
+      memberNumber: loggedInUser.memberNumber,
+    });
 
     const result = await pipe(
-      memberToBeSuperUser,
-      constructViewModel(deps),
+      loggedInUser,
+      constructViewModel(framework.sharedReadModel),
       T.map(getRightOrFail),
       T.map(viewModel => viewModel.superUsers),
       T.map(RA.map(superUser => superUser.memberNumber))
     )();
 
-    expect(result).toStrictEqual([memberToBeSuperUser.memberNumber]);
+    expect(result).toStrictEqual([loggedInUser.memberNumber]);
   });
 
   it('fails if the logged in user is not a super user', async () => {
-    const deps: Dependencies = happyPathAdapters;
-    const result = await pipe(arbitraryUser(), constructViewModel(deps))();
+    const result = await pipe(
+      loggedInUser,
+      constructViewModel(framework.sharedReadModel)
+    )();
 
     expect(result).toStrictEqual(E.left(expect.anything()));
   });
diff --git a/tests/read-models/shared-state/get-member.test.ts b/tests/read-models/shared-state/get-member.test.ts
diff --git a/tests/training-sheets/integration.test.ts b/tests/training-sheets/integration.test.ts
