fix: user officer users and experiment table filter

apps/backend/src/datasources/ExperimentDataSource.ts

@@ -12,6 +12,7 @@ import {
   ExperimentsFilter,
   UserExperimentsFilter,
 } from '../resolvers/queries/ExperimentsQuery';
+import { PaginationSortDirection } from '../utils/pagination';
 import { ExperimentSafetyEventsRecord } from './postgres/records';
 
 export interface ExperimentDataSource {
@@ -88,7 +89,7 @@ export interface ExperimentDataSource {
     first?: number,
     offset?: number,
     sortField?: string,
-    sortDirection?: string,
+    sortDirection?: PaginationSortDirection,
     searchText?: string
   ): Promise<{
     totalCount: number;

apps/backend/src/datasources/ProposalDataSource.ts

@@ -6,6 +6,7 @@ import { TechnicalReview } from '../models/TechnicalReview';
 import { UserWithRole } from '../models/User';
 import { UpdateTechnicalReviewAssigneeInput } from '../resolvers/mutations/UpdateTechnicalReviewAssigneeMutation';
 import { UserProposalsFilter } from '../resolvers/types/User';
+import { PaginationSortDirection } from '../utils/pagination';
 import { ProposalsFilter } from './../resolvers/queries/ProposalsQuery';
 import { ProposalEventsRecord } from './postgres/records';
 
@@ -15,7 +16,7 @@ export interface ProposalDataSource {
     first?: number,
     offset?: number,
     sortField?: string,
-    sortDirection?: string,
+    sortDirection?: PaginationSortDirection,
     searchText?: string
   ): Promise<{ totalCount: number; proposalViews: ProposalView[] }>;
   // Read
@@ -89,7 +90,7 @@ export interface ProposalDataSource {
     first?: number,
     offset?: number,
     sortField?: string,
-    sortDirection?: string,
+    sortDirection?: PaginationSortDirection,
     searchText?: string
   ): Promise<{ totalCount: number; proposals: ProposalView[] }>;
   getInvitedProposal(inviteId: number): Promise<InvitedProposal | null>;

apps/backend/src/datasources/UserDataSource.ts

@@ -5,6 +5,7 @@ import { BasicUserDetails, User, UserRole } from '../models/User';
 import { AddUserRoleArgs } from '../resolvers/mutations/AddUserRoleMutation';
 import { UpdateUserByIdArgs } from '../resolvers/mutations/UpdateUserMutation';
 import { UsersArgs } from '../resolvers/queries/UsersQuery';
+import { PaginationSortDirection } from '../utils/pagination';
 
 export interface UserDataSource {
   delete(id: number): Promise<User | null>;
@@ -35,9 +36,11 @@ export interface UserDataSource {
   ): Promise<{ totalCount: number; users: BasicUserDetails[] }>;
   getPreviousCollaborators(
     user_id: number,
-    filter?: string,
     first?: number,
     offset?: number,
+    sortField?: string,
+    sortDirection?: PaginationSortDirection,
+    searchText?: string,
     userRole?: UserRole,
     subtractUsers?: [number]
   ): Promise<{ totalCount: number; users: BasicUserDetails[] }>;

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

@@ -14,6 +14,7 @@ import {
   UserExperimentsFilter,
   ExperimentsFilter,
 } from '../../resolvers/queries/ExperimentsQuery';
+import { PaginationSortDirection } from '../../utils/pagination';
 import { ExperimentDataSource } from '../ExperimentDataSource';
 import { ExperimentSafetyEventsRecord } from '../postgres/records';
 
@@ -122,7 +123,7 @@ export class ExperimentDataSourceMock implements ExperimentDataSource {
     first?: number,
     offset?: number,
     sortField?: string,
-    sortDirection?: string,
+    sortDirection?: PaginationSortDirection,
     searchText?: string
   ): Promise<{ totalCount: number; experiments: Experiment[] }> {
     return {

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

@@ -15,6 +15,7 @@ import {
 } from '../../models/TechnicalReview';
 import { UserWithRole } from '../../models/User';
 import { UpdateTechnicalReviewAssigneeInput } from '../../resolvers/mutations/UpdateTechnicalReviewAssigneeMutation';
+import { PaginationSortDirection } from '../../utils/pagination';
 import { ProposalEventsRecord } from '../postgres/records';
 import { ProposalDataSource } from '../ProposalDataSource';
 import { ProposalsFilter } from './../../resolvers/queries/ProposalsQuery';
@@ -143,7 +144,7 @@ export class ProposalDataSourceMock implements ProposalDataSource {
     first?: number | undefined,
     offset?: number | undefined,
     sortField?: string | undefined,
-    sortDirection?: string | undefined,
+    sortDirection?: PaginationSortDirection | undefined,
     searchText?: string | undefined
   ): Promise<{ totalCount: number; proposalViews: ProposalView[] }> {
     return { totalCount: 0, proposalViews: [] };
@@ -430,7 +431,7 @@ export class ProposalDataSourceMock implements ProposalDataSource {
     first?: number,
     offset?: number,
     sortField?: string,
-    sortDirection?: string,
+    sortDirection?: PaginationSortDirection,
     searchText?: string
   ) {
     return { totalCount: 1, proposals: [dummyProposalView] };

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

@@ -10,6 +10,7 @@ import {
 import { AddUserRoleArgs } from '../../resolvers/mutations/AddUserRoleMutation';
 import { UpdateUserByIdArgs } from '../../resolvers/mutations/UpdateUserMutation';
 import { UsersArgs } from '../../resolvers/queries/UsersQuery';
+import { PaginationSortDirection } from '../../utils/pagination';
 import { UserDataSource } from '../UserDataSource';
 
 export const basicDummyUser = new BasicUserDetails(
@@ -390,9 +391,13 @@ export class UserDataSourceMock implements UserDataSource {
 
   async getPreviousCollaborators(
     user_id: number,
-    filter?: string,
     first?: number,
-    offset?: number
+    offset?: number,
+    sortField?: string,
+    sortDirection?: PaginationSortDirection,
+    searchText?: string,
+    userRole?: UserRole,
+    subtractUsers?: [number]
   ): Promise<{ totalCount: number; users: BasicUserDetails[] }> {
     return {
       totalCount: 2,

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

@@ -16,6 +16,7 @@ import {
   ExperimentsFilter,
   UserExperimentsFilter,
 } from '../../resolvers/queries/ExperimentsQuery';
+import { PaginationSortDirection } from '../../utils/pagination';
 import { ExperimentDataSource } from '../ExperimentDataSource';
 import database from './database';
 import {
@@ -571,7 +572,7 @@ export default class PostgresExperimentDataSource
     first?: number,
     offset?: number,
     sortField?: string,
-    sortDirection?: string,
+    sortDirection?: PaginationSortDirection,
     searchText?: string
   ): Promise<{ totalCount: number; experiments: Experiment[] }> {
     //print all arguments
@@ -673,7 +674,7 @@ export default class PostgresExperimentDataSource
             throw new GraphQLError(`Bad sort field given: ${sortField}`);
           }
           sortField = fieldMap[sortField];
-          query.orderByRaw(`${sortField} ${sortDirection}`);
+          query.orderBy(sortField, sortDirection);
         }
 
         if (first) {

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

@@ -19,6 +19,7 @@ import { UserWithRole } from '../../models/User';
 import { WorkflowConnectionWithStatus } from '../../models/WorkflowConnections';
 import { UpdateTechnicalReviewAssigneeInput } from '../../resolvers/mutations/UpdateTechnicalReviewAssigneeMutation';
 import { UserProposalsFilter } from '../../resolvers/types/User';
+import { PaginationSortDirection } from '../../utils/pagination';
 import { AdminDataSource } from '../AdminDataSource';
 import { ProposalDataSource } from '../ProposalDataSource';
 import { WorkflowDataSource } from '../WorkflowDataSource';
@@ -46,17 +47,16 @@ import {
 
 const fieldMap: { [key: string]: string } = {
   finalStatus: 'final_status',
-  'technicalReviews.status': "technical_reviews->0->'status'",
-  'technicalReviews.timeAllocation': "technical_reviews->0->'timeAllocation'",
+  'technicalReviews.status': 'technical_review_status',
+  'technicalReviews.timeAllocation': 'technical_review_time_allocation',
   // NOTE: For now sorting by first name only is completly fine because the full name is constructed from frist + last
-  technicalReviewAssigneesFullName:
-    "technical_reviews->0->'technicalReviewAssignee'->'firstname'",
-  'faps.code': "faps->0->'code'",
+  technicalReviewAssigneesFullName: 'technical_review_assignee',
+  'faps.code': 'fap_code',
   callShortCode: 'call_short_code',
-  'instruments.name': "instruments->0->'name'",
+  'instruments.name': 'instrument_name',
   statusName: 'proposal_status_id',
   'instruments.managementTimeAllocation':
-    "instruments->0->'managementTimeAllocation'",
+    'instrument_management_time_allocation',
   proposalId: 'proposal_id',
   title: 'title',
   submitted: 'submitted',
@@ -384,7 +384,7 @@ export default class PostgresProposalDataSource implements ProposalDataSource {
     first?: number,
     offset?: number,
     sortField?: string,
-    sortDirection?: string,
+    sortDirection?: PaginationSortDirection,
     searchText?: string,
     principleInvestigator?: number[]
   ): Promise<{ totalCount: number; proposalViews: ProposalView[] }> {
@@ -393,7 +393,24 @@ export default class PostgresProposalDataSource implements ProposalDataSource {
       : [];
 
     return database
-      .select(['*', database.raw('count(*) OVER() AS full_count')])
+      .select([
+        '*',
+        database.raw("instruments->0->'name' AS instrument_name"),
+        database.raw(
+          "instruments->0->'managementTimeAllocation' AS instrument_management_time_allocation"
+        ),
+        database.raw(
+          "technical_reviews->0->'status' AS technical_review_status"
+        ),
+        database.raw(
+          "technical_reviews->0->'timeAllocation' AS technical_review_time_allocation"
+        ),
+        database.raw(
+          "technical_reviews->0->'technicalReviewAssignee'->'firstname' AS technical_review_assignee"
+        ),
+        database.raw("faps->0->'code' AS fap_code"),
+        database.raw('count(*) OVER() AS full_count'),
+      ])
       .from('proposal_table_view')
       .join(
         'users',
@@ -461,7 +478,7 @@ export default class PostgresProposalDataSource implements ProposalDataSource {
             throw new GraphQLError(`Bad sort field given: ${sortField}`);
           }
           sortField = fieldMap[sortField];
-          query.orderByRaw(`${sortField} ${sortDirection}`);
+          query.orderBy(sortField, sortDirection);
         }
 
         if (filter?.referenceNumbers) {
@@ -1069,7 +1086,7 @@ export default class PostgresProposalDataSource implements ProposalDataSource {
     first?: number,
     offset?: number,
     sortField?: string,
-    sortDirection?: string,
+    sortDirection?: PaginationSortDirection,
     searchText?: string
   ): Promise<{ totalCount: number; proposals: ProposalView[] }> {
     /*

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

@@ -162,9 +162,7 @@ export default class PostgresStatusActionsLogsDataSource
         }
         if (args.sortField && args.sortDirection) {
           if (args.sortField in fieldMap) {
-            query.orderByRaw(
-              `${fieldMap[args.sortField]} ${args.sortDirection}`
-            );
+            query.orderBy(fieldMap[args.sortField], args.sortDirection);
           } else {
             throw new GraphQLError(`Bad sort field given: ${args.sortField}`);
           }

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

@@ -191,7 +191,7 @@ export default class PostgresTemplateDataSource implements TemplateDataSource {
             throw new GraphQLError(`Bad sort field given: ${sortField}`);
           }
 
-          query.orderByRaw(`${this.fieldMap[sortField]} ${sortDirection}`);
+          query.orderBy(this.fieldMap[sortField], sortDirection);
         }
 
         if (first) {

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

@@ -15,6 +15,7 @@ import {
 import { AddUserRoleArgs } from '../../resolvers/mutations/AddUserRoleMutation';
 import { UpdateUserByIdArgs } from '../../resolvers/mutations/UpdateUserMutation';
 import { UsersArgs } from '../../resolvers/queries/UsersQuery';
+import { PaginationSortDirection } from '../../utils/pagination';
 import { UserDataSource } from '../UserDataSource';
 import database, { isUniqueConstraintError } from './database';
 import {
@@ -29,6 +30,14 @@ import {
   createUserObject,
 } from './records';
 
+const fieldMap: { [key: string]: string } = {
+  created_at: 'created_at',
+  firstname: 'firstname',
+  preferredname: 'preferredname',
+  lastname: 'lastname',
+  institution: 'i.institution',
+};
+
 export default class PostgresUserDataSource implements UserDataSource {
   async delete(id: number): Promise<User | null> {
     return database('users')
@@ -376,25 +385,25 @@ export default class PostgresUserDataSource implements UserDataSource {
   }
 
   async getUsers({
-    filter,
+    searchText,
     first,
     offset,
     userRole,
     subtractUsers,
-    orderBy,
-    orderDirection = 'desc',
+    sortField = 'created_at',
+    sortDirection,
   }: UsersArgs): Promise<{ totalCount: number; users: BasicUserDetails[] }> {
     return database
       .select(['*', database.raw('count(*) OVER() AS full_count')])
       .from('users')
       .join('institutions as i', { 'users.institution_id': 'i.institution_id' })
       .modify((query) => {
-        if (filter) {
+        if (searchText) {
           query.andWhere((qb) => {
-            qb.whereILikeEscaped('institution', '%?%', filter)
-              .orWhereILikeEscaped('firstname', '%?%', filter)
-              .orWhereILikeEscaped('preferredname', '%?%', filter)
-              .orWhereILikeEscaped('lastname', '%?%', filter);
+            qb.whereILikeEscaped('institution', '%?%', searchText)
+              .orWhereILikeEscaped('firstname', '%?%', searchText)
+              .orWhereILikeEscaped('preferredname', '%?%', searchText)
+              .orWhereILikeEscaped('lastname', '%?%', searchText);
           });
         }
         if (first) {
@@ -411,8 +420,12 @@ export default class PostgresUserDataSource implements UserDataSource {
         if (subtractUsers && subtractUsers.length > 0) {
           query.whereNotIn('users.user_id', subtractUsers);
         }
-        if (orderBy) {
-          query.orderBy(orderBy, orderDirection);
+        if (sortField && sortDirection) {
+          if (!fieldMap.hasOwnProperty(sortField)) {
+            throw new GraphQLError(`Bad sort field given: ${sortField}`);
+          }
+          sortField = fieldMap[sortField];
+          query.orderBy(sortField, sortDirection);
         }
       })
       .then(
@@ -431,14 +444,24 @@ export default class PostgresUserDataSource implements UserDataSource {
 
   async getPreviousCollaborators(
     userId: number,
-    filter?: string,
     first?: number,
     offset?: number,
+    sortField?: string,
+    sortDirection?: PaginationSortDirection,
+    searchText?: string,
     userRole?: UserRole,
     subtractUsers?: [number]
   ): Promise<{ totalCount: number; users: BasicUserDetails[] }> {
     if (userId == -1) {
-      return this.getUsers({ filter, first, offset, userRole, subtractUsers });
+      return this.getUsers({
+        searchText,
+        first,
+        offset,
+        userRole,
+        subtractUsers,
+        sortField,
+        sortDirection,
+      });
     }
 
     const lastCollaborators = await this.getMostRecentCollaborators(userId);
@@ -455,14 +478,22 @@ export default class PostgresUserDataSource implements UserDataSource {
       .join('institutions as i', { 'users.institution_id': 'i.institution_id' })
       .whereIn('users.user_id', userIds)
       .modify((query) => {
-        if (filter) {
+        if (searchText) {
           query.andWhere((qb) => {
-            qb.whereILikeEscaped('institution', '%?%', filter)
-              .orWhereILikeEscaped('firstname', '%?%', filter)
-              .orWhereILikeEscaped('preferredname', '%?%', filter)
-              .orWhereILikeEscaped('lastname', '%?%', filter);
+            qb.whereILikeEscaped('institution', '%?%', searchText)
+              .orWhereILikeEscaped('firstname', '%?%', searchText)
+              .orWhereILikeEscaped('preferredname', '%?%', searchText)
+              .orWhereILikeEscaped('lastname', '%?%', searchText);
           });
         }
+        if (sortField && sortDirection) {
+          if (!fieldMap.hasOwnProperty(sortField)) {
+            throw new GraphQLError(`Bad sort field given: ${sortField}`);
+          }
+          sortField = fieldMap[sortField];
+          query.orderBy(sortField, sortDirection);
+        }
+
         if (first) {
           query.limit(first);
         }
@@ -553,7 +584,7 @@ export default class PostgresUserDataSource implements UserDataSource {
       .from('pu')
       .whereIn('pu.proposal_pk', proposals)
       .groupBy('pu.user_id')
-      .orderByRaw('count(pu.user_id) DESC')
+      .orderBy('pu.user_id', 'desc')
       .limit(10)
       .then((users: { user_id: number }[]) => users.map((uid) => uid.user_id));
   }