fix: units columns fts edge case

Chia-Network · Jan 13, 2022 · 3fa4ff9 · 3fa4ff9
1 parent 554cce6
commit 3fa4ff9
Showing 1 changed file with 19 additions and 4 deletions.
diff --git a/src/models/units/units.model.js b/src/models/units/units.model.js
@@ -14,20 +14,29 @@ const virtualColumns = {
     type: Sequelize.VIRTUAL,
     get() {
       const rawValue = this.getDataValue('serialNumberBlock');
+      if (!rawValue) {
+        return undefined;
+      }
       return rawValue.split('-')[0];
     },
   },
   unitBlockEnd: {
     type: Sequelize.VIRTUAL,
     get() {
       const rawValue = this.getDataValue('serialNumberBlock');
+      if (!rawValue) {
+        return undefined;
+      }
       return rawValue.split('-')[1];
     },
   },
   unitCount: {
     type: Sequelize.VIRTUAL,
     get() {
       const rawValue = this.getDataValue('serialNumberBlock');
+      if (!rawValue) {
+        return undefined;
+      }
       const blocks = rawValue.split('-');
       const blockStart = Number(blocks[0].split(/(\d+)/)[1]);
       const blockEnd = Number(blocks[1].split(/(\d+)/)[1]);
@@ -90,15 +99,21 @@ class Unit extends Model {
   static async fts(searchStr, orgUid, pagination, columns = []) {
     const dialect = sequelize.getDialect();
 
-    if (!columns.includes('serialNumberBlock')) {
-      columns.push('serialNumberBlock');
-    }
-
     const handlerMap = {
       sqlite: Unit.findAllSqliteFts,
       mysql: Unit.findAllMySQLFts,
     };
 
+    // Check if we need to include the virtual field dep
+    for (const col of Object.keys(virtualColumns)) {
+      if (columns.includes(col)) {
+        if (!columns.includes('serialNumberBlock')) {
+          columns.push('serialNumberBlock');
+        }
+        break;
+      }
+    }
+
     return handlerMap[dialect](
       searchStr,
       orgUid,