Merge pull request #100 from Chia-Network/fix/fts-fixes

Fix: FTS params
Chia-Network · Jan 5, 2022 · ed79ecb · ed79ecb
2 parents 756db9e + e67f5cb
commit ed79ecb
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 13 deletions.
diff --git a/src/controllers/helpers.js b/src/controllers/helpers.js
@@ -1,6 +1,13 @@
 'use strict';
 
 export const paginationParams = (page, limit) => {
+  if (page === undefined || limit === undefined) {
+    return {
+      page: undefined,
+      limit: undefined,
+    }
+  }
+
   if (page < 1) {
     page = 1;
   }

diff --git a/src/models/projects/projects.model.js b/src/models/projects/projects.model.js
@@ -76,36 +76,49 @@ class Project extends Model {
     if (orgUid) {
       sql = `${sql} AND orgUid = :orgUid`;
     }
-
-    sql = `${sql} ORDER BY relevance DESC LIMIT :limit OFFSET :offset`;
-
-    const count = await Project.count();
+
+    const replacements = { search: searchStr, orgUid };
+
+    const count = (await sequelize.query(sql, {
+      model: Project,
+      mapToModel: true, // pass true here if you have any mapped fields
+      replacements
+    })).length;
 
     return {
       count,
-      rows: await sequelize.query(sql, {
+      rows: await sequelize.query(`${sql} ORDER BY relevance DESC LIMIT :limit OFFSET :offset`, {
         model: Project,
-        replacements: { search: searchStr, orgUid, offset, limit },
+        replacements: {...replacements, ...{offset, limit}},
         mapToModel: true, // pass true here if you have any mapped fields
       }),
     };
   }
 
-  static findAllSqliteFts(searchStr, orgUid, pagination) {
+  static async findAllSqliteFts(searchStr, orgUid, pagination) {
     const { offset, limit } = pagination;
     let sql = `SELECT * FROM projects_fts WHERE projects_fts MATCH :search`;
 
     if (orgUid) {
       sql = `${sql} AND orgUid = :orgUid`;
     }
-
-    sql = `${sql} ORDER BY rank DESC LIMIT :limit OFFSET :offset`;
-
-    return sequelize.query(sql, {
+    
+    const replacements = { search: `${searchStr}*`, orgUid };
+  
+    const count = (await sequelize.query(sql, {
       model: Project,
-      replacements: { search: `${searchStr}*`, orgUid, offset, limit },
       mapToModel: true, // pass true here if you have any mapped fields
-    });
+      replacements
+    })).length;
+
+    return {
+      count,
+      rows: await sequelize.query(`${sql} ORDER BY rank DESC LIMIT :limit OFFSET :offset`, {
+        model: Project,
+        mapToModel: true, // pass true here if you have any mapped fields
+        replacements: {...replacements, ...{offset, limit}}
+      }),
+    };
   }
 }