fixed comments

Author: yoganandaness

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

@@ -64,6 +64,9 @@ export async function essEmailHandler(event: ApplicationEvent) {
   switch (event.type) {
     case Event.PROPOSAL_CO_PROPOSER_INVITE_ACCEPTED: {
       const invite: Invite = event.invite;
+      const loggedInUserId = event.loggedInUserId;
+
+      if (!loggedInUserId) return;
 
       const coProposerClaims = await coProposerDataSource.findByInviteId(
         invite.id
@@ -101,9 +104,7 @@ export async function essEmailHandler(event: ApplicationEvent) {
           return;
         }
 
-        const claimer = await userDataSource.getUser(
-          invite.claimedByUserId as number
-        );
+        const claimer = await userDataSource.getUser(loggedInUserId);
         if (!claimer) {
           logger.logError(
             'No claimer found when trying to send invite accepted email',

apps/backend/src/mutations/InviteMutations.ts

@@ -57,6 +57,9 @@ export default class InviteMutations {
     agent: UserWithRole | null,
     code: string
   ): Promise<Invite | Rejection> {
+    if (!agent) {
+      return rejection('User not found', { invite: code });
+    }
     const invite = await this.inviteDataSource.findByCode(code);
     if (invite === null) {
       return rejection('Invite code not found', { invite: code });
@@ -69,28 +72,30 @@ export default class InviteMutations {
       return rejection('Invite code has expired', { invite: code });
     }
 
+    await this.processAcceptedRoleClaims(agent.id, invite);
+    await this.processAcceptedCoProposerClaims(agent.id, invite);
+    await this.processAcceptedVisitRegistrationClaims(agent.id, invite);
+
     const updatedInvite = await this.inviteDataSource.update({
       id: invite.id,
       claimedAt: new Date(),
       claimedByUserId: agent!.id,
     });
 
-    await this.processAcceptedRoleClaims(agent!.id, updatedInvite);
-    await this.processAcceptedCoProposerClaims(agent!.id, updatedInvite);
-    await this.processAcceptedVisitRegistrationClaims(agent!.id, updatedInvite);
-
     return updatedInvite;
   }
 
   @Authorized([Roles.USER])
   async acceptCoProposerInvite(agent: UserWithRole | null, proposalId: string) {
+    if (!agent) {
+      return rejection('User not found', { proposalId });
+    }
+
     const proposal = await this.proposalDataSource.getProposalById(proposalId);
     if (!proposal) {
       return rejection('Proposal not found', { proposalId });
     }
-    if (!agent) {
-      return rejection('User not found', { proposalId });
-    }
+
     const [invite] = await this.inviteDataSource.getCoProposerInvites({
       proposalPk: proposal.primaryKey,
       email: agent.email,
@@ -101,15 +106,15 @@ export default class InviteMutations {
       return rejection('Invite not found', { proposalId });
     }
 
+    await this.processAcceptedRoleClaims(agent.id, invite);
+    await this.processAcceptedCoProposerClaims(agent.id, invite);
+
     const updatedInvite = await this.inviteDataSource.update({
       id: invite.id,
       claimedAt: new Date(),
       claimedByUserId: agent.id,
     });
 
-    await this.processAcceptedRoleClaims(agent.id, updatedInvite);
-    await this.processAcceptedCoProposerClaims(agent.id, updatedInvite);
-
     return updatedInvite;
   }