fix for E2E tests

Author: bolmsten

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

@@ -3,20 +3,20 @@ $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', '', 'instr.sci1@local.host', '', 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', 'instr.sci1@local.host', 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', '', 'instr.sci2@local.host', '', 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', 'instr.sci2@local.host', 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', '', 'not.instr.sci@local.host', '', 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', 'not.instr.sci@local.host', NOW(), NOW(), 1);
 
   -- user account with experiment safety reviewer
   INSERT INTO users(

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

@@ -149,19 +149,12 @@ export default class PostgresUserDataSource implements UserDataSource {
         user_title: '',
         firstname,
         lastname,
-        username: email,
         preferredname: firstname,
         oidc_sub: '',
         oauth_refresh_token: '',
         oauth_issuer: '',
-        gender: '',
-        birthdate: '2000-01-01',
         institution_id: 1,
-        department: '',
-        position: '',
         email,
-        telephone: '',
-        placeholder: true,
       })
       .returning(['*'])
       .into('users')
@@ -422,17 +415,11 @@ export default class PostgresUserDataSource implements UserDataSource {
       user_title: '',
       firstname: '',
       lastname: '',
-      username: userId.toString(),
       preferredname: '',
       oidc_sub: '',
       oauth_refresh_token: '',
-      gender: '',
-      birthdate: '2000-01-01',
       institution_id: 1,
-      department: '',
-      position: '',
       email: userId.toString(),
-      telephone: '',
     };
   }
 

apps/e2e/cypress/e2e/FAPs.cy.ts

@@ -1251,13 +1251,8 @@ context('Fap reviews tests', () => {
         cy.updateUserDetails({
           ...loggedInUserParsed,
           institutionId: 1,
-          telephone: faker.phone.number('+4670#######'),
           user_title: 'Dr.',
-          gender: 'male',
           nationality: 1,
-          birthdate: new Date('2000/01/01'),
-          department: 'IT',
-          position: 'Dirrector',
         } as UpdateUserMutationVariables);
       }
       cy.visit(`/FapPage/${createdFapId}?tab=3`);
@@ -1408,12 +1403,7 @@ context('Fap reviews tests', () => {
         cy.updateUserDetails({
           ...loggedInUserParsed,
           institutionId: 1,
-          telephone: faker.phone.number('+4670#######'),
           user_title: 'Dr.',
-          gender: 'male',
-          birthdate: new Date('2000/01/01'),
-          department: 'IT',
-          position: 'Dirrector',
         } as UpdateUserMutationVariables);
       }
 

apps/frontend/src/components/user/UpdateUserInformation.tsx

@@ -137,7 +137,6 @@ export default function UpdateUserInformation(
                   type="text"
                   data-cy="preferredname"
                 />
-                {/* Remove gender and birthdate fields */}
               </LocalizationProvider>
             </Grid>
             <Grid item xs={6}>