BREAKING CHANGE: remove gender, telephone, username, position, placeholder, birthdate …

apps/backend/db_patches/0181_RemoveUserColumns.sql

@@ -9,6 +9,8 @@ BEGIN
         '2025-05-12'
     ) THEN
         BEGIN
+            DELETE FROM features WHERE feature_id = 'EMAIL_INVITE_LEGACY';
+            DROP TABLE IF EXISTS public.redeem_codes;
             -- first drop the FK on nationality
             ALTER TABLE public.users
                 DROP CONSTRAINT IF EXISTS users_nationality_fkey;

apps/backend/db_patches/0183_RemoveUserColulmns2.sql

@@ -0,0 +1,24 @@
+-- 0181_RemoveUserColumns.sql
+DO
+$$
+BEGIN
+    IF register_patch(
+        '0182_RemoveUserColumns2.sql',
+        'Fredrik Bolmsten',
+        'Remove gender, telephone, username, position, placeholder, birthdate and department columns from users table',
+        '2025-05-12'
+    ) THEN
+        BEGIN
+            -- now drop the unwanted columns
+            ALTER TABLE public.users
+                DROP COLUMN username,
+                DROP COLUMN gender,
+                DROP COLUMN birthdate,
+                DROP COLUMN department,
+                DROP COLUMN position,
+                DROP COLUMN telephone;
+        END;
+    END IF;
+END;
+$$
+LANGUAGE plpgsql;

apps/backend/db_patches/db_seeds/0002_InstrumentScientists.sql

@@ -3,26 +3,25 @@ $DO$
 BEGIN
 
   INSERT INTO users(
-    user_id, user_title, firstname, lastname, username, preferredname, oidc_sub, oauth_refresh_token, gender, birthdate, department, "position", email, 
-    telephone, created_at, updated_at, institution_id, placeholder)
-    VALUES (100, '', 'Instrument', 'Scientist1', 'instr.sci1', '-', 'instr.sci1.oauthsub', 'dummy-refresh-token', 'e2e user', '2020-10-10', 'IT', '', '[email protected]', '', NOW(), NOW(), 1, false);
+    user_id, user_title, firstname, lastname, preferredname, oidc_sub, oauth_refresh_token, email, created_at, updated_at, institution_id
+  )
+    VALUES (100, '', 'Instrument', 'Scientist1', '-', 'instr.sci1.oauthsub', 'dummy-refresh-token', '[email protected]', NOW(), NOW(), 1);
 
   INSERT INTO users(
-    user_id, user_title, firstname, lastname, username, preferredname, oidc_sub, oauth_refresh_token, gender, birthdate, department, "position", email, 
-    telephone, created_at, updated_at, institution_id, placeholder)
-    VALUES (101, '', 'Instrument', 'Scientist2', 'instr.sci2',  '-', 'instr.sci2.oauthsub', 'dummy-refresh-token', 'e2e user', '2020-10-10', 'IT', '', '[email protected]', '', NOW(), NOW(), 1, false);
+    user_id, user_title, firstname, lastname, preferredname, oidc_sub, oauth_refresh_token, email, created_at, updated_at, institution_id
+  )
+    VALUES (101, '', 'Instrument', 'Scientist2', '-', 'instr.sci2.oauthsub', 'dummy-refresh-token', '[email protected]', NOW(), NOW(), 1);
 
   -- user account with every roles except instrument scientist and user officer
   INSERT INTO users(
-    user_id, user_title, firstname, lastname, username, preferredname, oidc_sub, oauth_refresh_token, gender, birthdate, department, "position", email, 
-    telephone, created_at, updated_at, institution_id, placeholder)
-    VALUES (102, '', 'Not', 'Scientist', 'not.instr.sci', '-', 'not.instr.sci.oauthsub', 'dummy-refresh-token', 'e2e user', '2020-10-10', 'IT', '', '[email protected]', '', NOW(), NOW(), 1, false);
+    user_id, user_title, firstname, lastname, preferredname, oidc_sub, oauth_refresh_token, email, created_at, updated_at, institution_id
+  )
+    VALUES (102, '', 'Not', 'Scientist', '-', 'not.instr.sci.oauthsub', 'dummy-refresh-token', '[email protected]', NOW(), NOW(), 1);
 
   -- user account with experiment safety reviewer
   INSERT INTO users(
-    user_id, user_title, firstname, lastname, username, preferredname, oidc_sub, oauth_refresh_token, gender, birthdate, department, "position", email, 
-    telephone, created_at, updated_at, institution_id, placeholder)
-    VALUES (103, '', 'Experiment', 'Safety', 'experiment.safety', '-', 'experiment.safety.oauthsub', 'dummy-refresh-token', 'e2e user', '2020-10-10', 'IT', '', '[email protected]', '', NOW(), NOW(), 1, false);
+    user_id, user_title, firstname, lastname, preferredname, oidc_sub, oauth_refresh_token, email, created_at, updated_at, institution_id)
+    VALUES (103, '', 'Experiment', 'Safety', 'experiment.safety', 'experiment.safety.oauthsub', 'dummy-refresh-token', '[email protected]', NOW(), NOW(), 1);
 
   INSERT INTO role_user(
     role_id, user_id)

