Release 2026 07 01 (#1614)

Author: ellen-wright

apps/backend/src/datasources/UserDataSource.ts

@@ -75,6 +75,7 @@ export interface UserDataSource {
   ): Promise<number>;
   update(user: UpdateUserByIdArgs): Promise<User>;
   setUserRoles(id: number, roles: number[]): Promise<void>;
+  removeUserRoles(id: number, roles: number[]): Promise<void>;
   setUserNotPlaceholder(id: number): Promise<User | null>;
   checkScientistToProposal(
     userId: number,

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

@@ -475,6 +475,9 @@ export class UserDataSourceMock implements UserDataSource {
   async setUserRoles(id: number, roles: number[]): Promise<void> {
     // Do something here or remove the function.
   }
+  async removeUserRoles(id: number): Promise<void> {
+    return;
+  }
   async getUserRoles(id: number): Promise<Role[]> {
     if (id == dummyUserOfficer.id) {
       return [

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

@@ -151,6 +151,12 @@ export default class PostgresUserDataSource implements UserDataSource {
     });
   }
 
+  async removeUserRoles(id: number): Promise<void> {
+    return database.transaction(async (trx) => {
+      await trx<RoleUserRecord>('role_user').where('user_id', id).del();
+    });
+  }
+
   async me(id: number): Promise<User | null> {
     return database
       .select()

apps/backend/src/datasources/stfc/StfcUserDataSource.ts

@@ -415,7 +415,11 @@ export class StfcUserDataSource implements UserDataSource {
         (roleId) => !assignedRoleIds.has(roleId) && roleId !== userRole?.id
       );
 
-      if (newRolesToAssign.length > 0) {
+      if (newRolesToAssign.length == 0) {
+        this.removeUserRoles(id);
+        this.stfcRolesCache.remove(String(id));
+        this.uopRolesCache.remove(String(id));
+      } else if (newRolesToAssign.length > 0) {
         await postgresUserDataSource.setUserRoles(id, newRolesToAssign);
         this.stfcRolesCache.remove(String(id));
         this.uopRolesCache.remove(String(id));
@@ -522,6 +526,12 @@ export class StfcUserDataSource implements UserDataSource {
     throw new Error('Method not implemented.');
   }
 
+  async removeUserRoles(id: number): Promise<void> {
+    await postgresUserDataSource.removeUserRoles(id);
+
+    return;
+  }
+
   async me(id: number) {
     return this.getUser(id);
   }