Merge branch 'beforeFind-objects' of https://github.com/dblythy/parse-server into beforeFind-fix

Author: EmpiDev

spec/CloudCode.spec.js

@@ -201,6 +201,60 @@ describe('Cloud Code', () => {
       done();
     }
   });
+  it('beforeFind can return object without DB operation', async () => {
+    Parse.Cloud.beforeFind('beforeFind', () => {
+      return new Parse.Object('TestObject', { foo: 'bar' });
+    });
+    Parse.Cloud.afterFind('beforeFind', req => {
+      expect(req.objects).toBeDefined();
+      expect(req.objects[0].get('foo')).toBe('bar');
+    });
+    const newObj = await new Parse.Query('beforeFind').first();
+    expect(newObj.className).toBe('TestObject');
+    expect(newObj.toJSON()).toEqual({ foo: 'bar' });
+    await newObj.save();
+  });
+
+  it('beforeFind can return array of objects without DB operation', async () => {
+    Parse.Cloud.beforeFind('beforeFind', () => {
+      return [new Parse.Object('TestObject', { foo: 'bar' })];
+    });
+    Parse.Cloud.afterFind('beforeFind', req => {
+      expect(req.objects).toBeDefined();
+      expect(req.objects[0].get('foo')).toBe('bar');
+    });
+    const newObj = await new Parse.Query('beforeFind').first();
+    expect(newObj.className).toBe('TestObject');
+    expect(newObj.toJSON()).toEqual({ foo: 'bar' });
+    await newObj.save();
+  });
+
+  it('beforeFind can return object for get query without DB operation', async () => {
+    Parse.Cloud.beforeFind('beforeFind', () => {
+      return [new Parse.Object('TestObject', { foo: 'bar' })];
+    });
+    Parse.Cloud.afterFind('beforeFind', req => {
+      expect(req.objects).toBeDefined();
+      expect(req.objects[0].get('foo')).toBe('bar');
+    });
+    const newObj = await new Parse.Query('beforeFind').get('objId');
+    expect(newObj.className).toBe('TestObject');
+    expect(newObj.toJSON()).toEqual({ foo: 'bar' });
+    await newObj.save();
+  });
+
+  it('beforeFind can return empty array without DB operation', async () => {
+    Parse.Cloud.beforeFind('beforeFind', () => {
+      return [];
+    });
+    Parse.Cloud.afterFind('beforeFind', req => {
+      expect(req.objects.length).toBe(0);
+    });
+    const obj = new Parse.Object('beforeFind');
+    await obj.save();
+    const newObj = await new Parse.Query('beforeFind').first();
+    expect(newObj).toBeUndefined();
+  });
 
   it('beforeFind can return object without DB operation', async () => {
     Parse.Cloud.beforeFind('beforeFind', () => {

src/rest.js

@@ -50,6 +50,7 @@ async function runFindTriggers(
   if (result?.objects) {
     const objects = result.objects;
 
+    // Déclencher le trigger afterFind si des objets sont retournés
     await triggers.maybeRunAfterFindTrigger(
       triggers.Types.afterFind,
       auth,
@@ -65,6 +66,7 @@ async function runFindTriggers(
     };
   }
 
+  // Conserver la distinction entre get et find
   const query = await RestQuery({
     method: isGet ? RestQuery.Method.get : RestQuery.Method.find,
     config,
@@ -79,6 +81,7 @@ async function runFindTriggers(
   return query.execute();
 }
 
+// Returns a promise for an object with optional keys 'results' and 'count'.
 const find = async (config, auth, className, restWhere, restOptions, clientSDK, context) => {
   enforceRoleSecurity('find', className, auth);
   return runFindTriggers(
@@ -93,6 +96,7 @@ const find = async (config, auth, className, restWhere, restOptions, clientSDK,
   );
 };
 
+// get is just like find but only queries an objectId.
 const get = async (config, auth, className, objectId, restOptions, clientSDK, context) => {
   enforceRoleSecurity('get', className, auth);
   return runFindTriggers(
@@ -107,6 +111,7 @@ const get = async (config, auth, className, objectId, restOptions, clientSDK, co
   );
 };
 
+// Returns a promise that doesn't resolve to any useful value.
 function del(config, auth, className, objectId, context) {
   if (typeof objectId !== 'string') {
     throw new Parse.Error(Parse.Error.INVALID_JSON, 'bad objectId');