Merge branch 'develop' into SWAP-4687-uo-remove-unused-fields-from-user-form

Author: jekabs-karklins

apps/backend/db_patches/0180_MarkInstrumentsAsUnselectable.sql

@@ -0,0 +1,14 @@
+DO
+$$
+BEGIN
+	IF register_patch('0180_MarkInstrumentsAsUnselectable.sql', 'TCMeldrum', 'Mark instruments as unselecable for instrument picker', '2025-05-25') THEN
+	BEGIN
+
+    ALTER TABLE instruments
+    ADD COLUMN selectable boolean DEFAULT true; 
+
+    END;
+	END IF;
+END;
+$$
+LANGUAGE plpgsql;

apps/backend/src/datasources/FapDataSource.ts

@@ -83,7 +83,10 @@ export interface FapDataSource {
   getFapProposalCount(fapId: number): Promise<number>;
   getCurrentFapProposalCount(fapId: number): Promise<number>;
   getFapReviewerProposalCount(reviewerId: number): Promise<number>;
-  getCurrentFapReviewerProposalCount(reviewerId: number): Promise<number>;
+  getCurrentFapReviewerProposalCount(
+    reviewerId: number,
+    fapId: number
+  ): Promise<number>;
   getFapProposal(
     fapId: number,
     proposalPk: number,

apps/backend/src/datasources/InstrumentDataSource.ts

@@ -19,7 +19,8 @@ export interface InstrumentDataSource {
   ): Promise<{ totalCount: number; instruments: Instrument[] }>;
   getUserInstruments(userId: number): Promise<Instrument[]>;
   getInstrumentsByCallId(
-    callIds: number[]
+    callIds: number[],
+    selectableOnly?: boolean
   ): Promise<InstrumentWithAvailabilityTime[]>;
   getCallsByInstrumentId(
     instrumentId: number,

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

@@ -358,7 +358,7 @@ export class FapDataSourceMock implements FapDataSource {
     return dummyFapProposals.length;
   }
 
-  async getCurrentFapReviewerProposalCount(reviewerId: number) {
+  async getCurrentFapReviewerProposalCount(reviewerId: number, fapId: number) {
     return dummyFapProposals.length;
   }
 

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

@@ -16,15 +16,17 @@ export const dummyInstrument = new Instrument(
   'Dummy instrument 1',
   'instrument_1',
   'This is test instrument.',
-  1
+  1,
+  true
 );
 
 export const dummyInstrument2 = new Instrument(
   2,
   'Dummy instrument 2',
   'instrument_2',
   'This is test instrument.',
-  1
+  1,
+  true
 );
 
 export const dummyInstrumentWithAvailabilityTime =

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

@@ -406,7 +406,8 @@ export default class PostgresFapDataSource implements FapDataSource {
   }
 
   async getCurrentFapReviewerProposalCount(
-    reviewerId: number
+    reviewerId: number,
+    fapId: number
   ): Promise<number> {
     const callFilter = {
       isFapReviewEnded: false,
@@ -424,6 +425,7 @@ export default class PostgresFapDataSource implements FapDataSource {
       })
       .whereIn('fp.call_id', callIds)
       .andWhere('fr.user_id', reviewerId)
+      .andWhere('fr.fap_id', fapId)
       .groupBy('fr.user_id')
       .first()
       .then((result: { count?: string | undefined } | undefined) => {

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

@@ -41,7 +41,8 @@ export default class PostgresInstrumentDataSource
       instrument.name,
       instrument.short_code,
       instrument.description,
-      instrument.manager_user_id
+      instrument.manager_user_id,
+      instrument.selectable
     );
   }
 
@@ -80,6 +81,7 @@ export default class PostgresInstrumentDataSource
         short_code: args.shortCode,
         description: args.description,
         manager_user_id: args.managerUserId,
+        selectable: !!args.selectable,
       })
       .into('instruments')
       .returning('*');
@@ -153,7 +155,8 @@ export default class PostgresInstrumentDataSource
   }
 
   async getInstrumentsByCallId(
-    callIds: number[]
+    callIds: number[],
+    selectableOnly?: boolean
   ): Promise<InstrumentWithAvailabilityTime[]> {
     return database
       .select([
@@ -170,6 +173,11 @@ export default class PostgresInstrumentDataSource
         'i.instrument_id': 'chi.instrument_id',
       })
       .whereIn('chi.call_id', callIds)
+      .modify((query) => {
+        if (selectableOnly) {
+          query.andWhere('i.selectable', true);
+        }
+      })
       .distinct('i.instrument_id')
       .then((instruments: InstrumentWithAvailabilityTimeRecord[]) => {
         const result = instruments.map((instrument) =>
@@ -286,6 +294,7 @@ export default class PostgresInstrumentDataSource
           short_code: instrument.shortCode,
           description: instrument.description,
           manager_user_id: instrument.managerUserId,
+          selectable: instrument.selectable,
         },
         ['*']
       )

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

@@ -476,6 +476,7 @@ export interface InstrumentRecord {
   readonly description: string;
   readonly manager_user_id: number;
   readonly full_count: number;
+  readonly selectable: boolean;
 }
 
 export interface InstrumentHasProposalRecord {
@@ -815,7 +816,8 @@ export const createInstrumentObject = (instrument: InstrumentRecord) => {
     instrument.name,
     instrument.short_code,
     instrument.description,
-    instrument.manager_user_id
+    instrument.manager_user_id,
+    instrument.selectable
   );
 };
 

apps/backend/src/models/Instrument.ts

@@ -4,7 +4,8 @@ export class Instrument {
     public name: string,
     public shortCode: string,
     public description: string,
-    public managerUserId: number
+    public managerUserId: number,
+    public selectable?: boolean
   ) {}
 }
 

apps/backend/src/models/questionTypes/InstrumentPicker.ts

@@ -64,9 +64,10 @@ export const instrumentPickerDefinition: Question<DataType.INSTRUMENT_PICKER> =
           Tokens.InstrumentDataSource
         );
 
-        const instruments = await instrumentDataSource.getInstrumentsByCallId([
-          callId,
-        ]);
+        const instruments = await instrumentDataSource.getInstrumentsByCallId(
+          [callId],
+          true
+        );
 
         return {
           ...config,