fix: related users on fap SQL statement join (#1604)

Author: zacharyjhankin

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

@@ -1207,44 +1207,47 @@ export default class PostgresFapDataSource implements FapDataSource {
   }
 
   async getRelatedUsersOnFap(id: number): Promise<number[]> {
-    const relatedFapMembers = await database
-      .select('fr.user_id')
+    const relatedFaps = await database
+      .select('f.fap_id')
       .distinct()
-      .from('faps as s')
-      .leftJoin('fap_secretaries as fs', 'fs.fap_id', 's.fap_id')
-      .leftJoin('fap_chairs as fc', 'fc.fap_id', 's.fap_id')
-      .leftJoin('fap_reviewers as r', function () {
-        this.on('s.fap_id', 'r.fap_id');
-        this.andOn(function () {
-          this.onVal('r.user_id', id); // where the user is part of the visit
-          this.orOnVal('fc.user_id', id); // where the user is a chair
-          this.orOnVal('fs.user_id', id); // where the user is the secretary
-        });
-      }) // this gives a list of proposals that a user is related to
-      .join('fap_reviewers as fr', { 'fr.fap_id': 's.fap_id' }); // this gives us all of the associated reviewers
+      .from('faps as f')
+      .leftJoin('fap_secretaries as fs', 'fs.fap_id', 'f.fap_id')
+      .leftJoin('fap_chairs as fc', 'fc.fap_id', 'f.fap_id')
+      .leftJoin('fap_reviewers as fr', 'fr.fap_id', 'f.fap_id')
+      .where(function () {
+        this.where('fs.user_id', id)
+          .orWhere('fc.user_id', id)
+          .orWhere('fr.user_id', id);
+      });
 
-    const relatedFapChairsAndSecs = await database
-      .select(
-        'fc.user_id as fap_chair_user_id',
-        'fs.user_id as fap_secretary_user_id'
-      )
+    if (relatedFaps.length === 0) {
+      return [];
+    }
+
+    const relatedFapIds = relatedFaps.map((fap) => fap.fap_id);
+
+    const secretaries = await database
+      .select('user_id')
       .distinct()
-      .from('faps as s')
-      .leftJoin('fap_secretaries as fs', 'fs.fap_id', 's.fap_id')
-      .leftJoin('fap_chairs as fc', 'fc.fap_id', 's.fap_id')
-      .leftJoin('fap_reviewers as r', function () {
-        this.on('s.fap_id', 'r.fap_id');
-        this.andOn(function () {
-          this.onVal('r.user_id', id); // where the user is part of the visit
-          this.orOnVal('fc.user_id', id); // where the user is a chair
-          this.orOnVal('fs.user_id', id); // where the user is the secretary
-        });
-      });
+      .from('fap_secretaries')
+      .whereIn('fap_id', relatedFapIds);
+
+    const chairs = await database
+      .select('user_id')
+      .distinct()
+      .from('fap_chairs')
+      .whereIn('fap_id', relatedFapIds);
+
+    const reviewers = await database
+      .select('user_id')
+      .distinct()
+      .from('fap_reviewers')
+      .whereIn('fap_id', relatedFapIds);
 
     const relatedUsers = [
-      ...relatedFapMembers.map((r) => r.user_id),
-      ...relatedFapChairsAndSecs.map((r) => r.fap_chair_user_id),
-      ...relatedFapChairsAndSecs.map((r) => r.fap_secretary_user_id),
+      ...chairs.map((r) => r.user_id),
+      ...secretaries.map((r) => r.user_id),
+      ...reviewers.map((r) => r.user_id),
     ];
 
     return relatedUsers;