feat: resolve preferredname at datasource layer to eliminate firstname fallback checks

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

@@ -265,7 +265,7 @@ export interface UserRecord {
   readonly user_title: string;
   readonly firstname: string;
   readonly lastname: string;
-  readonly preferredname: string;
+  readonly preferredname: string | null;
   readonly oidc_sub: string | null;
   readonly oauth_refresh_token: string | null;
   readonly oauth_issuer: string | null;
@@ -985,7 +985,7 @@ export const createUserObject = (user: UserRecord) => {
     user.user_title,
     user.firstname,
     user.lastname,
-    user.preferredname,
+    user.preferredname || user.firstname,
     user.oidc_sub,
     user.oauth_refresh_token,
     user.oauth_issuer,
@@ -1004,7 +1004,7 @@ export const createBasicUserObject = (
     user.user_id,
     user.firstname,
     user.lastname,
-    user.preferredname,
+    user.preferredname || user.firstname,
     user.institution,
     user.institution_id,
     user.created_at,

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

@@ -1,6 +1,10 @@
 import { Role, Roles } from '../../models/Role';
 import { dummyUser } from '../mockups/UserDataSource';
-import { StfcUserDataSource } from './StfcUserDataSource';
+import {
+  StfcUserDataSource,
+  StfcBasicPersonDetails,
+  toEssBasicUserDetails,
+} from './StfcUserDataSource';
 
 jest.mock('../postgres/UserDataSource.ts');
 jest.mock('../../utils/Cache');
@@ -302,3 +306,42 @@ describe('Searchable user tests', () => {
     expect(result).toBe(false);
   });
 });
+
+describe('toEssBasicUserDetails preferredname fallback', () => {
+  const baseStfcUser: StfcBasicPersonDetails = {
+    userNumber: 'fake',
+    givenName: 'fake',
+    familyName: 'fake',
+    firstNameKnownAs: 'fake',
+    email: 'fake',
+    country: 'fake',
+    orgName: 'fake',
+    orgId: 1,
+    title: 'fake',
+    deptName: 'fake',
+    displayName: 'fake',
+    establishmentId: 'fake',
+    fullName: 'fake',
+    initials: 'fake',
+  };
+
+  test('uses firstNameKnownAs when set', () => {
+    const user = toEssBasicUserDetails({
+      ...baseStfcUser,
+      firstNameKnownAs: 'fake',
+      givenName: 'fake2',
+    });
+
+    expect(user.preferredname).toBe('fake');
+  });
+
+  test('falls back to givenName when firstNameKnownAs is empty', () => {
+    const user = toEssBasicUserDetails({
+      ...baseStfcUser,
+      firstNameKnownAs: '',
+      givenName: 'fake',
+    });
+
+    expect(user.preferredname).toBe('fake');
+  });
+});

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

@@ -93,7 +93,7 @@ export function toEssBasicUserDetails(
     Number(stfcUser.userNumber),
     stfcUser.givenName ?? '',
     stfcUser.familyName ?? '',
-    stfcUser.firstNameKnownAs ?? stfcUser.givenName,
+    stfcUser.firstNameKnownAs || stfcUser.givenName,
     stfcUser.orgName ?? '',
     stfcUser.orgId ?? 1,
     new Date(),
@@ -110,7 +110,7 @@ function toEssUser(stfcUser: StfcBasicPersonDetails): User {
     stfcUser.title ?? '',
     stfcUser.givenName ?? '',
     stfcUser.familyName ?? '',
-    stfcUser.firstNameKnownAs ?? stfcUser.givenName,
+    stfcUser.firstNameKnownAs || stfcUser.givenName,
     '',
     '',
     '',

apps/backend/src/models/User.ts

@@ -27,7 +27,7 @@ export class User {
     public userTitle: string,
     public firstname: string,
     public lastname: string,
-    public preferredname: string | undefined,
+    public preferredname: string,
     public oidcSub: string | null,
     public oauthRefreshToken: string | null,
     public oauthIssuer: string | null,

apps/backend/src/resolvers/types/BasicUserDetails.ts

@@ -16,8 +16,8 @@ export class BasicUserDetails implements Partial<BasicUserDetailsOrigin> {
   @Field()
   public lastname: string;
 
-  @Field(() => String, { nullable: true })
-  public preferredname: string | undefined;
+  @Field(() => String)
+  public preferredname: string;
 
   @Field()
   public institution: string;

apps/backend/src/resolvers/types/User.ts

@@ -60,8 +60,8 @@ export class User implements Partial<UserOrigin> {
   @Field()
   public lastname: string;
 
-  @Field(() => String, { nullable: true })
-  public preferredname: string | undefined;
+  @Field(() => String)
+  public preferredname: string;
 
   @Field(() => String, { nullable: true })
   public oidcSub: string | null;

apps/backend/src/resolvers/types/UserJWT.ts

@@ -13,8 +13,8 @@ export class UserJWT implements Partial<UserJWTOrigin> {
   @Field()
   public lastname: string;
 
-  @Field(() => String, { nullable: true })
-  public preferredname: string | undefined;
+  @Field(() => String)
+  public preferredname: string;
 
   @Field()
   public email: string;

apps/frontend/src/components/fap/Proposals/AssignFapMemberToProposalModal.tsx

@@ -29,8 +29,7 @@ const memberRole = (member: FapAssignedMember) => `${member.role?.title}`;
 const columns = [
   {
     title: 'Name',
-    render: (rowData: FapAssignedMember) =>
-      rowData.preferredname ? rowData.preferredname : rowData.firstname,
+    render: (rowData: FapAssignedMember) => rowData.preferredname,
   },
   { title: 'Surname', field: 'lastname' },
   { title: 'Proposal Count', field: 'proposalsCountByCall' },

apps/frontend/src/components/fap/Proposals/MultiRankAssignmentDialog.tsx

@@ -94,7 +94,7 @@ export const MultiRankAssignmentDialog = ({
                   }}
                 >
                   <TableCell component="th" scope="row">
-                    {row.preferredname ? row.preferredname : row.firstname}
+                    {row.preferredname}
                   </TableCell>
                   <TableCell align="left">{row.lastname}</TableCell>
                   <TableCell align="right">

apps/frontend/src/utils/user.ts

@@ -6,55 +6,33 @@ export const getFullUserName = (
 ): string => (user ? `${user.firstname} ${user.lastname}` : 'None');
 
 export const getFullUserNameWithEmail = (
-  user?: Pick<
-    BasicUserDetails,
-    'preferredname' | 'lastname' | 'email' | 'firstname'
-  > | null
+  user?: Pick<BasicUserDetails, 'preferredname' | 'lastname' | 'email'> | null
 ): string =>
   user
-    ? user.preferredname
-      ? `${user.preferredname} ${user.lastname} ${
-          user.email ? `(${user.email})` : ''
-        }`
-      : `${user.firstname} ${user.lastname} ${
-          user.email ? `(${user.email})` : ''
-        }`
+    ? `${user.preferredname} ${user.lastname} ${
+        user.email ? `(${user.email})` : ''
+      }`
     : 'None';
 
 export const getFullUserNameWithInstitution = (
   user?: BasicUserData | null
 ): string =>
   user
-    ? user.preferredname
-      ? `${user.preferredname} ${user.lastname}; ${
-          user.institution ? `${user.institution}` : ''
-        }`
-      : `${user.firstname} ${user.lastname}; ${
-          user.institution ? `${user.institution}` : ''
-        }`
+    ? `${user.preferredname} ${user.lastname}; ${
+        user.institution ? `${user.institution}` : ''
+      }`
     : 'None';
 
 export const getFullUserNameWithBasicDetails = (
   user?: Pick<
     BasicUserDetails,
-    | 'preferredname'
-    | 'lastname'
-    | 'email'
-    | 'firstname'
-    | 'institution'
-    | 'country'
+    'preferredname' | 'lastname' | 'email' | 'institution' | 'country'
   > | null
 ): string =>
   user
-    ? user.preferredname
-      ? `${user.preferredname} ${user.lastname} ${
-          user.email ? `(${user.email})` : ''
-        } ${user.institution ? `(${user.institution})` : ''} ${
-          user.country ? `(${user.country})` : ''
-        }`
-      : `${user.firstname} ${user.lastname} ${
-          user.email ? `(${user.email})` : ''
-        } ${user.institution ? `(${user.institution})` : ''} ${
-          user.country ? `(${user.country})` : ''
-        }`
+    ? `${user.preferredname} ${user.lastname} ${
+        user.email ? `(${user.email})` : ''
+      } ${user.institution ? `(${user.institution})` : ''} ${
+        user.country ? `(${user.country})` : ''
+      }`
     : 'None';