Merge branch 'alpha' into fix-merge#7661

Author: FransGH

.github/workflows/ci.yml

@@ -72,12 +72,21 @@ jobs:
        - run: npm run madge:circular
   check-docker:
     name: Docker Build
-    timeout-minutes: 5
+    timeout-minutes: 15
     runs-on: ubuntu-18.04
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        id: qemu
+        uses: docker/setup-qemu-action@v1
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       - name: Build docker image
         uses: docker/build-push-action@v2
+        with:
+          context: .
+          platforms: linux/amd64
   check-lock-file-version:
     name: NPM Lock File Version
     timeout-minutes: 5

.github/workflows/release-automated.yml

@@ -78,7 +78,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: .
-          platforms: linux/amd64
+          platforms: linux/amd64, linux/arm/v6, linux/arm/v7, linux/arm64/v8
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

Dockerfile

@@ -1,20 +1,30 @@
+############################################################
 # Build stage
+############################################################
 FROM node:lts-alpine as build
 
 RUN apk update; \
   apk add git;
 WORKDIR /tmp
+
+# Copy package.json first to benefit from layer caching
 COPY package*.json ./
 
-# Copy local dependencies for CI tests
-COPY spec/dependencies spec/dependencies
+# Copy src to have config files for install
+COPY . .
 
+# Clean npm cache; added to fix an issue with the install process
 RUN npm cache clean --force
+
+# Install all dependencies
 RUN npm ci
-COPY . .
+
+# Run build steps
 RUN npm run build
 
+############################################################
 # Release stage
+############################################################
 FROM node:lts-alpine as release
 
 RUN apk update; \
@@ -26,6 +36,7 @@ WORKDIR /parse-server
 
 COPY package*.json ./
 
+# Clean npm cache; added to fix an issue with the install process
 RUN npm cache clean --force
 RUN npm ci --production --ignore-scripts
 

changelogs/CHANGELOG_alpha.md

@@ -1,3 +1,10 @@
+# [5.0.0-alpha.3](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.2...5.0.0-alpha.3) (2021-10-29)
+
+
+### Bug Fixes
+
+* combined `and` query with relational query condition returns incorrect results ([#7593](https://github.com/parse-community/parse-server/issues/7593)) ([174886e](https://github.com/parse-community/parse-server/commit/174886e385e091c6bbd4a84891ef95f80b50d05c))
+
 # [5.0.0-alpha.2](https://github.com/parse-community/parse-server/compare/5.0.0-alpha.1...5.0.0-alpha.2) (2021-10-27)
 
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "parse-server",
-  "version": "5.0.0-alpha.2",
+  "version": "5.0.0-alpha.3",
   "description": "An express module providing a Parse-compatible API server",
   "main": "lib/index.js",
   "repository": {

package.json

@@ -3524,4 +3524,23 @@ describe('sendEmail', () => {
       'Failed to send email because no mail adapter is configured for Parse Server.'
     );
   });
+
+  it('should have object found with nested relational data query', async () => {
+    const obj1 = Parse.Object.extend('TestObject');
+    const obj2 = Parse.Object.extend('TestObject2');
+    let item2 = new obj2();
+    item2 = await item2.save();
+    let item1 = new obj1();
+    const relation = item1.relation('rel');
+    relation.add(item2);
+    item1 = await item1.save();
+    Parse.Cloud.beforeFind('TestObject', req => {
+      const additionalQ = new Parse.Query('TestObject');
+      additionalQ.equalTo('rel', item2);
+      return Parse.Query.and(req.query, additionalQ);
+    });
+    const q = new Parse.Query('TestObject');
+    const res = await q.first();
+    expect(res.id).toEqual(item1.id);
+  });
 });

spec/CloudCode.spec.js

@@ -971,6 +971,18 @@ class DatabaseController {
         return Promise.resolve(query);
       });
     }
+    if (query['$and']) {
+      const ors = query['$and'];
+      return Promise.all(
+        ors.map((aQuery, index) => {
+          return this.reduceInRelation(className, aQuery, schema).then(aQuery => {
+            query['$and'][index] = aQuery;
+          });
+        })
+      ).then(() => {
+        return Promise.resolve(query);
+      });
+    }
 
     const promises = Object.keys(query).map(key => {
       const t = schema.getExpectedType(className, key);
@@ -1049,7 +1061,13 @@ class DatabaseController {
         })
       );
     }
-
+    if (query['$and']) {
+      return Promise.all(
+        query['$and'].map(aQuery => {
+          return this.reduceRelationKeys(className, aQuery, queryOptions);
+        })
+      );
+    }
     var relatedTo = query['$relatedTo'];
     if (relatedTo) {
       return this.relatedIds(