Merge branch 'develop' into dependabot/npm_and_yarn/apps/frontend/multi-c22e25d29b

Author: yoganandaness

apps/backend/db_patches/0202_DropUsersUsernameKey.sql

@@ -0,0 +1,11 @@
+DO
+$$
+BEGIN
+    IF register_patch('DropUsersUsernameKey.sql', 'jekabskarklins', 'Deprecate username constraint. This fix is needed for the broken integration that is underway', '2025-12-11') THEN
+        BEGIN
+            ALTER TABLE IF EXISTS public.users
+            DROP CONSTRAINT users_username_key;
+        END;
+    END IF;
+END;
+$$

apps/backend/docker-compose-stfc.e2e.yml

@@ -1,6 +1,6 @@
 services:
   clam-antivirus:
-    image: clamav/clamav:0.104
+    image: clamav/clamav:1.5.1
     ports:
       - "3310:3310"
 
@@ -40,13 +40,13 @@ services:
       - "4500:4500"
     cap_add:
       - SYS_ADMIN
- 
+
   mockServer:
     image: mockserver/mockserver:5.13.0
     command: -logLevel ERROR -serverPort 1080
     ports:
       - 1080:1080
-  
+
   mockserver-client:
     image: "ghcr.io/userofficeproject/stfc-mockserver-client:master"
     command: sh -c "sleep 5 && node src/mockserver.js"

apps/backend/package-lock.json

@@ -59,7 +59,7 @@
     "dataloader": "^2.2.2",
     "dotenv": "^16.4.5",
     "email-templates": "^11.1.1",
-    "express": "^4.21.1",
+    "express": "^4.22.1",
     "express-jwt": "^6.1.2",
     "graphql": "^16.8.1",
     "graphql-request": "^6.1.0",

apps/backend/package.json

@@ -21,14 +21,16 @@ export interface ReviewDataSource {
     userId?: number,
     callId?: number,
     instrumentId?: number,
-    submitted?: number
+    submitted?: number,
+    active?: boolean
   ): Promise<Review[]>;
   getAllUsersReviews(
     fapIds: number[],
     userId?: number,
     callId?: number,
     instrumentId?: number,
-    submitted?: number
+    submitted?: number,
+    active?: boolean
   ): Promise<Review[]>;
   getAssignmentReview(
     fapId: number,

apps/backend/src/datasources/ReviewDataSource.ts

@@ -349,7 +349,8 @@ export default class PostgresReviewDataSource implements ReviewDataSource {
     userId?: number,
     callId?: number,
     instrumentId?: number,
-    status?: ReviewStatus
+    status?: ReviewStatus,
+    active?: boolean
   ): Promise<Review[]> {
     return database
       .select()
@@ -378,6 +379,16 @@ export default class PostgresReviewDataSource implements ReviewDataSource {
         if (status !== undefined && status !== null) {
           qb.where('fap_reviews.status', status);
         }
+
+        if (active) {
+          qb.join('proposals', {
+            'proposals.proposal_pk': 'fap_reviews.proposal_pk',
+          });
+          qb.join('call', {
+            'call.call_id': 'proposals.call_id',
+          });
+          qb.where('call.call_fap_review_ended', false);
+        }
       })
       .whereIn('fap_id', fapIds)
       .distinctOn('fap_reviews.proposal_pk')
@@ -414,7 +425,8 @@ export default class PostgresReviewDataSource implements ReviewDataSource {
     userId?: number,
     callId?: number,
     instrumentId?: number,
-    status?: ReviewStatus
+    status?: ReviewStatus,
+    active?: boolean
   ): Promise<Review[]> {
     return database
       .select('fapReviewsTemp.*')
@@ -440,6 +452,16 @@ export default class PostgresReviewDataSource implements ReviewDataSource {
             if (status !== null && status !== undefined) {
               qb.where('fap_reviews.status', status);
             }
+
+            if (active) {
+              qb.join('proposals', {
+                'proposals.proposal_pk': 'fap_reviews.proposal_pk',
+              });
+              qb.join('call', {
+                'call.call_id': 'proposals.call_id',
+              });
+              qb.where('call.call_fap_review_ended', false);
+            }
           })
           .whereIn('fap_id', fapIds)
           .as('fapReviewsTemp')

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

@@ -779,6 +779,8 @@ export class StfcUserDataSource implements UserDataSource {
   async getApprovedProposalVisitorsWithInstitution(
     proposalPk: number
   ): Promise<{ user: User; institution: Institution; country: Country }[]> {
-    throw new Error('Method not implemented.');
+    return await postgresUserDataSource.getApprovedProposalVisitorsWithInstitution(
+      proposalPk
+    );
   }
 }

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

@@ -130,7 +130,6 @@ export const getProposalMessageData = async (proposal: Proposal) => {
 
   const proposalUsersWithInstitution =
     await userDataSource.getProposalUsersWithInstitution(proposal.primaryKey);
-
   const dataAccessUsersWithInstitution =
     await dataAccessUsersDataSource.getDataAccessUsersWithInstitution(
       proposal.primaryKey