Merge pull request #11 from gcandal/gc/fix-finds

Fix Model#findS
hivesolutions · Sep 9, 2020 · 9c924f5 · 9c924f5
2 parents 3db5d00 + 5288710
commit 9c924f5
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 3 deletions.
diff --git a/js/data/model.js b/js/data/model.js
@@ -430,10 +430,10 @@ export class ModelStore extends Model {
     }
 
     static get default() {
-        return (
-            (Object.entries(this.schema).findOne(([name, definition]) => definition.default) || {})
-                .name || null
+        const defaultEntry = Object.entries(this.schema).find(
+            ([name, definition]) => definition.default
         );
+        return defaultEntry ? defaultEntry[0] : null;
     }
 
     static definitionN(name) {

diff --git a/test/util/model.js b/test/util/model.js
@@ -27,6 +27,10 @@ class MockModel extends yonius.ModelStore {
                 type: String,
                 unique: true,
                 required: true
+            },
+            name: {
+                type: String,
+                default: true
             }
         };
     }
@@ -74,6 +78,31 @@ describe("#find()", function() {
         });
     });
 
+    it("should allow find_s", () => {
+        MockModel.find({
+            find_s: "swear"
+        });
+        assert.deepStrictEqual(MockModel.lastCall.params, {
+            name: {
+                $options: "",
+                $regex: "swear"
+            }
+        });
+    });
+
+    it("should allow case-insentitive find_s", () => {
+        MockModel.find({
+            find_s: "swear",
+            find_i: 1
+        });
+        assert.deepStrictEqual(MockModel.lastCall.params, {
+            name: {
+                $options: "-i",
+                $regex: "swear"
+            }
+        });
+    });
+
     it("should allow pages and sorting", () => {
         MockModel.find({
             find_d: "brand:likei:swear",