apps/backend/package.json

@@ -47,7 +47,7 @@
     "@user-office-software/duo-localisation": "^1.2.0",
     "@user-office-software/duo-logger": "^2.3.2",
     "@user-office-software/duo-message-broker": "^1.8.0",
-    "@user-office-software/duo-validation": "^5.1.20",
+    "@user-office-software/duo-validation": "^5.1.22",
     "@user-office-software/openid": "^1.4.0",
     "await-to-js": "^2.1.1",
     "bcryptjs": "^2.4.3",

apps/backend/src/auth/OAuthAuthorization.ts

@@ -141,21 +141,14 @@ export class OAuthAuthorization extends UserAuthorization {
     if (user) {
       const updatedUser = await this.userDataSource.update({
         ...user,
-        birthdate: userInfo.birthdate
-          ? new Date(userInfo.birthdate)
-          : undefined,
-        department: userInfo.department as string,
         email: userInfo.email,
         firstname: userInfo.given_name,
-        gender: userInfo.gender,
         lastname: userInfo.family_name,
         oauthIssuer: client.issuer.metadata.issuer,
         oauthRefreshToken: tokenSet.refresh_token ?? '',
         oidcSub: userInfo.sub,
         institutionId: institution?.id ?? user.institutionId,
-        position: userInfo.position as string,
         preferredname: userInfo.preferred_username,
-        telephone: userInfo.phone_number,
         user_title: userInfo.title as string,
       });
 
@@ -165,18 +158,12 @@ export class OAuthAuthorization extends UserAuthorization {
         (userInfo.title as string) ?? 'unspecified',
         userInfo.given_name,
         userInfo.family_name,
-        userInfo.email,
         userInfo.preferred_username ?? '',
         userInfo.sub,
         tokenSet.refresh_token ?? '',
         client.issuer.metadata.issuer,
-        userInfo.gender ?? 'unspecified',
-        new Date(),
         institution?.id ?? 1,
-        '',
-        (userInfo.position as string) ?? '',
-        userInfo.email,
-        ''
+        userInfo.email
       );
 
       const roleID = this.getUserRole(newUser);

apps/backend/src/buildContext.ts

@@ -20,7 +20,6 @@ import PredefinedMessageMutations from './mutations/PredefinedMessageMutations';
 import ProposalMutations from './mutations/ProposalMutations';
 import ProposalPdfTemplateMutations from './mutations/ProposalPdfTemplateMutations';
 import QuestionaryMutations from './mutations/QuestionaryMutations';
-import RedeemCodesMutations from './mutations/RedeemCodesMutations';
 import ReviewMutations from './mutations/ReviewMutations';
 import SampleMutations from './mutations/SampleMutations';
 import ShipmentMutations from './mutations/ShipmentMutations';
@@ -120,7 +119,6 @@ const context: BasicResolverContext = {
     ),
     proposal: container.resolve(ProposalMutations),
     questionary: container.resolve(QuestionaryMutations),
-    redeemCodes: container.resolve(RedeemCodesMutations),
     review: container.resolve(ReviewMutations),
     sample: container.resolve(SampleMutations),
     fap: container.resolve(FapMutations),

apps/backend/src/config/Tokens.ts

@@ -30,7 +30,6 @@ export const Tokens = {
   ProposalSettingsDataSource: Symbol('ProposalSettingsDataSource'),
   StatusActionsDataSource: Symbol('StatusActionsDataSource'),
   QuestionaryDataSource: Symbol('QuestionaryDataSource'),
-  RedeemCodesDataSource: Symbol('RedeemCodesDataSource'),
   RoleClaimDataSource: Symbol('RoleClaimDataSource'),
   ReviewDataSource: Symbol('ReviewDataSource'),
   FapDataSource: Symbol('FapDataSource'),

apps/backend/src/config/dependencyConfigDefault.ts

@@ -29,7 +29,6 @@ import PostgresProposalDataSource from '../datasources/postgres/ProposalDataSour
 import PostgresProposalInternalCommentsDataSource from '../datasources/postgres/ProposalInternalCommentsDataSource';
 import PostgresProposalPdfTemplateDataSource from '../datasources/postgres/ProposalPdfTemplateDataSource';
 import PostgresQuestionaryDataSource from '../datasources/postgres/QuestionaryDataSource';
-import PostgresRedeemCodesDataSource from '../datasources/postgres/RedeemCodesDataSource';
 import PostgresReviewDataSource from '../datasources/postgres/ReviewDataSource';
 import PostgresRoleClaimDataSource from '../datasources/postgres/RoleClaimsDataSource';
 import PostgresSampleDataSource from '../datasources/postgres/SampleDataSource';
@@ -98,7 +97,6 @@ mapClass(
 );
 mapClass(Tokens.StatusActionsDataSource, PostgresStatusActionsDataSource);
 mapClass(Tokens.QuestionaryDataSource, PostgresQuestionaryDataSource);
-mapClass(Tokens.RedeemCodesDataSource, PostgresRedeemCodesDataSource);
 mapClass(Tokens.ReviewDataSource, PostgresReviewDataSource);
 mapClass(Tokens.FapDataSource, PostgresFapDataSource);
 mapClass(Tokens.SampleDataSource, PostgresSampleDataSource);

apps/backend/src/config/dependencyConfigE2E.ts

@@ -25,7 +25,6 @@ import PostgresProposalDataSource from '../datasources/postgres/ProposalDataSour
 import PostgresProposalInternalCommentsDataSource from '../datasources/postgres/ProposalInternalCommentsDataSource';
 import PostgresProposalPdfTemplateDataSource from '../datasources/postgres/ProposalPdfTemplateDataSource';
 import PostgresQuestionaryDataSource from '../datasources/postgres/QuestionaryDataSource';
-import PostgresRedeemCodesDataSource from '../datasources/postgres/RedeemCodesDataSource';
 import PostgresReviewDataSource from '../datasources/postgres/ReviewDataSource';
 import PostgresRoleClaimDataSource from '../datasources/postgres/RoleClaimsDataSource';
 import PostgresSampleDataSource from '../datasources/postgres/SampleDataSource';
@@ -89,7 +88,6 @@ mapClass(
 );
 mapClass(Tokens.StatusActionsDataSource, PostgresStatusActionsDataSource);
 mapClass(Tokens.QuestionaryDataSource, PostgresQuestionaryDataSource);
-mapClass(Tokens.RedeemCodesDataSource, PostgresRedeemCodesDataSource);
 mapClass(Tokens.ReviewDataSource, PostgresReviewDataSource);
 mapClass(Tokens.FapDataSource, PostgresFapDataSource);
 mapClass(Tokens.SampleDataSource, PostgresSampleDataSource);

apps/backend/src/config/dependencyConfigELI.ts

@@ -24,7 +24,6 @@ import PostgresProposalDataSource from '../datasources/postgres/ProposalDataSour
 import PostgresProposalInternalCommentsDataSource from '../datasources/postgres/ProposalInternalCommentsDataSource';
 import PostgresProposalPdfTemplateDataSource from '../datasources/postgres/ProposalPdfTemplateDataSource';
 import PostgresQuestionaryDataSource from '../datasources/postgres/QuestionaryDataSource';
-import PostgresRedeemCodesDataSource from '../datasources/postgres/RedeemCodesDataSource';
 import PostgresReviewDataSource from '../datasources/postgres/ReviewDataSource';
 import PostgresRoleClaimDataSource from '../datasources/postgres/RoleClaimsDataSource';
 import PostgresSampleDataSource from '../datasources/postgres/SampleDataSource';
@@ -90,7 +89,6 @@ mapClass(
 );
 mapClass(Tokens.StatusActionsDataSource, PostgresStatusActionsDataSource);
 mapClass(Tokens.QuestionaryDataSource, PostgresQuestionaryDataSource);
-mapClass(Tokens.RedeemCodesDataSource, PostgresRedeemCodesDataSource);
 mapClass(Tokens.ReviewDataSource, PostgresReviewDataSource);
 mapClass(Tokens.FapDataSource, PostgresFapDataSource);
 mapClass(Tokens.SampleDataSource, PostgresSampleDataSource);

apps/backend/src/config/dependencyConfigESS.ts

@@ -25,7 +25,6 @@ import PostgresProposalDataSource from '../datasources/postgres/ProposalDataSour
 import PostgresProposalInternalCommentsDataSource from '../datasources/postgres/ProposalInternalCommentsDataSource';
 import PostgresProposalPdfTemplateDataSource from '../datasources/postgres/ProposalPdfTemplateDataSource';
 import PostgresQuestionaryDataSource from '../datasources/postgres/QuestionaryDataSource';
-import PostgresRedeemCodesDataSource from '../datasources/postgres/RedeemCodesDataSource';
 import PostgresReviewDataSource from '../datasources/postgres/ReviewDataSource';
 import PostgresRoleClaimDataSource from '../datasources/postgres/RoleClaimsDataSource';
 import PostgresSampleDataSource from '../datasources/postgres/SampleDataSource';
@@ -90,7 +89,6 @@ mapClass(
 );
 mapClass(Tokens.StatusActionsDataSource, PostgresStatusActionsDataSource);
 mapClass(Tokens.QuestionaryDataSource, PostgresQuestionaryDataSource);
-mapClass(Tokens.RedeemCodesDataSource, PostgresRedeemCodesDataSource);
 mapClass(Tokens.ReviewDataSource, PostgresReviewDataSource);
 mapClass(Tokens.FapDataSource, PostgresFapDataSource);
 mapClass(Tokens.SampleDataSource, PostgresSampleDataSource);

apps/backend/src/config/dependencyConfigSTFC.ts

@@ -20,7 +20,6 @@ import PostgresPredefinedMessageDataSource from '../datasources/postgres/Predefi
 import PostgresProposalInternalCommentsDataSource from '../datasources/postgres/ProposalInternalCommentsDataSource';
 import PostgresProposalPdfTemplateDataSource from '../datasources/postgres/ProposalPdfTemplateDataSource';
 import PostgresQuestionaryDataSource from '../datasources/postgres/QuestionaryDataSource';
-import PostgresRedeemCodesDataSource from '../datasources/postgres/RedeemCodesDataSource';
 import PostgresReviewDataSource from '../datasources/postgres/ReviewDataSource';
 import PostgresRoleClaimDataSource from '../datasources/postgres/RoleClaimsDataSource';
 import PostgresSampleDataSource from '../datasources/postgres/SampleDataSource';
@@ -88,7 +87,6 @@ mapClass(
 );
 mapClass(Tokens.StatusActionsDataSource, PostgresStatusActionsDataSource);
 mapClass(Tokens.QuestionaryDataSource, PostgresQuestionaryDataSource);
-mapClass(Tokens.RedeemCodesDataSource, PostgresRedeemCodesDataSource);
 mapClass(Tokens.ReviewDataSource, PostgresReviewDataSource);
 mapClass(Tokens.FapDataSource, StfcFapDataSource);
 mapClass(Tokens.SampleDataSource, PostgresSampleDataSource);

apps/backend/src/config/dependencyConfigTest.ts

@@ -26,7 +26,6 @@ import { ProposalDataSourceMock } from '../datasources/mockups/ProposalDataSourc
 import { PostgresProposalInternalCommentsDataSourceMock } from '../datasources/mockups/ProposalInternalCommentsDataSource';
 import { ProposalPdfTemplateDataSourceMock } from '../datasources/mockups/ProposalPdfTemplateDataSource';
 import { QuestionaryDataSourceMock } from '../datasources/mockups/QuestionaryDataSource';
-import { RedeemDataSourceMock } from '../datasources/mockups/RedeemDataSource';
 import { ReviewDataSourceMock } from '../datasources/mockups/ReviewDataSource';
 import { RoleClaimDataSourceMock } from '../datasources/mockups/RoleClaimDataSource';
 import { SampleDataSourceMock } from '../datasources/mockups/SampleDataSource';
@@ -86,7 +85,6 @@ mapClass(Tokens.StatusDataSource, StatusDataSourceMock);
 mapClass(Tokens.ExperimentDataSource, ExperimentDataSourceMock);
 mapClass(Tokens.StatusActionsDataSource, StatusActionsDataSourceMock);
 mapClass(Tokens.QuestionaryDataSource, QuestionaryDataSourceMock);
-mapClass(Tokens.RedeemCodesDataSource, RedeemDataSourceMock);
 mapClass(Tokens.ReviewDataSource, ReviewDataSourceMock);
 mapClass(Tokens.FapDataSource, FapDataSourceMock);
 mapClass(Tokens.SampleDataSource, SampleDataSourceMock);

apps/backend/src/context/index.ts

@@ -19,7 +19,6 @@ import PredefinedMessageMutations from '../mutations/PredefinedMessageMutations'
 import ProposalMutations from '../mutations/ProposalMutations';
 import ProposalPdfTemplateMutations from '../mutations/ProposalPdfTemplateMutations';
 import QuestionaryMutations from '../mutations/QuestionaryMutations';
-import RedeemCodesMutations from '../mutations/RedeemCodesMutations';
 import ReviewMutations from '../mutations/ReviewMutations';
 import SampleMutations from '../mutations/SampleMutations';
 import ShipmentMutations from '../mutations/ShipmentMutations';
@@ -115,7 +114,6 @@ interface ResolverContextMutations {
   experimentSafetyPdfTemplate: ExperimentSafetyPdfTemplateMutations;
   proposal: ProposalMutations;
   questionary: QuestionaryMutations;
-  redeemCodes: RedeemCodesMutations;
   review: ReviewMutations;
   sample: SampleMutations;
   fap: FapMutations;

apps/backend/src/datasources/UserDataSource.ts

@@ -3,7 +3,6 @@ import { Institution } from '../models/Institution';
 import { Role, Roles } from '../models/Role';
 import { BasicUserDetails, User, UserRole } from '../models/User';
 import { AddUserRoleArgs } from '../resolvers/mutations/AddUserRoleMutation';
-import { CreateUserByEmailInviteArgs } from '../resolvers/mutations/CreateUserByEmailInviteMutation';
 import {
   UpdateUserByOidcSubArgs,
   UpdateUserByIdArgs,
@@ -13,7 +12,6 @@ import { UsersArgs } from '../resolvers/queries/UsersQuery';
 export interface UserDataSource {
   delete(id: number): Promise<User | null>;
   addUserRole(args: AddUserRoleArgs): Promise<boolean>;
-  createInviteUser(args: CreateUserByEmailInviteArgs): Promise<number>;
   getBasicUserInfo(id: number): Promise<BasicUserDetails | null>;
   getBasicUsersInfo(ids: readonly number[]): Promise<BasicUserDetails[]>;
   getBasicUserDetailsByEmail(
@@ -61,18 +59,12 @@ export interface UserDataSource {
     user_title: string | undefined,
     firstname: string,
     lastname: string,
-    username: string,
     preferredname: string | undefined,
     oidc_sub: string,
     oauth_refreshtoken: string,
     oauth_issuer: string,
-    gender: string,
-    birthdate: Date,
     institution: number,
-    department: string,
-    position: string,
-    email: string,
-    telephone: string
+    email: string
   ): Promise<User>;
   ensureDummyUserExists(userId: number): Promise<User>;
   ensureDummyUsersExist(userIds: number[]): Promise<User[]>;