Merge branch 'main' of https://github.com/Makespace/members-app

Author: Lan2u

src/queries/failed-imports/render.ts

@@ -9,7 +9,7 @@ const renderFailedLinkings = (failedImports: ViewModel['failedImports']) =>
     RA.map(
       item =>
         html`<li>
-          <b>${item.memberNumber}</b> -- ${sanitizeString(item.email)}
+          <b>${item.memberNumber}</b> — ${sanitizeString(item.email)}
         </li>`
     ),
     joinHtml,

src/queries/members/construct-view-model.ts

@@ -1,20 +1,17 @@
 import {pipe} from 'fp-ts/lib/function';
-import {Dependencies} from '../../dependencies';
 import * as TE from 'fp-ts/TaskEither';
 import {FailureWithStatus} from '../../types/failure-with-status';
 import {User} from '../../types/user';
 import {ViewModel} from './view-model';
-import {readModels} from '../../read-models';
+import {SharedReadModel} from '../../read-models/shared-state';
 
 export const constructViewModel =
-  (deps: Dependencies) =>
+  (sharedReadModel: SharedReadModel) =>
   (user: User): TE.TaskEither<FailureWithStatus, ViewModel> =>
     pipe(
-      deps.getAllEvents(),
-      TE.map(events => ({
-        members: [
-          ...readModels.members.getAllDetailsAsActor(user)(events).values(),
-        ],
+      TE.right(sharedReadModel.members.getAll()),
+      TE.map(members => ({
+        members,
         user,
       }))
     );

src/queries/members/index.ts

@@ -8,7 +8,7 @@ import {safe, toLoggedInContent} from '../../types/html';
 export const members: Query = deps => user =>
   pipe(
     user,
-    constructViewModel(deps),
+    constructViewModel(deps.sharedReadModel),
     TE.map(render),
     TE.map(toLoggedInContent(safe('Members')))
   );

src/read-models/members/get-all.ts

@@ -1,9 +1,6 @@
 import * as RA from 'fp-ts/ReadonlyArray';
 import {DomainEvent, isEventOfType, Actor, User} from '../../types';
 import {pipe} from 'fp-ts/lib/function';
-import {MultipleMembers} from './return-types';
-import {replayState} from '../shared-state';
-import {redactDetailsForActor} from '../shared-state/member/redact';
 
 export const getAll = (
   events: ReadonlyArray<DomainEvent>
@@ -17,22 +14,10 @@ export const getAll = (
     }))
   );
 
-export const getAllDetails = (
-  events: ReadonlyArray<DomainEvent>
-): MultipleMembers => pipe(events, replayState, state => state.members);
-
 export const liftActorOrUser = (actorOrUser: Actor | User) =>
   Actor.is(actorOrUser)
     ? actorOrUser
     : {
         tag: 'user' as const,
         user: actorOrUser,
       };
-
-export const getAllDetailsAsActor =
-  (actorOrUser: Actor | User) => (events: ReadonlyArray<DomainEvent>) =>
-    pipe(
-      events,
-      getAllDetails,
-      redactDetailsForActor(liftActorOrUser(actorOrUser))
-    );

src/read-models/members/get-failed-imports.ts

@@ -1,14 +1,16 @@
+import * as RA from 'fp-ts/ReadonlyArray';
 import {pipe} from 'fp-ts/lib/function';
 import {DomainEvent} from '../../types';
-import {replayState} from '../shared-state';
 import {FailedLinking} from './failed-linking';
+import {isEventOfType} from '../../types';
 
 export const getFailedImports = (
   events: ReadonlyArray<DomainEvent>
 ): ReadonlyArray<FailedLinking> =>
   pipe(
     events,
-    replayState,
-    state => state.failedImports,
-    failedImports => Array.from(failedImports.values())
+    RA.filter(
+      isEventOfType('LinkingMemberNumberToAnAlreadyUsedEmailAttempted')
+    ),
+    RA.map(({memberNumber, email}) => ({memberNumber, email}))
   );

src/read-models/members/index.ts

@@ -1,12 +1,10 @@
-import {getAll, getAllDetails, getAllDetailsAsActor} from './get-all';
+import {getAll} from './get-all';
 import {lookupByEmail} from './lookup-by-email';
 import {getFailedImports} from './get-failed-imports';
 
 export const members = {
   lookupByEmail,
   getAll,
-  getAllDetails,
-  getAllDetailsAsActor,
   getFailedImports,
 };
 

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

@@ -5,6 +5,10 @@ import {pipe} from 'fp-ts/lib/function';
 import {DomainEvent} from '../../types';
 import * as TE from 'fp-ts/TaskEither';
 
+function payloadToString(payload: unknown): string {
+  return JSON.stringify(payload);
+}
+
 export const asyncRefresh = (
   eventStoreDb: Client,
   updateState: (event: DomainEvent) => void
@@ -15,7 +19,7 @@ export const asyncRefresh = (
       getAllEvents(eventStoreDb)(),
       TE.getOrElse(failure => {
         throw new Error(
-          `unexpected Left from getAllEvents: ${failure.message}`
+          `unexpected Left from getAllEvents: ${failure.message} ${payloadToString(failure.payload)}`
         );
       })
     )();

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

@@ -24,8 +24,6 @@ import {Dependencies} from '../../dependencies';
 import {dumpCurrentState, SharedDatabaseDump} from './debug/dump';
 import {getAllTroubleTicketFull} from './troubletickets/get';
 
-export {replayState} from './deprecated-replay';
-
 export type SharedReadModel = {
   db: BetterSQLite3Database;
   _underlyingReadModelDb: Database.Database; // This is exposed only to allow debug serialisation of the db.

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

@@ -3,11 +3,6 @@ import {EmailAddress, GravatarHash} from '../../types';
 import * as O from 'fp-ts/Option';
 import {blob, integer, sqliteTable, text} from 'drizzle-orm/sqlite-core';
 
-type TrainedOn = {
-  id: Equipment['id'];
-  trainedAt: Date;
-};
-
 export const membersTable = sqliteTable('members', {
   memberNumber: integer('memberNumber').notNull().primaryKey(),
   emailAddress: text('emailAddress').notNull().$type<EmailAddress>(),
@@ -203,45 +198,3 @@ export const createTables = [
   createTrainingQuizTable,
   createTroubleTicketResponsesTable,
 ];
-
-type Member = {
-  trainedOn: ReadonlyArray<TrainedOn>;
-  memberNumber: number;
-  emailAddress: EmailAddress;
-  prevEmails: ReadonlyArray<EmailAddress>;
-  name: O.Option<string>;
-  formOfAddress: O.Option<string>;
-  agreementSigned: O.Option<Date>;
-  isSuperUser: boolean;
-  gravatarHash: GravatarHash;
-};
-
-type Area = {
-  id: string;
-  owners: Set<number>;
-};
-
-type Equipment = {
-  id: string;
-  name: string;
-  areaId: Area['id'];
-};
-
-type FailedLinking = {
-  memberNumber: number;
-  email: string;
-};
-
-export type State = {
-  members: Map<Member['memberNumber'], Member>;
-  areas: Map<Area['id'], Area>;
-  equipment: Map<Equipment['id'], Equipment>;
-  failedImports: Set<FailedLinking>;
-};
-
-export const emptyState = (): State => ({
-  members: new Map(),
-  areas: new Map(),
-  equipment: new Map(),
-  failedImports: new Set(),
-});