test and code

Author: oallouch

spec/ParseQuery.spec.js

@@ -4318,6 +4318,40 @@ describe('Parse.Query testing', () => {
     }
   });
 
+  it('deeply nested Pointers (issue #7413)', async function (done) {
+    const parent = new Parse.Object('Parent');
+    const child1 = new Parse.Object('Child');
+    const child2 = new Parse.Object('Child');
+
+    parent.set('subDocument', { child: child1 });
+    parent.set('children', [
+      { child: child1, count: 2 },
+      { child: child2, count: 3 },
+    ]);
+    await parent.save();
+
+    // equalTo
+    const resultsEq = await new Parse.Query('Parent').equalTo('children.child', child1).find();
+    expect(resultsEq.length).toBe(1);
+
+    // direct subDocument equalTo
+    const resultsSubDocument = await new Parse.Query('Parent')
+      .equalTo('subDocument.child', child1)
+      .find();
+    expect(resultsSubDocument.length).toBe(1);
+
+    // subDocument in
+    const resultsSubDocumentIn = await new Parse.Query('Parent')
+      .containedIn('subDocument.child', [child1])
+      .find();
+    expect(resultsSubDocumentIn.length).toBe(1);
+
+    // containedIn
+    const results = await new Parse.Query('Parent').containedIn('children.child', [child1]).find();
+    expect(results.length).toBe(1);
+    done();
+  });
+
   it('include with *', async () => {
     const child1 = new TestObject({ foo: 'bar', name: 'ac' });
     const child2 = new TestObject({ foo: 'baz', name: 'flo' });

src/Adapters/Storage/Mongo/MongoTransform.js

@@ -316,7 +316,7 @@ function transformQueryKeyValue(className, key, value, schema, count = false) {
   }
 
   // Handle query constraints
-  const transformedConstraint = transformConstraint(value, field, count);
+  const transformedConstraint = transformConstraint(value, key, field, count);
   if (transformedConstraint !== CannotTransform) {
     if (transformedConstraint.$text) {
       return { key: '$text', value: transformedConstraint.$text };
@@ -766,19 +766,24 @@ function relativeTimeToDate(text, now = new Date()) {
 // If it is not a valid constraint but it could be a valid something
 // else, return CannotTransform.
 // inArray is whether this is an array field.
-function transformConstraint(constraint, field, count = false) {
-  const inArray = field && field.type && field.type === 'Array';
+function transformConstraint(constraint, restKey, field, count = false) {
   if (typeof constraint !== 'object' || !constraint) {
     return CannotTransform;
   }
-  const transformFunction = inArray ? transformInteriorAtom : transformTopLevelAtom;
+
+  // transformer
+  const inArray = field && field.type && field.type === 'Array';
+  const inSubDocument = restKey.includes('.');
+  const transformFunction =
+    inArray || inSubDocument ? transformInteriorAtom : transformTopLevelAtom;
   const transformer = atom => {
     const result = transformFunction(atom, field);
     if (result === CannotTransform) {
       throw new Parse.Error(Parse.Error.INVALID_JSON, `bad atom: ${JSON.stringify(atom)}`);
     }
     return result;
   };
+
   // keys is the constraints in reverse alphabetical order.
   // This is a hack so that:
   //   $regex is handled before $options