Remove pronouns from member info

scripts/populate-local-dev.sh

@@ -18,32 +18,27 @@ event 'api/equipment/add-training-sheet' '{"equipmentId": "4224ee94-09b0-47d4-ae
 # Ada Admin (superuser)
 event 'api/members/create' '{"memberNumber": "1337", "email": "[email protected]"}'
 event 'api/members/edit-name' '{"memberNumber": "1337", "name": "Ada Admin"}'
-event 'api/members/edit-pronouns' '{"memberNumber": "1337", "pronouns": "she/her"}'
 event 'api/super-users/declare' '{"memberNumber": "1337"}'
 
 # Owen Owner (owner of metal shop area)
 event 'api/members/create' '{"memberNumber": "4150", "email": "[email protected]"}'
 event 'api/members/edit-name' '{"memberNumber": "4150", "name": "Owen Owner"}'
-event 'api/members/edit-pronouns' '{"memberNumber": "4150", "pronouns": "he/him"}'
 event 'api/areas/add-owner' '{"areaId": "eeaf7f8b-77a3-429d-ae9d-2f7ade53736e", "memberNumber": "4150"}'
 
 # Treacle Trainer (Trainer for metal lathe)
 event 'api/members/create' '{"memberNumber": "7777", "email": "[email protected]"}'
 event 'api/members/edit-name' '{"memberNumber": "7777", "name": "Treacle Trainer"}'
-event 'api/members/edit-pronouns' '{"memberNumber": "7777", "pronouns": "they/them"}'
 event 'api/equipment/mark-member-trained' '{"equipmentId": "4224ee94-09b0-47d4-ae60-fac46b8ca93e", "memberNumber": "7777"}'
 event 'api/equipment/add-trainer' '{"equipmentId": "4224ee94-09b0-47d4-ae60-fac46b8ca93e", "memberNumber": "7777"}'
 
 # Lucy Lathe (Trained on Lathe)
 event 'api/members/create' '{"memberNumber": "8888", "email": "[email protected]"}'
 event 'api/members/edit-name' '{"memberNumber": "8888", "name": "Lucy Lathe"}'
-event 'api/members/edit-pronouns' '{"memberNumber": "8888", "pronouns": "she/her"}'
 event 'api/equipment/mark-member-trained' '{"equipmentId": "4224ee94-09b0-47d4-ae60-fac46b8ca93e", "memberNumber": "8888"}'
 
 # Neon Newmember (has completed the lathe training sheet)
 event 'api/members/create' '{"memberNumber": "9999", "email": "[email protected]"}'
 event 'api/members/edit-name' '{"memberNumber": "9999", "name": "Neon Newmember"}'
-event 'api/members/edit-pronouns' '{"memberNumber": "9999", "pronouns": "they/them"}'
 
 # [email protected]
 event 'api/members/create' '{"memberNumber": "1234", "email": "[email protected]"}'

src/commands/members/edit-name.ts

@@ -17,7 +17,6 @@ const process: Command<EditName>['process'] = input =>
     constructEvent('MemberDetailsUpdated')({
       memberNumber: input.command.memberNumber,
       name: input.command.name,
-      pronouns: undefined,
     })
   );
 

src/commands/members/index.ts

@@ -1,8 +1,6 @@
 import {editEmail} from './edit-email';
 import {editName} from './edit-name';
 import {editNameForm} from './edit-name-form';
-import {editPronouns} from './edit-pronouns';
-import {editPronounsForm} from './edit-pronouns-form';
 import {signOwnerAgreement} from './sign-owner-agreement';
 import {signOwnerAgreementForm} from './sign-owner-agreement-form';
 
