feat: user office automatic joining of invitees to the

apps/backend/db_patches/db_seeds/0007_CoProposersInvite.sql

@@ -0,0 +1,50 @@
+DO
+$DO$
+DECLARE  
+  invite_id_var1 int;
+  invite_id_var2 int;
+  invite_id_var3 int;
+  invite_id_var4 int;
+BEGIN
+
+  INSERT INTO invites (code, email, created_by, created_at, claimed_by, claimed_at, is_email_sent, expires_at, template_id) 
+  VALUES ('DAVE001', 'david@teleworm.us', 1, NOW(), NULL, NULL, false, NULL, 'user-office-registration-invitation-co-proposer');
+
+  SELECT invite_id
+  INTO invite_id_var1
+  FROM invites
+  WHERE email = 'david@teleworm.us' AND code = 'DAVE001';
+
+  INSERT INTO invites (code, email, created_by, created_at, claimed_by, claimed_at, is_email_sent, expires_at, template_id) 
+  VALUES ('BEN001', 'ben@inbox.com', 1, NOW(), NULL, NULL, false, NULL, 'user-office-registration-invitation-co-proposer');
+
+  SELECT invite_id
+  INTO invite_id_var2
+  FROM invites
+  WHERE email = 'ben@inbox.com' AND code = 'BEN001';
+
+  INSERT INTO co_proposer_claims (invite_id, proposal_pk) VALUES (invite_id_var1, 1);
+  INSERT INTO co_proposer_claims (invite_id, proposal_pk) VALUES (invite_id_var2, 1);
+
+  INSERT INTO invites (code, email, created_by, created_at, claimed_by, claimed_at, is_email_sent, expires_at, template_id) 
+  VALUES ('DAVE002', 'david@teleworm.us', 1, NOW(), NULL, NULL, false, NULL, '');
+
+  SELECT invite_id
+  INTO invite_id_var3
+  FROM invites
+  WHERE email = 'david@teleworm.us' AND code = 'DAVE002';
+
+  INSERT INTO invites (code, email, created_by, created_at, claimed_by, claimed_at, is_email_sent, expires_at, template_id) 
+  VALUES ('BEN002', 'ben@inbox.com', 1, NOW(), NULL, NULL, false, NULL, '');
+
+  SELECT invite_id
+  INTO invite_id_var4
+  FROM invites
+  WHERE email = 'ben@inbox.com' AND code = 'BEN002';
+
+  INSERT INTO co_proposer_claims (invite_id, proposal_pk) VALUES (invite_id_var3, 2);
+  INSERT INTO co_proposer_claims (invite_id, proposal_pk) VALUES (invite_id_var4, 2);
+
+END;
+$DO$
+LANGUAGE plpgsql;

apps/backend/src/datasources/InviteDataSource.ts

