Remove unused lookup by email

Author: Lan2u

src/read-models/members/index.ts

@@ -1,11 +1,8 @@
-// import {getAll} from './get-all';
-import {lookupByEmail, lookupByCaseInsensitiveEmail} from './lookup-by-email';
+import {lookupByCaseInsensitiveEmail} from './lookup-by-email';
 import {getFailedImports} from './get-failed-imports';
 
 export const members = {
-  lookupByEmail,
   lookupByCaseInsensitiveEmail,
-  // getAll,
   getFailedImports,
 };
 

src/read-models/members/lookup-by-email.ts

@@ -1,26 +1,15 @@
 import * as RA from 'fp-ts/ReadonlyArray';
-import * as O from 'fp-ts/Option';
 import {DomainEvent, EmailAddress, isEventOfType} from '../../types';
 import {pipe} from 'fp-ts/lib/function';
 
-export const lookupByEmail =
-  (email: string) =>
-  (events: ReadonlyArray<DomainEvent>): O.Option<number> =>
-    pipe(
-      events,
-      RA.filter(isEventOfType('MemberNumberLinkedToEmail')),
-      RA.findFirst(event => event.email === email),
-      O.map(event => event.memberNumber)
-    );
-
 export const lookupByCaseInsensitiveEmail =
   (email: string) =>
   (
     events: ReadonlyArray<DomainEvent>
   ): ReadonlyArray<{emailAddress: EmailAddress; memberNumber: number}> =>
     pipe(
       events,
-      RA.filter(isEventOfType('MemberNumberLinkedToEmail')),
+      RA.filter(event => isEventOfType('MemberNumberLinkedToEmail')(event) || isEventOfType('MemberEmailChanged')(event)),
       RA.filter(event => event.email.toLowerCase() === email.toLowerCase()),
       RA.map(({memberNumber, email}) => ({memberNumber, emailAddress: email}))
     );

tests/read-models/members/lookup-by-email.test.ts

@@ -1,93 +1,12 @@
 import * as O from 'fp-ts/Option';
 import {
-  lookupByEmail,
   lookupByCaseInsensitiveEmail,
 } from '../../../src/read-models/members/lookup-by-email';
 import {faker} from '@faker-js/faker';
 import {DomainEvent, EmailAddress} from '../../../src/types';
 import {TestFramework, initTestFramework} from '../test-framework';
 import { EditEmail } from '../../../src/commands/members/edit-email';
 
-describe('lookupByEmail', () => {
-  let events: ReadonlyArray<DomainEvent>;
-  let framework: TestFramework;
-  beforeEach(async () => {
-    framework = await initTestFramework();
-  });
-  afterEach(() => {
-    framework.close();
-  });
-
-  describe('when no members exist', () => {
-    beforeEach(async () => {
-      events = await framework.getAllEvents();
-    });
-
-    it('returns none', () => {
-      const result = lookupByEmail(faker.internet.email())(events);
-      expect(result).toStrictEqual(O.none);
-    });
-  });
-
-  describe('when a member with the given email exists', () => {
-    const command = {
-      memberNumber: faker.number.int(),
-      email: faker.internet.email() as EmailAddress,
-      name: undefined,
-      formOfAddress: undefined,
-    };
-    beforeEach(async () => {
-      await framework.commands.memberNumbers.linkNumberToEmail(command);
-      events = await framework.getAllEvents();
-    });
-
-    it('returns their member number', () => {
-      const result = lookupByEmail(command.email)(events);
-      expect(result).toStrictEqual(O.some(command.memberNumber));
-    });
-
-    describe('when the member has changed their email', () => {
-      const editEmailCommand: EditEmail = {
-        memberNumber: command.memberNumber,
-        email: faker.internet.email() as EmailAddress,
-      };
-
-      beforeEach(async () => {
-        await framework.commands.members.editEmail(editEmailCommand);
-      });
-
-      it('returns their member number using the new email', () => {
-        const result = lookupByEmail(editEmailCommand.email)(events);
-        expect(result).toStrictEqual(O.some(command.memberNumber));
-      });
-
-      it('returns their member number using the old email', () => {
-        const result = lookupByEmail(command.email)(events);
-        expect(result).toStrictEqual(O.some(command.memberNumber));
-      });
-
-    });
-  });
-
-  describe('when no member with the given email exists', () => {
-    const command = {
-      memberNumber: faker.number.int(),
-      email: faker.internet.email() as EmailAddress,
-      name: undefined,
-      formOfAddress: undefined,
-    };
-    beforeEach(async () => {
-      await framework.commands.memberNumbers.linkNumberToEmail(command);
-      events = await framework.getAllEvents();
-    });
-
-    it('returns none', () => {
-      const result = lookupByEmail(faker.internet.email())(events);
-      expect(result).toStrictEqual(O.none);
-    });
-  });
-});
-
 describe('lookupByCaseInsensitiveEmail', () => {
   let events: ReadonlyArray<DomainEvent>;
   let framework: TestFramework;
@@ -150,22 +69,22 @@ describe('lookupByCaseInsensitiveEmail', () => {
       });
 
       it('returns their member number using the new email', () => {
-        const result = lookupByEmail(editEmailCommand.email)(events);
+        const result = lookupByCaseInsensitiveEmail(editEmailCommand.email)(events);
         expect(result).toStrictEqual(O.some(command.memberNumber));
       });
 
       it('returns their member number using the old email', () => {
-        const result = lookupByEmail(command.email)(events);
+        const result = lookupByCaseInsensitiveEmail(command.email)(events);
         expect(result).toStrictEqual(O.some(command.memberNumber));
       });
 
       it('returns their member number using the new email even in wrong case', () => {
-        const result = lookupByEmail(editEmailCommand.email.toUpperCase())(events);
+        const result = lookupByCaseInsensitiveEmail(editEmailCommand.email.toUpperCase())(events);
         expect(result).toStrictEqual(O.some(command.memberNumber));
       });
 
       it('returns their member number using the old email even in wrong case', () => {
-        const result = lookupByEmail(command.email.toUpperCase())(events);
+        const result = lookupByCaseInsensitiveEmail(command.email.toUpperCase())(events);
         expect(result).toStrictEqual(O.some(command.memberNumber));
       });
     });