feat: allow inviting Data Access Users to Proposal with email

apps/backend/db_patches/0213_AddDataAccessClaims.sql

@@ -0,0 +1,14 @@
+DO
+$$
+BEGIN
+  IF register_patch('0213_AddDataAccessClaims', 'Shivam K', 'Adding data access user claims', '2026-06-26') THEN
+    BEGIN
+      CREATE TABLE IF NOT EXISTS data_access_claims (
+        invite_id INT NOT NULL REFERENCES invites(invite_id) ON DELETE CASCADE,
+        proposal_pk INT NOT NULL REFERENCES proposals(proposal_pk) ON DELETE CASCADE,
+        PRIMARY KEY (invite_id, proposal_pk));
+    END;
+  END IF;
+END;
+$$
+LANGUAGE plpgsql;

apps/backend/src/config/Tokens.ts

@@ -6,6 +6,7 @@ export const Tokens = {
   ConfigureEnvironment: Symbol('ConfigureEnvironment'),
   ConfigureLogger: Symbol('ConfigureLogger'),
   CoProposerClaimDataSource: Symbol('CoProposerClaimDataSource'),
+  DataAccessClaimDataSource: Symbol('DataAccessClaimDataSource'),
   DataAccessUsersDataSource: Symbol('DataAccessUsersDataSource'),
   DataAccessUsersAuthorization: Symbol('DataAccessUsersAuthorization'),
   EmailEventHandler: Symbol('EmailEventHandler'),

apps/backend/src/config/dependencyConfigDLS.ts

@@ -13,6 +13,7 @@ import { VisitRegistrationAuthorization } from '../auth/VisitRegistrationAuthori
 import { PostgresAdminDataSourceWithAutoUpgrade } from '../datasources/postgres/AdminDataSource';
 import PostgresCallDataSource from '../datasources/postgres/CallDataSource';
 import PostgresCoProposerClaimDataSource from '../datasources/postgres/CoProposerClaimDataSource';
+import PostgresDataAccessClaimDataSource from '../datasources/postgres/DataAccessClaimDataSource';
 import PostgresDataAccessUsersDataSource from '../datasources/postgres/DataAccessUsersDataSource';
 import PostgresEmailTemplateDataSource from '../datasources/postgres/EmailTemplateDataSource';
 import PostgresEventLogsDataSource from '../datasources/postgres/EventLogsDataSource';
@@ -66,6 +67,7 @@ import { SkipAssetRegistrar } from '../services/assetRegistrar/skip/SkipAssetReg
 
 mapClass(Tokens.AdminDataSource, PostgresAdminDataSourceWithAutoUpgrade);
 mapClass(Tokens.CoProposerClaimDataSource, PostgresCoProposerClaimDataSource);
+mapClass(Tokens.DataAccessClaimDataSource, PostgresDataAccessClaimDataSource);
 mapClass(Tokens.DataAccessUsersDataSource, PostgresDataAccessUsersDataSource);
 mapClass(Tokens.CallDataSource, PostgresCallDataSource);
 mapClass(Tokens.EventLogsDataSource, PostgresEventLogsDataSource);

apps/backend/src/config/dependencyConfigDefault.ts

@@ -16,6 +16,7 @@ import { mapClass, mapValue } from './utils';
 import { PostgresAdminDataSourceWithAutoUpgrade } from '../datasources/postgres/AdminDataSource';
 import PostgresCallDataSource from '../datasources/postgres/CallDataSource';
 import PostgresCoProposerClaimDataSource from '../datasources/postgres/CoProposerClaimDataSource';
+import PostgresDataAccessClaimDataSource from '../datasources/postgres/DataAccessClaimDataSource';
 import PostgresDataAccessUsersDataSource from '../datasources/postgres/DataAccessUsersDataSource';
 import PostgresEmailTemplateDataSource from '../datasources/postgres/EmailTemplateDataSource';
 import PostgresEventLogsDataSource from '../datasources/postgres/EventLogsDataSource';
@@ -75,6 +76,7 @@ async function skipEmailHandler(event: ApplicationEvent) {
 mapClass(Tokens.RoleDataSource, PostgresRoleDataSource);
 mapClass(Tokens.AdminDataSource, PostgresAdminDataSourceWithAutoUpgrade);
 mapClass(Tokens.CoProposerClaimDataSource, PostgresCoProposerClaimDataSource);
+mapClass(Tokens.DataAccessClaimDataSource, PostgresDataAccessClaimDataSource);
 mapClass(Tokens.DataAccessUsersDataSource, PostgresDataAccessUsersDataSource);
 mapClass(Tokens.CallDataSource, PostgresCallDataSource);
 mapClass(Tokens.EventLogsDataSource, PostgresEventLogsDataSource);

apps/backend/src/config/dependencyConfigE2E.ts

@@ -13,6 +13,7 @@ import { mapClass, mapValue } from './utils';
 import PostgresAdminDataSource from '../datasources/postgres/AdminDataSource';
 import PostgresCallDataSource from '../datasources/postgres/CallDataSource';
 import PostgresCoProposerClaimDataSource from '../datasources/postgres/CoProposerClaimDataSource';
+import PostgresDataAccessClaimDataSource from '../datasources/postgres/DataAccessClaimDataSource';
 import PostgresDataAccessUsersDataSource from '../datasources/postgres/DataAccessUsersDataSource';
 import PostgresEmailTemplateDataSource from '../datasources/postgres/EmailTemplateDataSource';
 import PostgresEventLogsDataSource from '../datasources/postgres/EventLogsDataSource';
@@ -67,6 +68,7 @@ import { SkipAssetRegistrar } from '../services/assetRegistrar/skip/SkipAssetReg
 mapClass(Tokens.RoleDataSource, PostgresRoleDataSource);
 mapClass(Tokens.AdminDataSource, PostgresAdminDataSource);
 mapClass(Tokens.CoProposerClaimDataSource, PostgresCoProposerClaimDataSource);
+mapClass(Tokens.DataAccessClaimDataSource, PostgresDataAccessClaimDataSource);
 mapClass(Tokens.DataAccessUsersDataSource, PostgresDataAccessUsersDataSource);
 mapClass(Tokens.CallDataSource, PostgresCallDataSource);
 mapClass(Tokens.EventLogsDataSource, PostgresEventLogsDataSource);

apps/backend/src/config/dependencyConfigELI.ts

@@ -13,6 +13,7 @@ import { mapClass, mapValue } from './utils';
 import { PostgresAdminDataSourceWithAutoUpgrade } from '../datasources/postgres/AdminDataSource';
 import PostgresCallDataSource from '../datasources/postgres/CallDataSource';
 import PostgresCoProposerClaimDataSource from '../datasources/postgres/CoProposerClaimDataSource';
+import PostgresDataAccessClaimDataSource from '../datasources/postgres/DataAccessClaimDataSource';
 import PostgresDataAccessUsersDataSource from '../datasources/postgres/DataAccessUsersDataSource';
 import PostgresEmailTemplateDataSource from '../datasources/postgres/EmailTemplateDataSource';
 import PostgresEventLogsDataSource from '../datasources/postgres/EventLogsDataSource';
@@ -69,6 +70,7 @@ const isProduction = process.env.NODE_ENV === 'production';
 mapClass(Tokens.RoleDataSource, PostgresRoleDataSource);
 mapClass(Tokens.AdminDataSource, PostgresAdminDataSourceWithAutoUpgrade);
 mapClass(Tokens.CoProposerClaimDataSource, PostgresCoProposerClaimDataSource);
+mapClass(Tokens.DataAccessClaimDataSource, PostgresDataAccessClaimDataSource);
 mapClass(Tokens.DataAccessUsersDataSource, PostgresDataAccessUsersDataSource);
 mapClass(Tokens.CallDataSource, PostgresCallDataSource);
 mapClass(Tokens.EventLogsDataSource, PostgresEventLogsDataSource);

apps/backend/src/config/dependencyConfigESS.ts

@@ -10,6 +10,7 @@ import { getSecondsFromAllocationTimeUnits } from './base/allocationTimeUnitConv
 import { PostgresAdminDataSourceWithAutoUpgrade } from '../datasources/postgres/AdminDataSource';
 import PostgresCallDataSource from '../datasources/postgres/CallDataSource';
 import PostgresCoProposerClaimDataSource from '../datasources/postgres/CoProposerClaimDataSource';
+import PostgresDataAccessClaimDataSource from '../datasources/postgres/DataAccessClaimDataSource';
 import PostgresDataAccessUsersDataSource from '../datasources/postgres/DataAccessUsersDataSource';
 import PostgresEmailTemplateDataSource from '../datasources/postgres/EmailTemplateDataSource';
 import PostgresEventLogsDataSource from '../datasources/postgres/EventLogsDataSource';
@@ -69,6 +70,7 @@ import { mapClass, mapValue } from './utils';
 mapClass(Tokens.RoleDataSource, PostgresRoleDataSource);
 mapClass(Tokens.AdminDataSource, PostgresAdminDataSourceWithAutoUpgrade);
 mapClass(Tokens.CoProposerClaimDataSource, PostgresCoProposerClaimDataSource);
+mapClass(Tokens.DataAccessClaimDataSource, PostgresDataAccessClaimDataSource);
 mapClass(Tokens.DataAccessUsersDataSource, PostgresDataAccessUsersDataSource);
 mapClass(Tokens.CallDataSource, PostgresCallDataSource);
 mapClass(Tokens.EventLogsDataSource, PostgresEventLogsDataSource);

apps/backend/src/config/dependencyConfigSTFC.ts

@@ -13,6 +13,7 @@ import { mapClass, mapValue } from './utils';
 import { PostgresAdminDataSourceWithAutoUpgrade } from '../datasources/postgres/AdminDataSource';
 import PostgresCallDataSource from '../datasources/postgres/CallDataSource';
 import PostgresCoProposerClaimDataSource from '../datasources/postgres/CoProposerClaimDataSource';
+import PostgresDataAccessClaimDataSource from '../datasources/postgres/DataAccessClaimDataSource';
 import PostgresDataAccessUsersDataSource from '../datasources/postgres/DataAccessUsersDataSource';
 import PostgresEmailTemplateDataSource from '../datasources/postgres/EmailTemplateDataSource';
 import PostgresEventLogsDataSource from '../datasources/postgres/EventLogsDataSource';
@@ -67,6 +68,7 @@ import { SkipAssetRegistrar } from '../services/assetRegistrar/skip/SkipAssetReg
 mapClass(Tokens.RoleDataSource, PostgresRoleDataSource);
 mapClass(Tokens.AdminDataSource, PostgresAdminDataSourceWithAutoUpgrade);
 mapClass(Tokens.CoProposerClaimDataSource, PostgresCoProposerClaimDataSource);
+mapClass(Tokens.DataAccessClaimDataSource, PostgresDataAccessClaimDataSource);
 mapClass(Tokens.DataAccessUsersDataSource, PostgresDataAccessUsersDataSource);
 mapClass(Tokens.CallDataSource, PostgresCallDataSource);
 mapClass(Tokens.EventLogsDataSource, PostgresEventLogsDataSource);

apps/backend/src/config/dependencyConfigTest.ts

@@ -12,6 +12,7 @@ import { getSecondsFromAllocationTimeUnits } from './base/allocationTimeUnitConv
 import { AdminDataSourceMock } from '../datasources/mockups/AdminDataSource';
 import { CallDataSourceMock } from '../datasources/mockups/CallDataSource';
 import { CoProposerClaimDataSourceMock } from '../datasources/mockups/CoProposerClaimDataSource';
+import { DataAccessClaimDataSourceMock } from '../datasources/mockups/DataAccessClaimDataSource';
 import MockDataAccessUsersDataSource from '../datasources/mockups/DataAccessUsersDataSource';
 import { EmailTemplateDataSourceMock } from '../datasources/mockups/EmailTemplateDataSource';
 import { EventLogsDataSourceMock } from '../datasources/mockups/EventLogsDataSource';
@@ -61,6 +62,7 @@ import { mapClass, mapValue } from './utils';
 mapClass(Tokens.RoleDataSource, RoleDataSourceMock);
 mapClass(Tokens.AdminDataSource, AdminDataSourceMock);
 mapClass(Tokens.CoProposerClaimDataSource, CoProposerClaimDataSourceMock);
+mapClass(Tokens.DataAccessClaimDataSource, DataAccessClaimDataSourceMock);
 mapClass(Tokens.DataAccessUsersDataSource, MockDataAccessUsersDataSource);
 mapClass(Tokens.CallDataSource, CallDataSourceMock);
 mapClass(Tokens.EventLogsDataSource, EventLogsDataSourceMock);

apps/backend/src/datasources/DataAccessClaimDataSource.ts

@@ -0,0 +1,7 @@
+import { DataAccessClaim } from '../models/DataAccessClaim';
+
+export interface DataAccessClaimDataSource {
+  create(inviteId: number, proposalPk: number): Promise<DataAccessClaim>;
+  findByInviteId(inviteId: number): Promise<DataAccessClaim[]>;
+  findByProposalPk(proposalPk: number): Promise<DataAccessClaim[]>;
+}

apps/backend/src/datasources/DataAccessUsersDataSource.ts

@@ -11,12 +11,20 @@ export type UserWithInstitution = {
 
 export interface DataAccessUsersDataSource {
   findByProposalPk(proposalPk: number): Promise<BasicUserDetails[]>;
+
   getDataAccessUsersWithInstitution(
     proposalPk: number
   ): Promise<UserWithInstitution[]>;
+
+  addDataAccessUser(
+    proposalPk: number,
+    userId: number
+  ): Promise<Rejection | undefined>;
+
   updateDataAccessUsers(
     proposalPk: number,
     userIds: number[]
   ): Promise<BasicUserDetails[] | Rejection>;
+
   isDataAccessUserOfProposal(id: number, proposalPk: number): Promise<boolean>;
 }

apps/backend/src/datasources/InviteDataSource.ts

@@ -8,7 +8,7 @@ export interface GetInvitesFilter {
   email?: string;
 }
 
-export interface GetCoProposerInvitesFilter extends GetInvitesFilter {
+export interface GetProposalInvitesFilter extends GetInvitesFilter {
   proposalPk?: number;
 }
 
@@ -27,12 +27,17 @@ export interface InviteDataSource {
     proposalPk: number,
     isClaimed?: boolean
   ): Promise<Invite[]>;
+  findDataAccessInvites(
+    proposalPk: number,
+    isClaimed?: boolean
+  ): Promise<Invite[]>;
   findVisitRegistrationInvites(
     visitId: number,
     isClaimed?: boolean
   ): Promise<Invite[]>;
   getInvites(filter: GetInvitesFilter): Promise<Invite[]>;
-  getCoProposerInvites(filter: GetCoProposerInvitesFilter): Promise<Invite[]>;
+  getCoProposerInvites(filter: GetProposalInvitesFilter): Promise<Invite[]>;
+  getDataAccessInvites(filter: GetProposalInvitesFilter): Promise<Invite[]>;
 
   update(args: {
     id: number;

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

@@ -0,0 +1,32 @@
+import { DataAccessClaim } from '../../models/DataAccessClaim';
+import { DataAccessClaimDataSource } from '../DataAccessClaimDataSource';
+
+export class DataAccessClaimDataSourceMock
+  implements DataAccessClaimDataSource
+{
+  private invites: DataAccessClaim[] = [];
+
+  init() {
+    this.invites = [
+      new DataAccessClaim(7, 1), // use IDs unique from coproposal invites
+      new DataAccessClaim(8, 2),
+      new DataAccessClaim(9, 3),
+    ];
+  }
+
+  async findByProposalPk(proposalPk: number): Promise<DataAccessClaim[]> {
+    return this.invites.filter((invite) => invite.proposalPk === proposalPk);
+  }
+
+  async findByInviteId(inviteId: number): Promise<DataAccessClaim[]> {
+    return this.invites.filter((invite) => invite.inviteId === inviteId);
+  }
+
+  async create(inviteId: number, proposalPk: number): Promise<DataAccessClaim> {
+    const newInvite = new DataAccessClaim(inviteId, proposalPk);
+
+    this.invites.push(newInvite);
+
+    return newInvite;
+  }
+}

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

@@ -46,6 +46,7 @@ export const dummyInstitution2 = new Institution(11, 'Research Center', 2);
 
 export const dummyCountry = new Country(1, 'Denmark');
 export const dummyCountry2 = new Country(2, 'United Kingdom');
+export const dummyCountry3 = new Country(3, 'Belarus');
 
 export default class MockDataAccessUsersDataSource
   implements DataAccessUsersDataSource
@@ -121,4 +122,33 @@ export default class MockDataAccessUsersDataSource
 
     return Promise.resolve(userIds.includes(id));
   }
+
+  async addDataAccessUser(
+    proposalPk: number,
+    userId: number
+  ): Promise<Rejection | undefined> {
+    try {
+      const existingUserIds = this.mockData.get(proposalPk) || [];
+
+      // Idempotent insert - don't add the same user twice
+      if (!existingUserIds.includes(userId)) {
+        this.mockData.set(proposalPk, [...existingUserIds, userId]);
+      }
+
+      const users = await this.findByProposalPk(proposalPk);
+      const addedUser = users.find((user) => user.id === userId);
+
+      if (!addedUser) {
+        throw new Error(`No mock user found for id ${userId}`);
+      }
+
+      return;
+    } catch (error) {
+      return new Rejection('Failed to add data access user', {
+        proposalPk,
+        userId,
+        error: error instanceof Error ? error.message : String(error),
+      });
+    }
+  }
 }