@resolveio/server-lib 22.2.33 → 22.2.35

package/methods/report-builder.js

@@ -314,7 +314,7 @@ function loadReportBuilderMethods(methodManager) {
             }),
             function: function (reportType_1, rootCollectionName_1, rootOptions_1) {
                 return __awaiter(this, arguments, void 0, function (reportType, rootCollectionName, rootOptions, filters, filterArrays, filterArrayFields, selectedFields, customFields, groupsRow, fieldsTotal, fieldsLink, date_field, date_interval, displayType) {
-                    var modelCollection, datePaths, reportBuilderTimezone, lookupAliases, _a, rootFilters_1, lookupFilters_1, additionalCollectionsMap_1, additionalCollections, unionQuery_1, _b, sortToUse, layoutSortAdd, remappedFilters, remappedArrayFilters, postMatchAnd, res_1, err_1, tmpTotals_1, resultsOut, tmpRes_1, query_1, initialQueryMatchCondition_1, sizes_1, divFields_1, queryMatchConditionLookup_1, queryGroup_1, groupedSorts_1, dateFieldPath, dateFieldExpr, utcHourExpr, utcMinuteExpr, utcSecondExpr, utcDayExpr, tzDayExpr, useUtcForDateOnlyExpr, groupingTimezoneExpr, queryProjection_1, _loop_1, i, res_2, err_2, tmpTotals_2, tmpRes;
+                    var modelCollection, datePaths, reportBuilderTimezone, lookupAliases, _a, rootFilters_1, lookupFilters_1, additionalCollectionsMap_1, additionalCollections, unionQuery_1, _b, sortToUse, layoutSortAdd, remappedFilters, remappedArrayFilters, postMatchAnd, readPreference_1, queryResult_1, err_1, tmpRes_1, query_1, initialQueryMatchCondition_1, sizes_1, divFields_1, queryMatchConditionLookup_1, queryGroup_1, groupedSorts_1, dateFieldPath, dateFieldExpr, utcHourExpr, utcMinuteExpr, utcSecondExpr, utcDayExpr, tzDayExpr, useUtcForDateOnlyExpr, groupingTimezoneExpr, queryProjection_1, _loop_1, i, readPreference, queryResult, err_2, tmpRes;
                     if (filters === void 0) { filters = []; }
                     if (filterArrays === void 0) { filterArrays = []; }
                     if (filterArrayFields === void 0) { filterArrayFields = []; }
@@ -387,54 +387,28 @@ function loadReportBuilderMethods(methodManager) {
                                 if (postMatchAnd.length) {
                                     unionQuery_1.push({ $match: { $and: postMatchAnd } });
                                 }
-                                res_1 = null;
+                                readPreference_1 = this.serverConfig['ROOT_URL'] !== 'http://localhost:4200' ? 'secondary' : 'primary';
+                                queryResult_1 = {
+                                    count: 0,
+                                    results: [],
+                                    totals: {}
+                                };
                                 _c.label = 2;
                             case 2:
                                 _c.trys.push([2, 4, , 5]);
-                                return [4 /*yield*/, modelCollection.aggregate(unionQuery_1, { allowDiskUse: true, readPreference: this.serverConfig['ROOT_URL'] !== 'http://localhost:4200' ? 'secondary' : 'primary' }, true)];
+                                return [4 /*yield*/, executeReportBuilderQuery(modelCollection, unionQuery_1, rootOptions, fieldsTotal, selectedFields, customFields, readPreference_1)];
                             case 3:
-                                res_1 = _c.sent();
+                                queryResult_1 = _c.sent();
                                 return [3 /*break*/, 5];
                             case 4:
                                 err_1 = _c.sent();
                                 console.log(err_1);
                                 return [3 /*break*/, 5];
                             case 5:
-                                tmpTotals_1 = {};
-                                if (res_1) {
-                                    fieldsTotal.forEach(function (totField) {
-                                        selectedFields.filter(function (b) { return b.fieldType === 'Number' || b.leafValueType === 'Count'; }).forEach(function (selField) {
-                                            var sum = res_1.map(function (a) {
-                                                var raw = a ? a[selField.id] : null;
-                                                if (Array.isArray(raw)) {
-                                                    return raw
-                                                        .map(function (v) { return (typeof v === 'number' ? v : Number(v)); })
-                                                        .filter(function (v) { return !isNaN(v); })
-                                                        .reduce(function (x, y) { return x + y; }, 0);
-                                                }
-                                                var num = typeof raw === 'number' ? raw : (raw !== null && raw !== undefined ? Number(raw) : 0);
-                                                return isNaN(num) ? 0 : num;
-                                            }).reduce(function (a, b) { return a + b; }, 0);
-                                            if (totField.type === 'sum') {
-                                                tmpTotals_1[totField.id + '_' + selField.id] = sum;
-                                            }
-                                            else if (totField.type === 'avg') {
-                                                tmpTotals_1[totField.id + '_' + selField.id] = res_1.length ? (0, common_1.round)(sum / res_1.length) : 0;
-                                            }
-                                        });
-                                    });
-                                }
-                                resultsOut = res_1 || [];
-                                if (rootOptions.skip) {
-                                    resultsOut = resultsOut.slice(rootOptions.skip);
-                                }
-                                if (rootOptions.limit) {
-                                    resultsOut = resultsOut.slice(0, rootOptions.limit);
-                                }
                                 tmpRes_1 = [{
-                                        count: res_1 ? res_1.length : 0,
-                                        results: resultsOut,
-                                        totals: tmpTotals_1
+                                        count: queryResult_1.count,
+                                        results: queryResult_1.results,
+                                        totals: queryResult_1.totals
                                     }];
                                 return [2 /*return*/, tmpRes_1];
                             case 6:
@@ -1079,44 +1053,28 @@ function loadReportBuilderMethods(methodManager) {
                                     console.log('_____________ query __________');
                                     console.log(JSON.stringify(query_1, null, 2));
                                 }
-                                res_2 = null;
+                                readPreference = this.serverConfig['ROOT_URL'] !== 'http://localhost:4200' ? 'secondary' : 'primary';
+                                queryResult = {
+                                    count: 0,
+                                    results: [],
+                                    totals: {}
+                                };
                                 _c.label = 7;
                             case 7:
                                 _c.trys.push([7, 9, , 10]);
-                                return [4 /*yield*/, modelCollection.aggregate(query_1, { allowDiskUse: true, readPreference: this.serverConfig['ROOT_URL'] !== 'http://localhost:4200' ? 'secondary' : 'primary' }, true)];
+                                return [4 /*yield*/, executeReportBuilderQuery(modelCollection, query_1, rootOptions, fieldsTotal, selectedFields, customFields, readPreference)];
                             case 8:
-                                res_2 = _c.sent();
+                                queryResult = _c.sent();
                                 return [3 /*break*/, 10];
                             case 9:
                                 err_2 = _c.sent();
                                 console.log(err_2);
                                 return [3 /*break*/, 10];
                             case 10:
-                                tmpTotals_2 = {};
-                                if (res_2) {
-                                    fieldsTotal.forEach(function (totField) {
-                                        selectedFields.filter(function (b) { return b.fieldType === 'Number' || b.leafValueType === 'Count'; }).forEach(function (selField) {
-                                            if (totField.type === 'sum') {
-                                                tmpTotals_2[totField.id + '_' + selField.id] = res_2.map(function (a) { return a[totField.id + '_' + selField.id] || 0; }).reduce(function (a, b) { return a + b; }, 0);
-                                            }
-                                            else if (totField.type === 'avg') {
-                                                tmpTotals_2[totField.id + '_' + selField.id] = (0, common_1.round)(res_2.map(function (a) { return a[totField.id + '_' + selField.id] || 0; }).reduce(function (a, b) { return a + b; }, 0) / res_2.length);
-                                            }
-                                        });
-                                        customFields.forEach(function (custField) {
-                                            if (totField.type === 'sum') {
-                                                tmpTotals_2[totField.id + '_' + custField.selFieldId] = res_2.map(function (a) { return a[totField.id + '_' + custField.selFieldId] || 0; }).reduce(function (a, b) { return a + b; }, 0);
-                                            }
-                                            else if (totField.type === 'avg') {
-                                                tmpTotals_2[totField.id + '_' + custField.selFieldId] = (0, common_1.round)(res_2.map(function (a) { return a[totField.id + '_' + custField.selFieldId] || 0; }).reduce(function (a, b) { return a + b; }, 0) / res_2.length);
-                                            }
-                                        });
-                                    });
-                                }
                                 tmpRes = [{
-                                        count: res_2 ? res_2.length : 0,
-                                        results: res_2 ? (rootOptions.limit ? res_2.splice(0, rootOptions.limit) : res_2) : [],
-                                        totals: tmpTotals_2
+                                        count: queryResult.count,
+                                        results: queryResult.results,
+                                        totals: queryResult.totals
                                     }];
                                 return [2 /*return*/, tmpRes];
                         }
@@ -1127,6 +1085,187 @@ function loadReportBuilderMethods(methodManager) {
         }
     });
 }
