@go-mailer/jarvis 4.0.4 → 4.2.0

package/lib/query.js

@@ -2,10 +2,13 @@ const buildQuery = (options) => {
   const sort_condition = options.sort_by ? buildSortOrderString(options.sort_by) : ''
   const fields_to_return = options.return_only ? buildReturnFieldsString(options.return_only) : ''
   const count = options.count || false
-  const group_by = options.group_by || null
   
+  const group_by = options.group_by
+  const sum = options.sum
+  const is_pipeline = group_by || sum
+
   let seek_conditions = {}
-  if (options.bool){
+  if (options.bool) {
     seek_conditions = {
       ...seek_conditions,
       ...buildBooleanQuery(options.bool || '')
@@ -13,7 +16,7 @@ const buildQuery = (options) => {
   }
 
   if (options.exists) {
-    seek_conditions = { 
+    seek_conditions = {
       ...seek_conditions,
       ...buildExistsQuery(options.exists || '')
     }
@@ -30,6 +33,7 @@ const buildQuery = (options) => {
   delete options.population
   delete options.return_only
   delete options.sort_by
+  delete options.sum
 
   Object.keys(options).forEach((field) => {
     const field_value = options[field] ? options[field].toString().toLowerCase() : ''
@@ -49,10 +53,11 @@ const buildQuery = (options) => {
   })
 
   let pipeline = []
-  if (group_by) {
-    pipeline = generateGroupPipeline({
+  if (is_pipeline) {
+    pipeline = generatePipeline({
       count,
       group_by,
+      sum,
       seek_conditions,
       fields_to_return,
       sort_condition
@@ -107,21 +112,21 @@ const buildExistsQuery = (value) => {
 const buildInQuery = (value) => {
   const values = value.split(':')
   return {
-    $in: [...values]
+    $in: [...values].map(val => isNaN(val) ? val : Number(val))
   }
 }
 
 const buildNorQuery = (value) => {
   const values = value.split('!')
   return {
-    $nin: [...values.slice(1)]
+    $nin: [...values.slice(1)].map(val => isNaN(val) ? val : Number(val))
   }
 }
 
 const buildOrQuery = (value) => {
   const values = value.split(',')
   return {
-    $in: [...values]
+    $in: [...values].map(val => isNaN(val) ? val : Number(val))
   }
 }
 
@@ -166,17 +171,14 @@ const determinePagination = (page = 0, population) => {
   return pagination
 }
 
-const generateGroupPipeline = ({ group_by, seek_conditions, sort_condition, fields_to_return, count }) => {
-  if (!group_by || typeof group_by !== 'string') return null
-
+const generatePipeline = ({ group_by, seek_conditions, sort_condition, sum, fields_to_return, count }) => {
   const pipeline = []
-  const group_field = group_by.split(',')[0]
 
   pipeline.push({
     $match: { ...seek_conditions }
   })
-  
-  if (sort_condition){
+
+  if (sort_condition) {
     const sort_options = sort_condition.split(' ').reduce((sac, condition) => {
       let key = condition
       let value = 1
@@ -184,7 +186,7 @@ const generateGroupPipeline = ({ group_by, seek_conditions, sort_condition, fiel
         key = key.split('-')[1]
         value = -1
       }
-      
+
       return { ...sac, [key]: value }
     }, {})
 
@@ -192,27 +194,40 @@ const generateGroupPipeline = ({ group_by, seek_conditions, sort_condition, fiel
       $sort: { ...sort_options }
     })
   }
-  
-  if (fields_to_return){
+
+  if (fields_to_return) {
     const projection_options = fields_to_return.split(' ').reduce((sac, condition) => ({ ...sac, [condition]: 1 }), {})
 
     pipeline.push({
       $project: { ...projection_options }
     })
   }
-  
-  pipeline.push({
-    $group: {
-      _id: { group_field: `$${group_field}`}
-    }
-  })
+
+  if (group_by) {
+    const group_field = group_by.split(',')[0]
+    pipeline.push({
+      $group: {
+        _id: { group_field: `$${group_field}` }
+      }
+    })
+  }
+
+  if (sum) {
+    const sum_field = sum.split(',')[0]
+    pipeline.push({
+      $group: {
+        _id: { tenant_id: "$tenant_id" },
+        [sum_field]: { $sum: `$${sum_field}` }
+      }
+    })
+  }
 
   if (count) {
     pipeline.push({
       $count: "size"
     })
   }
-  
+
   return pipeline
 }
 
@@ -226,5 +241,5 @@ module.exports = {
   buildSortOrderString,
   buildWildcardOptions,
   determinePagination,
-  generateGroupPipeline
+  generatePipeline
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@go-mailer/jarvis",
-  "version": "4.0.4",
+  "version": "4.2.0",
   "main": "index.js",
   "repository": "git@github.com:go-mailer-ltd/jarvis-node.git",
   "author": "Nathan Oguntuberu <nateoguns.work@gmail.com>",