@nocobase/database 0.9.4-alpha.1 → 0.9.4-alpha.2

package/lib/filter-parser.js

@@ -158,11 +158,14 @@ class FilterParser {
         const associationKeys = [];
         associationKeys.push(firstKey);
         debug('associationKeys %o', associationKeys);
-        // set sequelize include option
-        _lodash().default.set(include, firstKey, {
-          association: firstKey,
-          attributes: [] // out put empty fields by default
-        });
+        const existInclude = _lodash().default.get(include, firstKey);
+        if (!existInclude) {
+          // set sequelize include option
+          _lodash().default.set(include, firstKey, {
+            association: firstKey,
+            attributes: [] // out put empty fields by default
+          });
+        }
         // association target model
         let target = associations[firstKey].target;
         debug('association target %o', target);
@@ -183,10 +186,13 @@ class FilterParser {
               }
               assoc.push(associationKey);
             });
-            _lodash().default.set(include, assoc, {
-              association: attr,
-              attributes: []
-            });
+            const existInclude = _lodash().default.get(include, assoc);
+            if (!existInclude) {
+              _lodash().default.set(include, assoc, {
+                association: attr,
+                attributes: []
+              });
+            }
             target = target.associations[attr].target;
           } else {
             throw new Error(`${attr} neither ${firstKey}'s association nor ${firstKey}'s attribute`);

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/database",
-  "version": "0.9.4-alpha.1",
+  "version": "0.9.4-alpha.2",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/logger": "0.9.4-alpha.1",
-    "@nocobase/utils": "0.9.4-alpha.1",
+    "@nocobase/logger": "0.9.4-alpha.2",
+    "@nocobase/utils": "0.9.4-alpha.2",
     "async-mutex": "^0.3.2",
     "cron-parser": "4.4.0",
     "deepmerge": "^4.2.2",
@@ -28,5 +28,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/database"
   },
-  "gitHead": "0b4936be557be918dbdf8196dadcbc7eb395906d"
+  "gitHead": "2bc19a85bf9425aa220b6c467315c8087f333a7e"
 }

package/src/__tests__/filter.test.ts

@@ -14,6 +14,60 @@ describe('filter', () => {
     await db.close();
   });
 
+  it('should filter by belongs to many association', async () => {
+    const A = db.collection({
+      name: 'a',
+      fields: [
+        { type: 'string', name: 'name' },
+        { type: 'hasMany', name: 'b', target: 'b' },
+      ],
+    });
+
+    const B = db.collection({
+      name: 'b',
+      fields: [
+        { type: 'string', name: 'name' },
+        { type: 'belongsTo', name: 'c', target: 'c' },
+        { type: 'belongsTo', name: 'd', target: 'd' },
+      ],
+    });
+
+    const C = db.collection({
+      name: 'c',
+      fields: [{ type: 'string', name: 'name' }],
+    });
+
+    const D = db.collection({
+      name: 'd',
+      fields: [{ type: 'string', name: 'name' }],
+    });
+
+    await db.sync();
+
+    const findArgs = {
+      filter: {
+        $and: [{ b: { c: { name: { $eq: 'c1' } } } }, { b: { d: { name: { $eq: 'd1' } } } }],
+      },
+    };
+
+    const findOptions = A.repository.buildQueryOptions(findArgs);
+
+    const include = findOptions.include;
+
+    const associationB = include.find((i) => i.association === 'b');
+    expect(associationB).toBeDefined();
+    expect(associationB.include).toHaveLength(2);
+
+    let err;
+    try {
+      await A.repository.find({ ...findArgs });
+    } catch (e) {
+      err = e;
+    }
+
+    expect(err).toBeUndefined();
+  });
+
   it('should filter by hasMany association field', async () => {
     const DeptCollection = db.collection({
       name: 'depts',

package/src/filter-parser.ts

@@ -164,11 +164,15 @@ export default class FilterParser {
 
         debug('associationKeys %o', associationKeys);
 
-        // set sequelize include option
-        _.set(include, firstKey, {
-          association: firstKey,
-          attributes: [], // out put empty fields by default
-        });
+        const existInclude = _.get(include, firstKey);
+
+        if (!existInclude) {
+          // set sequelize include option
+          _.set(include, firstKey, {
+            association: firstKey,
+            attributes: [], // out put empty fields by default
+          });
+        }
 
         // association target model
         let target = associations[firstKey].target;
@@ -192,10 +196,14 @@ export default class FilterParser {
               assoc.push(associationKey);
             });
 
-            _.set(include, assoc, {
-              association: attr,
-              attributes: [],
-            });
+            const existInclude = _.get(include, assoc);
+            if (!existInclude) {
+              _.set(include, assoc, {
+                association: attr,
+                attributes: [],
+              });
+            }
+
             target = target.associations[attr].target;
           } else {
             throw new Error(`${attr} neither ${firstKey}'s association nor ${firstKey}'s attribute`);