+function coerceReportBuilderNumeric(value) {
+    if (Array.isArray(value)) {
+        return value.map(function (v) { return coerceReportBuilderNumeric(v); }).reduce(function (a, b) { return a + b; }, 0);
+    }
+    var num = typeof value === 'number' ? value : (value !== null && value !== undefined ? Number(value) : 0);
+    return isNaN(num) ? 0 : num;
+}
+function buildReportBuilderTotalsFieldKeySets(fieldsTotal, selectedFields, customFields) {
+    if (fieldsTotal === void 0) { fieldsTotal = []; }
+    if (selectedFields === void 0) { selectedFields = []; }
+    if (customFields === void 0) { customFields = []; }
+    var numericSelectedFields = selectedFields.filter(function (field) { return (field === null || field === void 0 ? void 0 : field.fieldType) === 'Number' || (field === null || field === void 0 ? void 0 : field.leafValueType) === 'Count'; });
+    var sumKeys = new Set();
+    var avgKeys = new Set();
+    fieldsTotal.forEach(function (totalField) {
+        numericSelectedFields.forEach(function (selectedField) {
+            var key = "".concat(totalField.id, "_").concat(selectedField.id);
+            if (!key) {
+                return;
+            }
+            if (totalField.type === 'sum') {
+                sumKeys.add(key);
+            }
+            else if (totalField.type === 'avg') {
+                avgKeys.add(key);
+            }
+        });
+        customFields.forEach(function (customField) {
+            var customId = customField === null || customField === void 0 ? void 0 : customField.selFieldId;
+            if (!customId) {
+                return;
+            }
+            var key = "".concat(totalField.id, "_").concat(customId);
+            if (totalField.type === 'sum') {
+                sumKeys.add(key);
+            }
+            else if (totalField.type === 'avg') {
+                avgKeys.add(key);
+            }
+        });
+    });
+    return { sumKeys: sumKeys, avgKeys: avgKeys };
+}
+function buildReportBuilderTotalsFromSums(fieldsTotal, selectedFields, customFields, sumValues, count) {
+    if (fieldsTotal === void 0) { fieldsTotal = []; }
+    if (selectedFields === void 0) { selectedFields = []; }
+    if (customFields === void 0) { customFields = []; }
+    if (sumValues === void 0) { sumValues = {}; }
+    if (count === void 0) { count = 0; }
+    var numericSelectedFields = selectedFields.filter(function (field) { return (field === null || field === void 0 ? void 0 : field.fieldType) === 'Number' || (field === null || field === void 0 ? void 0 : field.leafValueType) === 'Count'; });
+    var totals = {};
+    fieldsTotal.forEach(function (totalField) {
+        numericSelectedFields.forEach(function (selectedField) {
+            var key = "".concat(totalField.id, "_").concat(selectedField.id);
+            var sum = coerceReportBuilderNumeric(sumValues[key]);
+            if (totalField.type === 'sum') {
+                totals[key] = sum;
+            }
+            else if (totalField.type === 'avg') {
+                totals[key] = count ? (0, common_1.round)(sum / count) : 0;
+            }
+        });
+        customFields.forEach(function (customField) {
+            var customId = customField === null || customField === void 0 ? void 0 : customField.selFieldId;
+            if (!customId) {
+                return;
+            }
+            var key = "".concat(totalField.id, "_").concat(customId);
+            var sum = coerceReportBuilderNumeric(sumValues[key]);
+            if (totalField.type === 'sum') {
+                totals[key] = sum;
+            }
+            else if (totalField.type === 'avg') {
+                totals[key] = count ? (0, common_1.round)(sum / count) : 0;
+            }
+        });
+    });
+    return totals;
+}
+function buildReportBuilderNumericSumExpr(fieldKey) {
+    var fieldExpr = '$' + fieldKey;
+    return {
+        $cond: [
+            { $isArray: fieldExpr },
+            {
+                $reduce: {
+                    input: fieldExpr,
+                    initialValue: 0,
+                    in: {
+                        $add: [
+                            '$$value',
+                            { $convert: { input: '$$this', to: 'double', onError: 0, onNull: 0 } }
+                        ]
+                    }
+                }
+            },
+            { $convert: { input: fieldExpr, to: 'double', onError: 0, onNull: 0 } }
+        ]
+    };
+}
+function executeReportBuilderQuery(modelCollection_1, query_2, rootOptions_1) {
+    return __awaiter(this, arguments, void 0, function (modelCollection, query, rootOptions, fieldsTotal, selectedFields, customFields, readPreference) {
+        var aggregateOptions, _a, sumKeys, avgKeys, allTotalKeys, resultsFacet, facet, totalsGroup_1, facetedQuery, facetedResult, facetDoc, count, results_1, totalsDoc_1, sumValues_1, totals_1, fullResult, rows, sumValues, results, totals;
+        var _b, _c, _d;
+        if (fieldsTotal === void 0) { fieldsTotal = []; }
+        if (selectedFields === void 0) { selectedFields = []; }
+        if (customFields === void 0) { customFields = []; }
+        if (readPreference === void 0) { readPreference = 'primary'; }
+        return __generator(this, function (_e) {
+            switch (_e.label) {
+                case 0:
+                    aggregateOptions = {
+                        allowDiskUse: true,
+                        readPreference: readPreference
+                    };
+                    _a = buildReportBuilderTotalsFieldKeySets(fieldsTotal, selectedFields, customFields), sumKeys = _a.sumKeys, avgKeys = _a.avgKeys;
+                    allTotalKeys = new Set(__spreadArray(__spreadArray([], __read(sumKeys), false), __read(avgKeys), false));
+                    if (!((rootOptions === null || rootOptions === void 0 ? void 0 : rootOptions.limit) && rootOptions.limit > 0)) return [3 /*break*/, 2];
+                    resultsFacet = [];
+                    if (rootOptions.skip && rootOptions.skip > 0) {
+                        resultsFacet.push({ $skip: rootOptions.skip });
+                    }
+                    resultsFacet.push({ $limit: rootOptions.limit });
+                    facet = {
+                        results: resultsFacet,
+                        count: [{ $count: 'count' }],
+                        totals: []
+                    };
+                    if (allTotalKeys.size) {
+                        totalsGroup_1 = {
+                            _id: null,
+                            __count: { $sum: 1 }
+                        };
+                        Array.from(allTotalKeys).forEach(function (key) {
+                            totalsGroup_1[key] = { $sum: buildReportBuilderNumericSumExpr(key) };
+                        });
+                        facet.totals = [
+                            { $group: totalsGroup_1 }
+                        ];
+                    }
+                    facetedQuery = query.concat([
+                        { $facet: facet }
+                    ]);
+                    return [4 /*yield*/, modelCollection.aggregate(facetedQuery, aggregateOptions, true)];
+                case 1:
+                    facetedResult = _e.sent();
+                    facetDoc = Array.isArray(facetedResult) && facetedResult.length ? facetedResult[0] : {};
+                    count = ((_c = (_b = facetDoc === null || facetDoc === void 0 ? void 0 : facetDoc.count) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.count) || 0;
+                    results_1 = Array.isArray(facetDoc === null || facetDoc === void 0 ? void 0 : facetDoc.results) ? facetDoc.results : [];
+                    totalsDoc_1 = ((_d = facetDoc === null || facetDoc === void 0 ? void 0 : facetDoc.totals) === null || _d === void 0 ? void 0 : _d[0]) || {};
+                    sumValues_1 = {};
+                    Array.from(allTotalKeys).forEach(function (key) {
+                        sumValues_1[key] = coerceReportBuilderNumeric(totalsDoc_1[key]);
+                    });
+                    totals_1 = buildReportBuilderTotalsFromSums(fieldsTotal, selectedFields, customFields, sumValues_1, count);
+                    return [2 /*return*/, { count: count, results: results_1, totals: totals_1 }];
+                case 2: return [4 /*yield*/, modelCollection.aggregate(query, aggregateOptions, true)];
+                case 3:
+                    fullResult = _e.sent();
+                    rows = Array.isArray(fullResult) ? fullResult : [];
+                    sumValues = {};
+                    Array.from(allTotalKeys).forEach(function (key) {
+                        sumValues[key] = rows.map(function (row) { return coerceReportBuilderNumeric(row ? row[key] : 0); }).reduce(function (a, b) { return a + b; }, 0);
+                    });
+                    results = rows;
+                    if ((rootOptions === null || rootOptions === void 0 ? void 0 : rootOptions.skip) && rootOptions.skip > 0) {
+                        results = results.slice(rootOptions.skip);
+                    }
+                    if ((rootOptions === null || rootOptions === void 0 ? void 0 : rootOptions.limit) && rootOptions.limit > 0) {
+                        results = results.slice(0, rootOptions.limit);
+                    }
+                    totals = buildReportBuilderTotalsFromSums(fieldsTotal, selectedFields, customFields, sumValues, rows.length);
+                    return [2 /*return*/, {
+                            count: rows.length,
+                            results: results,
+                            totals: totals
+                        }];
+            }
+        });
+    });
+}
 function buildCollectionTree(collectionName, lookupNode) {
     var _a;
     var lookupSchemaData = (0, schema_report_builder_1.getReportLookupSchemas)(collectionName).sort(function (a, b) { return a.collection_name.localeCompare(b.collection_name); });