fix: projects returns entire result set on fts

Chia-Network · Mar 2, 2022 · a05dcb1 · a05dcb1
1 parent 086489c
commit a05dcb1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 40 deletions.
diff --git a/src/controllers/project.controller.js b/src/controllers/project.controller.js
@@ -1,5 +1,6 @@
 import _ from 'lodash';
 
+import { Sequelize } from 'sequelize';
 import xlsx from 'node-xlsx';
 import { uuid as uuidv4 } from 'uuidv4';
 
@@ -133,7 +134,18 @@ export const findAll = async (req, res) => {
     }
 
     if (search) {
-      results = await Project.fts(search, orgUid, pagination, columns);
+      const ftsResults = await Project.fts(search, orgUid, pagination, columns);
+      const mappedResults = ftsResults.rows.map((ftsResult) =>
+        _.get(ftsResult, 'dataValues.warehouseProjectId'),
+      );
+
+      if (!where) {
+        where = {};
+      }
+
+      where.warehouseProjectId = {
+        [Sequelize.Op.in]: mappedResults,
+      };
     }
 
     if (!results) {

diff --git a/src/controllers/units.controller.js b/src/controllers/units.controller.js
@@ -2,6 +2,7 @@
 
 import _ from 'lodash';
 import { uuid as uuidv4 } from 'uuidv4';
+import { Sequelize } from 'sequelize';
 
 import { Staging, Unit, Label, Issuance, Organization } from '../models';
 
@@ -141,41 +142,23 @@ export const findAll = async (req, res) => {
     }
 
     if (search) {
-      results = await Unit.fts(search, orgUid, pagination, Unit.defaultColumns);
-
-      // Lazy load the associations when doing fts search, not ideal but the page sizes should be small
-
-      if (columns.includes('labels')) {
-        results.rows = await Promise.all(
-          results.rows.map(async (result) => {
-            result.dataValues.labels = await Label.findAll({
-              include: [
-                {
-                  model: Unit,
-                  where: {
-                    warehouseUnitId: result.dataValues.warehouseUnitId,
-                  },
-                  attributes: [],
-                  as: 'unit',
-                  require: true,
-                },
-              ],
-            });
-            return result;
-          }),
-        );
-      }
+      const ftsResults = await Unit.fts(
+        search,
+        orgUid,
+        pagination,
+        Unit.defaultColumns,
+      );
+      const mappedResults = ftsResults.rows.map((ftsResult) =>
+        _.get(ftsResult, 'dataValues.warehouseUnitId'),
+      );
 
-      if (columns.includes('issuances')) {
-        results.rows = await Promise.all(
-          results.rows.map(async (result) => {
-            result.dataValues.issuance = await Issuance.findByPk(
-              result.dataValues.issuanceId,
-            );
-            return result;
-          }),
-        );
+      if (!where) {
+        where = {};
       }
+
+      where.warehouseProjectId = {
+        [Sequelize.Op.in]: mappedResults,
+      };
     }
 
     if (!results) {

diff --git a/src/models/projects/projects.model.js b/src/models/projects/projects.model.js
@@ -161,9 +161,7 @@ class Project extends Model {
         projectTag,
         estimatedAnnualAverageEmissionReduction,
         timeStaged
-    ) 
-    AGAINST ':search' 
-    ORDER BY timeStaged DESC
+    ) AGAINST ':search' 
     `;
 
     if (orgUid) {

diff --git a/src/models/units/units.model.js b/src/models/units/units.model.js
@@ -202,9 +202,7 @@ class Unit extends Model {
         cooresponingAdjustmentDeclaration,
         correspondingAdjustmentStatus,
         timeStaged
-    ) 
-    AGAINST ':search' 
-    ORDER BY timeStaged DESC
+    ) AGAINST ':search' 
     `;
 
     if (orgUid) {