@@ -5,6 +5,11 @@ export interface GetInvitesFilter {
   createdAfter?: Date;
   isClaimed?: boolean;
   isExpired?: boolean;
+  email?: string;
+}
+
+export interface GetCoProposerInvitesFilter extends GetInvitesFilter {
+  proposalPk?: number;
 }
 
 export interface InviteDataSource {
@@ -27,6 +32,7 @@ export interface InviteDataSource {
     isClaimed?: boolean
   ): Promise<Invite[]>;
   getInvites(filter: GetInvitesFilter): Promise<Invite[]>;
+  getCoProposerInvites(filter: GetCoProposerInvitesFilter): Promise<Invite[]>;
 
   update(args: {
     id: number;

apps/backend/src/datasources/ProposalDataSource.ts

@@ -1,6 +1,6 @@
 import { Event } from '../events/event.enum';
 import { Call } from '../models/Call';
-import { Proposal, Proposals } from '../models/Proposal';
+import { InvitedProposal, Proposal, Proposals } from '../models/Proposal';
 import { ProposalView } from '../models/ProposalView';
 import { TechnicalReview } from '../models/TechnicalReview';
 import { UserWithRole } from '../models/User';
@@ -92,4 +92,5 @@ export interface ProposalDataSource {
     sortDirection?: string,
     searchText?: string
   ): Promise<{ totalCount: number; proposals: ProposalView[] }>;
+  getInvitedProposal(inviteId: number): Promise<InvitedProposal | null>;
 }

apps/backend/src/datasources/mockups/InviteDataSource.ts

@@ -2,13 +2,19 @@ import { inject, injectable } from 'tsyringe';
 
 import { Tokens } from '../../config/Tokens';
 import { EmailTemplateId } from '../../eventHandlers/email/essEmailHandler';
+import { CoProposerClaim } from '../../models/CoProposerClaim';
 import { Invite } from '../../models/Invite';
 import { CoProposerClaimDataSource } from '../CoProposerClaimDataSource';
-import { GetInvitesFilter, InviteDataSource } from '../InviteDataSource';
+import {
+  GetCoProposerInvitesFilter,
+  GetInvitesFilter,
+  InviteDataSource,
+} from '../InviteDataSource';
 
 @injectable()
 export class InviteDataSourceMock implements InviteDataSource {
   private invites: Invite[];
+  private coProposerClaims: CoProposerClaim[];
 
   constructor(
     @inject(Tokens.CoProposerClaimDataSource)
@@ -86,6 +92,8 @@ export class InviteDataSourceMock implements InviteDataSource {
         EmailTemplateId.USER_OFFICE_REGISTRATION_INVITATION_REVIEWER
       ),
     ];
+
+    this.coProposerClaims = [new CoProposerClaim(2, 1)];
   }
 
   async findByCode(code: string): Promise<Invite | null> {
@@ -177,4 +185,56 @@ export class InviteDataSourceMock implements InviteDataSource {
 
     return invite;
   }
+  getCoProposerInvites(filter: GetCoProposerInvitesFilter): Promise<Invite[]> {
+    return new Promise((resolve) => {
+      const filteredInvites = this.invites.filter((invite) => {
+        if (filter.createdBefore) {
+          if (invite.createdAt >= filter.createdBefore) {
+            return false;
+          }
+        }
+
+        if (filter.createdAfter) {
+          if (invite.createdAt <= filter.createdAfter) {
+            return false;
+          }
+        }
+
+        if (filter.isClaimed !== undefined) {
+          if (invite.claimedAt === null && filter.isClaimed) {
+            return false;
+          }
+          if (invite.claimedAt !== null && !filter.isClaimed) {
+            return false;
+          }
+        }
+
+        if (filter.isExpired) {
+          if (invite.expiresAt && invite.expiresAt < new Date()) {
+            return false;
+          }
+        }
+
+        if (filter.email) {
+          if (invite.email !== filter.email) {
+            return false;
+          }
+        }
+
+        if (filter.proposalPk) {
+          const inviteIds = this.coProposerClaims
+            .filter((claim) => claim.proposalPk === filter.proposalPk)
+            .map((claim) => claim.inviteId);
+
+          if (!inviteIds.includes(invite.id)) {
+            return false;
+          }
+        }
+
+        return true;
+      });
+
+      resolve(filteredInvites);
+    });
+  }
 }

apps/backend/src/datasources/mockups/ProposalDataSource.ts

@@ -2,7 +2,12 @@ import 'reflect-metadata';
 import { Event } from '../../events/event.enum';
 import { AllocationTimeUnits, Call } from '../../models/Call';
 import { FapMeetingDecision } from '../../models/FapMeetingDecision';
-import { Proposal, ProposalEndStatus, Proposals } from '../../models/Proposal';
+import {
+  InvitedProposal,
+  Proposal,
+  ProposalEndStatus,
+  Proposals,
+} from '../../models/Proposal';
 import { ProposalView } from '../../models/ProposalView';
 import {
   TechnicalReview,
@@ -19,6 +24,7 @@ export let dummyProposal: Proposal;
 export let dummyProposalView: ProposalView;
 export let dummyProposalSubmitted: Proposal;
 export let dummyProposalWithNotActiveCall: Proposal;
+export let dummyProposalWithoutInvitation: Proposal;
 
 let allProposals: Proposal[];
 
@@ -160,6 +166,12 @@ export class ProposalDataSourceMock implements ProposalDataSource {
       callId: 2,
     });
 
+    dummyProposalWithoutInvitation = dummyProposalFactory({
+      primaryKey: 4,
+      title: 'Proposal without invitation',
+      proposalId: 'no-invite',
+    });
+
     dummyProposalView = new ProposalView(
       1,
       '',
@@ -207,6 +219,7 @@ export class ProposalDataSourceMock implements ProposalDataSource {
       dummyProposal,
       dummyProposalSubmitted,
       dummyProposalWithNotActiveCall,
+      dummyProposalWithoutInvitation,
     ];
 
     this.proposalsUpdated = [];
@@ -404,7 +417,7 @@ export class ProposalDataSourceMock implements ProposalDataSource {
   }
 
   async getProposalById(proposalId: string): Promise<Proposal | null> {
-    return dummyProposal.proposalId === proposalId ? dummyProposal : null;
+    return allProposals.find((p) => p.proposalId === proposalId) || null;
   }
 
   async doesProposalNeedTechReview(proposalPk: number): Promise<boolean> {
@@ -422,4 +435,8 @@ export class ProposalDataSourceMock implements ProposalDataSource {
   ) {
     return { totalCount: 1, proposals: [dummyProposalView] };
   }
+
+  getInvitedProposal(inviteId: number): Promise<InvitedProposal | null> {
+    throw new Error('Method not implemented.');
+  }
 }

apps/backend/src/datasources/postgres/InviteDataSource.ts

@@ -1,10 +1,13 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 
 import { Invite } from '../../models/Invite';
-import { GetInvitesFilter, InviteDataSource } from '../InviteDataSource';
+import {
+  GetCoProposerInvitesFilter,
+  GetInvitesFilter,
+  InviteDataSource,
+} from '../InviteDataSource';
 import database from './database';
 import { createInviteObject, InviteRecord } from './records';
-
 export default class PostgresInviteDataSource implements InviteDataSource {
   findCoProposerInvites(
     proposalPk: number,
@@ -100,6 +103,51 @@ export default class PostgresInviteDataSource implements InviteDataSource {
         if (filter.isExpired) {
           query.where('expires_at', '<', new Date());
         }
+
+        if (filter.email) {
+          query.whereRaw('lower(email) = ?', filter.email.toLowerCase());
+        }
+      })
+      .then((invites: InviteRecord[]) => invites.map(createInviteObject));
+  }
+
+  getCoProposerInvites(filter: GetCoProposerInvitesFilter): Promise<Invite[]> {
+    return database
+      .select('*')
+      .from('invites')
+      .join(
+        'co_proposer_claims',
+        'invites.invite_id',
+        'co_proposer_claims.invite_id'
+      )
+      .modify((query) => {
+        if (filter.createdBefore) {
+          query.where('created_at', '<', filter.createdBefore);
+        }
+
+        if (filter.createdAfter) {
+          query.where('created_at', '>', filter.createdAfter);
+        }
+
+        if (filter.isClaimed !== undefined) {
+          if (filter.isClaimed) {
+            query.whereNotNull('claimed_at');
+          } else {
+            query.whereNull('claimed_at');
+          }
+        }
+
+        if (filter.isExpired) {
+          query.where('expires_at', '<', new Date());
+        }
+
+        if (filter.email) {
+          query.whereRaw('lower(email) = ?', filter.email.toLowerCase());
+        }
+
+        if (filter.proposalPk) {
+          query.where('co_proposer_claims.proposal_pk', filter.proposalPk);
+        }
       })
       .then((invites: InviteRecord[]) => invites.map(createInviteObject));
   }

apps/backend/src/datasources/postgres/ProposalDataSource.ts

@@ -7,7 +7,7 @@ import { inject, injectable } from 'tsyringe';
 import { Tokens } from '../../config/Tokens';
 import { Event } from '../../events/event.enum';
 import { Call } from '../../models/Call';
-import { Proposal, Proposals } from '../../models/Proposal';
+import { InvitedProposal, Proposal, Proposals } from '../../models/Proposal';
 import { ProposalView } from '../../models/ProposalView';
 import { getQuestionDefinition } from '../../models/questionTypes/QuestionRegistry';
 import { ReviewerFilter } from '../../models/Review';
@@ -40,6 +40,8 @@ import {
   TechnicalReviewRecord,
   TechniqueRecord,
   createProposalViewObjectWithTechniques,
+  InvitedProposalRecord,
+  createInvitedProposalObject,
 } from './records';
 
 const fieldMap: { [key: string]: string } = {
@@ -1309,4 +1311,24 @@ export default class PostgresProposalDataSource implements ProposalDataSource {
 
     return proposal ? createProposalObject(proposal[0]) : null;
   }
+
+  async getInvitedProposal(inviteId: number): Promise<InvitedProposal | null> {
+    const proposals: InvitedProposalRecord[] | undefined = await database
+      .select(
+        'proposals.proposal_id',
+        'proposer.firstname as proposer_name',
+        'proposals.abstract',
+        'proposals.title'
+      )
+      .from('co_proposer_claims')
+      .join('proposals', {
+        'co_proposer_claims.proposal_pk': 'proposals.proposal_pk',
+      })
+      .join('users as proposer', {
+        'proposals.proposer_id': 'proposer.user_id',
+      })
+      .where('invite_id', inviteId);
+
+    return proposals ? createInvitedProposalObject(proposals[0]) : null;
+  }
 }

apps/backend/src/datasources/postgres/records.ts

@@ -24,7 +24,11 @@ import { Institution } from '../../models/Institution';
 import { Instrument } from '../../models/Instrument';
 import { Invite } from '../../models/Invite';
 import { PredefinedMessage } from '../../models/PredefinedMessage';
-import { Proposal, ProposalEndStatus } from '../../models/Proposal';
+import {
+  InvitedProposal,
+  Proposal,
+  ProposalEndStatus,
+} from '../../models/Proposal';
 import { ProposalInternalComment } from '../../models/ProposalInternalComment';
 import { ProposalPdfTemplate } from '../../models/ProposalPdfTemplate';
 import { ProposalView } from '../../models/ProposalView';
@@ -173,6 +177,13 @@ export interface ProposalViewRecord {
   readonly techniques: ProposalViewTechnique[];
 }
 
+export interface InvitedProposalRecord {
+  readonly proposal_id: string;
+  readonly proposer_name: string;
+  readonly title: string;
+  readonly abstract: string;
+}
+
 export interface TopicRecord {
   readonly topic_id: number;
   readonly topic_title: string;
@@ -901,6 +912,15 @@ export const createProposalViewObject = (proposal: ProposalViewRecord) => {
   );
 };
 
+export const createInvitedProposalObject = (record: InvitedProposalRecord) => {
+  return new InvitedProposal(
+    record.proposal_id,
+    record.proposer_name,
+    record.title,
+    record.abstract
+  );
+};
+
 export const createFieldDependencyObject = (
   fieldDependency: FieldDependencyRecord & { natural_key: string }
 ) => {

apps/backend/src/eventHandlers/email/essEmailHandler.spec.ts

@@ -68,6 +68,7 @@ describe('essEmailHandler co-proposer invites', () => {
 
     const mockEvent = {
       type: Event.PROPOSAL_CO_PROPOSER_INVITE_ACCEPTED,
+      loggedInUserId: 2,
       invite: {
         id: 1, // This will match the default mock data
         email: inviteEmail,