Merge pull request #162 from identity-com/CIV-2732_bug_fix

BUG FIX: max/min and boolean params
identity-com · Feb 23, 2021 · 6acb8df · 6acb8df
2 parents 984faaf + d0c3513
commit 6acb8df
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/__test__/services/AggregationService.test.js b/__test__/services/AggregationService.test.js
@@ -26,12 +26,36 @@ describe('Aggregation Service', () => {
     expect(result).toStrictEqual([{ k: 'a' }]);
   });
 
+  it('should  return the first elements using boolean', () => {
+    const collection = [{ k: 'a' }, { k: 'b' }, { k: 'c' }];
+    const result = aggregate(collection, [{ $first: true }]);
+    expect(result).toStrictEqual([{ k: 'a' }]);
+  });
+
   it('should  return the last elements only', () => {
     const collection = [{ k: 'a' }, { k: 'b' }, { k: 'c' }];
     const result = aggregate(collection, [{ $last: 'true' }]);
     expect(result).toStrictEqual([{ k: 'c' }]);
   });
 
+  it('should  return the last elements using boolean', () => {
+    const collection = [{ k: 'a' }, { k: 'b' }, { k: 'c' }];
+    const result = aggregate(collection, [{ $last: true }]);
+    expect(result).toStrictEqual([{ k: 'c' }]);
+  });
+
+  it('should  return the max elements only', () => {
+    const collection = [{ k: 'a' }, { k: 'b' }, { k: 'c' }];
+    const result = aggregate(collection, [{ $max: 'k' }]);
+    expect(result).toStrictEqual([{ k: 'c' }]);
+  });
+
+  it('should  return the min elements only', () => {
+    const collection = [{ k: 'a' }, { k: 'b' }, { k: 'c' }];
+    const result = aggregate(collection, [{ $min: 'k' }]);
+    expect(result).toStrictEqual([{ k: 'a' }]);
+  });
+
   it('should  return in ascending order ', () => {
     const collection = [{ k: 'b' }, { k: 'a' }, { k: 'c' }];
     const result = aggregate(collection, [{ $sort: { k: 'ASC' } }]);

diff --git a/src/AggregationHandler.js b/src/AggregationHandler.js
@@ -5,7 +5,7 @@ const validateEmptyParametersOperators = (parameters) => {
   return true;
 };
 const validateNotEmptyParametersOperators = (parameters) => {
-  if (_.isEmpty(parameters)) { throw new Error('parameters should not be empty'); }
+  if (!parameters && _.isEmpty(parameters)) { throw new Error('parameters should not be empty'); }
   return true;
 };
 const validatePathParametersOperators = (parameters) => {
@@ -34,9 +34,9 @@ const AGGREGATION_OPERATORS_MAP = {
   $limit: (collection, params) => (validateNumberParametersOperators(params)
     ? [...(_.slice(collection, 0, params))] : null),
   $min: (collection, params) => (validatePathParametersOperators(params)
-    ? [...(_.minBy(collection, params))] : null),
+    ? [(_.minBy(collection, params))] : null),
   $max: (collection, params) => (validatePathParametersOperators(params)
-    ? [...(_.maxBy(collection, params))] : null),
+    ? [(_.maxBy(collection, params))] : null),
   $first: (collection, params) => (validateNotEmptyParametersOperators(params)
     ? [_.first(collection)] : null),
   $last: (collection, params) => (validateNotEmptyParametersOperators(params)