Specified collection select working

mchapman · mchapman · commit ef40b7c4a633 · 2021-12-02T17:23:08.000Z
diff --git a/test/api/API-Spec.js b/test/api/API-Spec.js
@@ -837,7 +837,6 @@ describe('API tests', function() {
         fng.searchAll()(mockReq, mockRes);
       });
 
-
       it('should support searchResultFormat option', function(done) {
         var mockReq = {
           url: '/search',
@@ -861,6 +860,57 @@ describe('API tests', function() {
         };
         fng.searchAll()(mockReq, mockRes);
       });
+
+      it('will select from a given collection if specified', (done) => {
+        const mockReq = {
+          url: '/search',
+          query: {
+            q: 'f_nested_schema:a'
+          },
+          route: { path: '/api/search' }
+        };
+        const mockRes = {
+          status: function(code) {
+            assert.strictEqual(code, 200);
+            return this;
+          },
+          send: function(data) {
+            assert.equal(data.results.length, 1);
+            assert.equal(data.results[0].resourceText, 'Exams');
+            assert.equal(data.results[0].resource, 'f_nested_schema');
+            assert.equal(data.results[0].text, 'Smith, Anne');
+            done();
+          }
+        };
+        fng.searchAll()(mockReq, mockRes);
+      });
+
+      it.only('will select from a synonym collection if specified', (done) => {
+        const mockReq = {
+          url: '/search',
+          query: {
+            q: 'Exams:a'
+          },
+          route: { path: '/api/search' }
+        };
+        const mockRes = {
+          status: function(code) {
+            assert.strictEqual(code, 200);
+            return this;
+          },
+          send: function(data) {
+            assert.equal(data.results.length, 1);
+            assert.equal(data.results[0].resourceText, ' ');
+            assert.equal(data.results[0].resource, 'f_nested_schema');
+            assert.equal(data.results[0].text, 'Smith, Anne');
+            done();
+          }
+        };
+        fng.searchAll()(mockReq, mockRes);
+      });
+
+      it('will select from a filtered synonym collection if specified');
+
     });
 
     describe('MongoDB selection', function() {
diff --git a/test/api/models/f_nested_schema.js b/test/api/models/f_nested_schema.js
@@ -84,7 +84,10 @@ FSchema.statics.form = function (layout) {
 
 module.exports = {
   model: F,
-  searchResultFormat: F.prototype.searchResultFormat
+  options : {
+    synonyms: [{name: 'Exams'}],
+    searchResultFormat: F.prototype.searchResultFormat
+  }
 };
 
 
diff --git a/test/helpers/db-helpers.ts b/test/helpers/db-helpers.ts
@@ -1,6 +1,6 @@
 import { FormsAngular } from "../../src/server/data_form";
 const express = require("express");
-const async = require("async");
+const asyncLib = require("async");
 const path = require("path");
 const fs = require("fs");
 const exec = require("child_process").exec;
@@ -25,31 +25,36 @@ module.exports = {
       // Import test data
       const dataPath = path.join(__dirname, "../api/data");
       fs.readdir(dataPath, function(err, files) {
-        async.each(files, function(file, cb2) {
+
+        function importData(file, cb2) {
           const fname = dataPath + "/" + file;
           if (fs.statSync(fname).isFile()) {
-            const command = "mongoimport --db forms-ng_test --drop --collection " + file.slice(0, 1) + "s --jsonArray < " + fname;                  exec(command, function(error, stdout, stderr) {
+            const command = "mongoimport --db forms-ng_test --drop --collection " + file.slice(0, 1) + "s --jsonArray < " + fname;
+            exec(command, function(error, stdout, stderr) {
               if (error !== null) {
                 cb2(new Error("Error executing " + command + " : " + error + " (Code = " + error.code + "    " + error.signal + ") : " + stderr + " : " + stdout));
               } else {
                 cb2();
               }
             });
           }
-        }, function(err) {
+        }
+
+        asyncLib.each(files, importData, function(err) {
           if (err) {
             throw new Error(err);
           } else {
             // Bootstrap models
             const modelsPath = path.join(__dirname, "../api/models");
             fs.readdir(modelsPath, function(err, files) {
-              async.each(files, function(file, cb2) {
+              function addAResource(file, cb3) {
                 const fname = modelsPath + "/" + file;
                 if (fs.statSync(fname).isFile()) {
                   fng.addResource(file.slice(0, -3), require(fname), { suppressDeprecatedMessage: true });
                 }
-                cb2();
-              }, function(err) {
+                cb3();
+              }
+              asyncLib.each(files, addAResource, function(err) {
                 if (err) {
                   throw new Error(err);
                 } else {
