fix: column sort in experiments table

apps/backend/src/datasources/ExperimentDataSource.ts

@@ -2,6 +2,7 @@ import {
   Experiment,
   ExperimentHasSample,
   ExperimentSafety,
+  ExperimentTableSortField,
   InstrumentScientistDecisionEnum,
   ExperimentSafetyReviewerDecisionEnum,
 } from '../models/Experiment';
@@ -87,7 +88,7 @@ export interface ExperimentDataSource {
     filter?: ExperimentsFilter,
     first?: number,
     offset?: number,
-    sortField?: string,
+    sortField?: ExperimentTableSortField,
     sortDirection?: PaginationSortDirection,
     searchText?: string
   ): Promise<{

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

@@ -3,6 +3,7 @@ import {
   ExperimentSafety,
   ExperimentHasSample,
   ExperimentStatus,
+  ExperimentTableSortField,
   InstrumentScientistDecisionEnum,
   ExperimentSafetyReviewerDecisionEnum,
 } from '../../models/Experiment';
@@ -121,7 +122,7 @@ export class ExperimentDataSourceMock implements ExperimentDataSource {
     filter?: ExperimentsFilter,
     first?: number,
     offset?: number,
-    sortField?: string,
+    sortField?: ExperimentTableSortField,
     sortDirection?: PaginationSortDirection,
     searchText?: string
   ): Promise<{ totalCount: number; experiments: Experiment[] }> {

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

@@ -7,6 +7,7 @@ import {
   ExperimentHasSample,
   ExperimentSafety,
   ExperimentSafetyReviewerDecisionEnum,
+  ExperimentTableSortField,
   InstrumentScientistDecisionEnum,
 } from '../../models/Experiment';
 import { Rejection } from '../../models/Rejection';
@@ -83,8 +84,23 @@ function generateExperimentId(
   return `${proposalNumber}-${sequence ?? 0}`;
 }
 
-const fieldMap: { [key: string]: string } = {
-  experimentId: 'experiment_id',
+type SortableExperimentTableColumnName =
+  | 'experiment_id'
+  | 'proposal_id'
+  | 'starts_at'
+  | 'ends_at';
+
+// Maps a sortable column from the API to its database column.
+// Instrument and experiment safety status are intentionally omitted
+// (not sortable at the DB layer; create a view later if needed).
+const fieldMap: Record<
+  ExperimentTableSortField,
+  SortableExperimentTableColumnName
+> = {
+  [ExperimentTableSortField.experimentId]: 'experiment_id',
+  [ExperimentTableSortField.proposalId]: 'proposal_id',
+  [ExperimentTableSortField.startsAt]: 'starts_at',
+  [ExperimentTableSortField.endsAt]: 'ends_at',
 };
 
 @injectable()
@@ -570,7 +586,7 @@ export default class PostgresExperimentDataSource
     filter?: ExperimentsFilter,
     first?: number,
     offset?: number,
-    sortField?: string,
+    sortField?: ExperimentTableSortField,
     sortDirection?: PaginationSortDirection,
     searchText?: string
   ): Promise<{ totalCount: number; experiments: Experiment[] }> {
@@ -689,8 +705,8 @@ export default class PostgresExperimentDataSource
           if (!fieldMap.hasOwnProperty(sortField)) {
             throw new GraphQLError(`Bad sort field given: ${sortField}`);
           }
-          sortField = fieldMap[sortField];
-          query.orderBy(sortField, sortDirection);
+          const databaseSortField = fieldMap[sortField];
+          query.orderBy(databaseSortField, sortDirection);
         }
 
         if (first) {

apps/backend/src/models/Experiment.ts

@@ -4,6 +4,15 @@ export enum ExperimentStatus {
   COMPLETED = 'COMPLETED',
 }
 
+// Experiment table columns that support sorting. Lives in the model so it can
+// be reused across queries/datasources without importing from the resolver layer.
+export enum ExperimentTableSortField {
+  experimentId = 'experimentId',
+  proposalId = 'proposalId',
+  startsAt = 'startsAt',
+  endsAt = 'endsAt',
+}
+
 export class Experiment {
   constructor(
     public experimentPk: number,

apps/backend/src/queries/ExperimentQueries.ts

@@ -4,6 +4,7 @@ import { UserAuthorization } from '../auth/UserAuthorization';
 import { Tokens } from '../config/Tokens';
 import { ExperimentDataSource } from '../datasources/ExperimentDataSource';
 import { Authorized } from '../decorators';
+import { ExperimentTableSortField } from '../models/Experiment';
 import { Roles } from '../models/Role';
 import { UserWithRole } from '../models/User';
 import { ExperimentSampleArgs } from '../resolvers/queries/ExperimentSampleQuery';
@@ -97,7 +98,7 @@ export default class ExperimentQueries {
     filter: ExperimentsFilter = {},
     first?: number,
     offset?: number,
-    sortField?: string,
+    sortField?: ExperimentTableSortField,
     sortDirection?: PaginationSortDirection,
     searchText?: string
   ) {

apps/backend/src/resolvers/queries/ExperimentsQuery.ts

@@ -11,7 +11,10 @@ import {
 } from 'type-graphql';
 
 import { ResolverContext } from '../../context';
-import { ExperimentStatus } from '../../models/Experiment';
+import {
+  ExperimentStatus,
+  ExperimentTableSortField,
+} from '../../models/Experiment';
 import { PaginationSortDirection } from '../../utils/pagination';
 import { Experiment } from '../types/Experiment';
 
@@ -59,8 +62,8 @@ export class ExperimentsArgs {
   @Field(() => Int, { nullable: true })
   public offset?: number;
 
-  @Field({ nullable: true })
-  public sortField?: string;
+  @Field(() => ExperimentTableSortField, { nullable: true })
+  public sortField?: ExperimentTableSortField;
 
   @Field(() => PaginationSortDirection, { nullable: true })
   public sortDirection?: PaginationSortDirection;

apps/backend/src/resolvers/registerEnums.ts

@@ -9,6 +9,7 @@ import {
 import {
   ExperimentSafetyReviewerDecisionEnum,
   ExperimentStatus,
+  ExperimentTableSortField,
   InstrumentScientistDecisionEnum,
 } from '../models/Experiment';
 import { FapReviewVisibility } from '../models/Fap';
@@ -70,6 +71,10 @@ export const registerEnums = () => {
   registerEnumType(ExperimentStatus, {
     name: 'ExperimentStatus',
   });
+  registerEnumType(ExperimentTableSortField, {
+    name: 'ExperimentTableSortField',
+    description: 'Experiment table columns that support sorting',
+  });
   registerEnumType(FeedbackStatus, {
     name: 'FeedbackStatus',
   });