Fix buildQuery for polymorphic relations

strapi · Oct 19, 2020 · 8304e3f · 8304e3f
1 parent 1aac901
commit 8304e3f
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/packages/strapi-connector-mongoose/lib/buildQuery.js b/packages/strapi-connector-mongoose/lib/buildQuery.js
@@ -167,7 +167,7 @@ const buildDeepQuery = ({ model, filters, search, populate }) => {
                   $in: ids,
                 },
               },
-              null,
+              null
             )
             .populate(populate);
 
@@ -445,12 +445,14 @@ const buildLookupMatch = ({ assoc, assocModel, filters = {} }) => {
         },
         {
           $match: {
-            $expr: {
-              $and: defaultMatches.concat(
-                { $eq: [`$${assoc.via}.ref`, '$$localId'] },
-                { $eq: [`$${assoc.via}.${assoc.filter}`, assoc.alias] }
-              ),
-            },
+            $and: defaultMatches.concat({
+              $expr: {
+                $and: [
+                  { $eq: [`$${assoc.via}.ref`, '$$localId'] },
+                  { $eq: [`$${assoc.via}.${assoc.filter}`, assoc.alias] },
+                ],
+              },
+            }),
           },
         },
       ];