@@ -14,10 +12,6 @@ export const members = {
   editEmail: {
     ...editEmail,
   },
-  editPronouns: {
-    ...editPronouns,
-    ...editPronounsForm,
-  },
   signOwnerAgreement: {
     ...signOwnerAgreement,
     ...signOwnerAgreementForm,

src/queries/me/render.ts

@@ -12,11 +12,6 @@ const editName = (viewModel: ViewModel) =>
     >Edit</a
   >`;
 
-const editPronouns = (viewModel: ViewModel) =>
-  html`<a href="/members/edit-pronouns?member=${viewModel.member.memberNumber}"
-    >Edit</a
-  >`;
-
 const editAvatar = () =>
   html`<a href="https://gravatar.com/profile">Edit via Gravatar</a>`;
 
@@ -35,13 +30,6 @@ const renderMemberDetails = (viewModel: ViewModel) => html`
         <th scope="row">Name</th>
         <td>${sanitizeOption(viewModel.member.name)} ${editName(viewModel)}</td>
       </tr>
-      <tr>
-        <th scope="row">Pronouns</th>
-        <td>
-          ${sanitizeOption(viewModel.member.pronouns)}
-          ${editPronouns(viewModel)}
-        </td>
-      </tr>
       <tr>
         <th scope="row">Avatar</th>
         <td>

src/queries/member/render.ts

@@ -14,11 +14,6 @@ const editName = (viewModel: ViewModel) =>
     >Edit</a
   >`;
 
-const editPronouns = (viewModel: ViewModel) =>
-  html`<a href="/members/edit-pronouns?member=${viewModel.member.memberNumber}"
-    >Edit</a
-  >`;
-
 const editAvatar = () =>
   html`<a href="https://gravatar.com/profile">Edit via Gravatar</a>`;
 
@@ -53,13 +48,6 @@ export const render = (viewModel: ViewModel) => html`
           ${ifSelf(viewModel, editName(viewModel))}
         </td>
       </tr>
-      <tr>
-        <th scope="row">Pronouns</th>
-        <td>
-          ${sanitizeOption(viewModel.member.pronouns)}
-          ${ifSelf(viewModel, editPronouns(viewModel))}
-        </td>
-      </tr>
       <tr>
         <th scope="row">Avatar</th>
         <td>

src/queries/members/render.ts

@@ -25,7 +25,6 @@ const renderMembers = (viewModel: ViewModel) =>
           </td>
           <td>${renderMemberNumber(member.memberNumber)}</td>
           <td>${sanitizeOption(member.name)}</td>
-          <td>${sanitizeOption(member.pronouns)}</td>
           <td>${sanitizeString(member.emailAddress)}</td>
         </tr>
       `
@@ -39,7 +38,6 @@ const renderMembers = (viewModel: ViewModel) =>
               <th></th>
               <th>Member number</th>
               <th>Name</th>
-              <th>Pronouns</th>
               <th>Email</th>
             </tr>
           </thead>

src/read-models/members/return-types.ts

@@ -12,7 +12,6 @@ export type Member = {
   emailAddress: EmailAddress;
   prevEmails: ReadonlyArray<EmailAddress>;
   name: O.Option<string>;
-  pronouns: O.Option<string>;
   agreementSigned: O.Option<Date>;
   isSuperUser: boolean;
   gravatarHash: GravatarHash;

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

@@ -28,7 +28,6 @@ const handleEvent = (
       memberNumber: event.memberNumber,
       emailAddress: event.email,
       name: O.none,
-      pronouns: O.none,
       agreementSigned: O.none,
       isSuperUser: false,
       prevEmails: [],
@@ -41,11 +40,7 @@ const handleEvent = (
     if (current) {
       const name =
         event.name !== undefined ? O.fromNullable(event.name) : current.name;
-      const pronouns =
-        event.pronouns !== undefined
-          ? O.fromNullable(event.pronouns)
-          : current.pronouns;
-      state.members.set(event.memberNumber, {...current, name, pronouns});
+      state.members.set(event.memberNumber, {...current, name});
     }
   }
   if (isEventOfType('MemberEmailChanged')(event)) {

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

@@ -82,7 +82,6 @@ export type MemberCoreInfo = {
   emailAddress: EmailAddress;
   prevEmails: ReadonlyArray<EmailAddress>;
   name: O.Option<string>;
-  pronouns: O.Option<string>;
   agreementSigned: O.Option<Date>;
   isSuperUser: boolean;
   gravatarHash: GravatarHash;

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

@@ -13,9 +13,6 @@ export const membersTable = sqliteTable('members', {
   emailAddress: text('emailAddress').notNull().$type<EmailAddress>(),
   gravatarHash: text('gravatarHash').notNull().$type<GravatarHash>(),
   name: blob('name', {mode: 'json'}).notNull().$type<O.Option<string>>(),
-  pronouns: blob('pronouns', {mode: 'json'})
-    .notNull()
-    .$type<O.Option<string>>(),
   prevEmails: blob('prevEmails', {mode: 'json'})
     .notNull()
     .$type<ReadonlyArray<EmailAddress>>(),
@@ -29,7 +26,6 @@ const createMembersTable = sql`
     emailAddress TEXT,
     gravatarHash TEXT,
     name BLOB,
-    pronouns BLOB,
     prevEmails BLOB,
     isSuperUser INTEGER,
     agreementSigned INTEGER
@@ -178,7 +174,6 @@ type Member = {
   emailAddress: EmailAddress;
   prevEmails: ReadonlyArray<EmailAddress>;
   name: O.Option<string>;
-  pronouns: O.Option<string>;
   agreementSigned: O.Option<Date>;
   isSuperUser: boolean;
   gravatarHash: GravatarHash;

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

@@ -26,7 +26,6 @@ export const updateState =
             emailAddress: event.email,
             gravatarHash: gravatarHashFromEmail(event.email),
             name: O.none,
-            pronouns: O.none,
             prevEmails: [],
             isSuperUser: false,
             agreementSigned: undefined,
@@ -40,12 +39,6 @@ export const updateState =
             .where(eq(membersTable.memberNumber, event.memberNumber))
             .run();
         }
-        if (event.pronouns) {
-          db.update(membersTable)
-            .set({pronouns: O.some(event.pronouns)})
-            .where(eq(membersTable.memberNumber, event.memberNumber))
-            .run();
-        }
         break;
       case 'MemberEmailChanged': {
         const current = db

src/routes.ts

@@ -54,7 +54,6 @@ export const initRoutes = (
     query('/members', queries.members),
     ...command('members', 'create', commands.memberNumbers.linkNumberToEmail),
     ...command('members', 'edit-name', commands.members.editName),
-    ...command('members', 'edit-pronouns', commands.members.editPronouns),
     ...command(
       'members',
       'sign-owner-agreement',

src/templates/member-input.ts

@@ -14,7 +14,7 @@ const memberInputSelector = (member: Member): Html => html`
     <label for="member-${member.memberNumber}">
       ${getGravatarThumbnail(member.gravatarHash, member.memberNumber)}
       <span>
-        ${sanitizeOption(member.name)} (${sanitizeOption(member.pronouns)})
+        (${sanitizeOption(member.name)})
         (${sanitizeString(member.emailAddress)})
       </span>
     </label>

src/types/domain-event.ts

@@ -84,7 +84,6 @@ export const DomainEvent = t.union([
   eventCodec('MemberDetailsUpdated', {
     memberNumber: t.number,
     name: t.union([t.string, t.undefined]),
-    pronouns: t.union([t.string, t.undefined]),
   }),
   eventCodec('OwnerAgreementSigned', {
     memberNumber: t.number,

tests/read-models/shared-state/get-member.test.ts

@@ -74,10 +74,6 @@ describe('get-via-shared-read-model', () => {
           memberNumber,
           name: 'Ix',
         });
-        await framework.commands.members.editPronouns({
-          memberNumber,
-          pronouns: 'he/him',
-        });
         await framework.commands.members.editName({
           memberNumber,
           name: 'Ford Prefect',
@@ -87,7 +83,6 @@ describe('get-via-shared-read-model', () => {
       it('returns latest details', () => {
         const result = runQuery();
         expect(result.name).toStrictEqual(O.some('Ford Prefect'));
-        expect(result.pronouns).toStrictEqual(O.some('he/him'));
       });
     });
 

tests/read-models/test-framework.ts

@@ -112,7 +112,6 @@ export const initTestFramework = async (
       },
       members: {
         editName: frameworkify(commands.members.editName),
-        editPronouns: frameworkify(commands.members.editPronouns),
         signOwnerAgreement: frameworkify(commands.members.signOwnerAgreement),
         editEmail: frameworkify(commands.members.editEmail),
       },