fix: cast error when there is an elemMatch in the and clause #14171

tosaka-n · 2023-12-11T03:54:05Z

Summary

after this PR is merged
- Island rhythms/gh 13906 handle changing discrim key #13938
Error in cast because options.discriminatorKey is obtained before checking if the schema is null
- here:
  - https://github.com/Automattic/mongoose/pull/13938/files#diff-5078cdf8af89c694947cdcb5e60fcd3e29dda608e62642ecf5fc3eeb97e43ce1R71
Changed to refer to context.schema as well as this PR
- 266804b

Examples
query:

{
  users: {
    $elemMatch: {
      $and: [
        { name: "test" },
        $or: [
          { is_deleted: true },
          { is_deleted: null } 
        ]
      ]
    }
  }
}

satoshun00 · 2023-12-11T04:12:16Z

lib/schema/array.js

@@ -637,15 +637,15 @@ handle.$or = createLogicalQueryOperatorHandler('$or');
 handle.$and = createLogicalQueryOperatorHandler('$and');
 handle.$nor = createLogicalQueryOperatorHandler('$nor');

-function createLogicalQueryOperatorHandler(op) {
-  return function logicalQueryOperatorHandler(val) {
+function createLogicalQueryOperatorHandler(op, context) {


It doesn't seem necessary to take context as an argument in this scope.

vkarpov15

Code is LGTM, but can you please add a test case?

tosaka-n · 2023-12-14T09:58:07Z

test/model.query.casting.test.js

@@ -791,6 +791,38 @@ describe('model query casting', function() {
    assert.ok(res);
    assert.deepStrictEqual(res.map(doc => doc.arr[1].id), ['two', 'three']);
  });
+
+  it('should not throw a cast error when dealing with an array of objects in combination with $elemMatch and nested $and', async function() {


nits: I couldn't think of an appropriate test name, so I'm open to suggestions.

vkarpov15

Thanks 👍

fix: cast error when there is an elemMatch in the and clause

e100129

satoshun00 reviewed Dec 11, 2023

View reviewed changes

remove: unnecessary context

eaf1425

vkarpov15 requested changes Dec 13, 2023

View reviewed changes

add: test for nested $and in $elemMatch

b052e65

tosaka-n force-pushed the featos/fix_cast_and_elemmatch branch from 130dcec to b052e65 Compare December 14, 2023 09:57

tosaka-n commented Dec 14, 2023

View reviewed changes

vkarpov15 approved these changes Dec 21, 2023

View reviewed changes

vkarpov15 added this to the 8.0.4 milestone Dec 21, 2023

vkarpov15 merged commit 1ec00bb into Automattic:master Dec 21, 2023
16 of 18 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: cast error when there is an elemMatch in the and clause #14171

fix: cast error when there is an elemMatch in the and clause #14171

tosaka-n commented Dec 11, 2023

satoshun00 Dec 11, 2023

vkarpov15 left a comment

tosaka-n Dec 14, 2023

vkarpov15 left a comment

fix: cast error when there is an elemMatch in the and clause #14171

fix: cast error when there is an elemMatch in the and clause #14171

Conversation

tosaka-n commented Dec 11, 2023

satoshun00 Dec 11, 2023

Choose a reason for hiding this comment

vkarpov15 left a comment

Choose a reason for hiding this comment

tosaka-n Dec 14, 2023

Choose a reason for hiding this comment

vkarpov15 left a comment

Choose a reason for hiding this comment