fix: bad graphql query and add extra test

Author: ChongJiaChua

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

@@ -577,7 +577,7 @@ export default class PostgresExperimentDataSource
     //print all arguments
 
     const query = database('experiments')
-      .select(['*', database.raw('count(*) OVER() AS full_count')])
+      .select(['experiments.*', database.raw('count(*) OVER() AS full_count')])
       .join(
         'proposals',
         'proposals.proposal_pk',
@@ -587,24 +587,29 @@ export default class PostgresExperimentDataSource
 
     // Add instrument scientist filtering if provided
     if (filter?.instrumentScientistUserId) {
+      const instrumentScientistUserId = filter.instrumentScientistUserId;
+
       query
-        .leftJoin(
-          'instrument_has_scientists',
-          'experiments.instrument_id',
-          'instrument_has_scientists.instrument_id'
-        )
+        .leftJoin('instrument_has_scientists', function () {
+          this.on(
+            'experiments.instrument_id',
+            '=',
+            'instrument_has_scientists.instrument_id'
+          ).andOnVal(
+            'instrument_has_scientists.user_id',
+            '=',
+            instrumentScientistUserId
+          );
+        })
         .join(
           'instruments',
           'experiments.instrument_id',
           'instruments.instrument_id'
         )
         .where(function () {
-          this.where(
-            'instrument_has_scientists.user_id',
-            filter!.instrumentScientistUserId
-          ).orWhere(
+          this.whereNotNull('instrument_has_scientists.user_id').orWhere(
             'instruments.manager_user_id',
-            filter!.instrumentScientistUserId
+            instrumentScientistUserId
           );
         });
     }

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

@@ -820,15 +820,16 @@ export default class PostgresInstrumentDataSource
       await database
         .count({ count: '*' })
         .from('instruments as i')
-        .leftJoin('instrument_has_scientists as ihs', {
-          'i.instrument_id': 'ihs.instrument_id',
+        .leftJoin('instrument_has_scientists as ihs', function () {
+          this.on('i.instrument_id', '=', 'ihs.instrument_id').andOnVal(
+            'ihs.user_id',
+            '=',
+            userId
+          );
         })
         .where('i.instrument_id', instrumentId)
         .andWhere(function () {
-          this.where('ihs.user_id', userId).orWhere(
-            'i.manager_user_id',
-            userId
-          );
+          this.whereNotNull('ihs.user_id').orWhere('i.manager_user_id', userId);
         })
         .first();
 

apps/e2e/cypress/e2e/instruments.cy.ts

@@ -1886,10 +1886,11 @@ context('Instrument tests', () => {
     });
   });
 
-  describe.only('Instrument contact visibility tests', () => {
+  describe('Instrument contact visibility tests', () => {
     let contactOnlyInstrumentId: number;
     let scientistInstrumentId: number;
     let createdProposalPk: number;
+    let createdScientistProposalPk: number;
 
     const contactOnlyInstrument = {
       name: faker.word.words(2),
@@ -1966,6 +1967,30 @@ context('Instrument tests', () => {
         }
       });
 
+      //create a proposal and assign it to the instrument where scientist2 is a scientist
+      cy.createProposal({ callId: initialDBData.call.id }).then((result) => {
+        if (result.createProposal) {
+          createdScientistProposalPk = result.createProposal.primaryKey;
+
+          cy.updateProposal({
+            proposalPk: createdScientistProposalPk,
+            title: proposal2.title,
+            abstract: proposal2.abstract,
+          });
+
+          cy.assignProposalsToInstruments({
+            proposalPks: [createdScientistProposalPk],
+            instrumentIds: [scientistInstrumentId],
+          });
+
+          cy.updateTechnicalReviewAssignee({
+            proposalPks: [createdScientistProposalPk],
+            userId: scientist2.id,
+            instrumentId: scientistInstrumentId,
+          });
+        }
+      });
+
       cy.login(scientist2);
       cy.visit('/');
     });
@@ -2002,6 +2027,20 @@ context('Instrument tests', () => {
       cy.contains(proposal1.title).should('exist');
     });
 
+    it('Instrument scientist should see proposals when filtering by their scientist instrument', () => {
+      cy.contains('Proposals');
+
+      selectAllProposalsFilterStatus();
+
+      cy.finishedLoading();
+
+      cy.get('[data-cy="instrument-filter"]').click();
+      cy.get('[role="listbox"]').contains(scientistInstrument.name).click();
+      cy.finishedLoading();
+
+      cy.contains(proposal2.title).should('exist');
+    });
+
     it('Instrument contact should see their instrument on the instruments page', () => {
       cy.visit('/Instruments');