@resolveio/server-lib 20.12.63 → 20.12.65

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -276,7 +276,7 @@ function loadReportBuilderMethods(methodManager) {
276
276
  }),
277
277
  function: function (reportType_1, rootCollectionName_1, rootOptions_1) {
278
278
  return __awaiter(this, arguments, void 0, function (reportType, rootCollectionName, rootOptions, filters, filterArrays, filterArrayFields, selectedFields, customFields, groupsRow, fieldsTotal, fieldsLink, date_field, date_interval, displayType) {
279
- var modelCollection, datePaths, 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, queryProjection_1, _loop_1, i, res_2, err_2, tmpTotals_2, tmpRes;
279
+ var modelCollection, datePaths, serverConfig, clientName, 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, queryProjection_1, _loop_1, i, res_2, err_2, tmpTotals_2, tmpRes;
280
280
  if (filters === void 0) { filters = []; }
281
281
  if (filterArrays === void 0) { filterArrays = []; }
282
282
  if (filterArrayFields === void 0) { filterArrayFields = []; }
@@ -302,6 +302,12 @@ function loadReportBuilderMethods(methodManager) {
302
302
  coerceDateFilters(filters, datePaths);
303
303
  coerceDateFilters(filterArrays, datePaths);
304
304
  }
305
+ serverConfig = resolveio_server_app_1.ResolveIOServer.getServerConfig();
306
+ clientName = (serverConfig === null || serverConfig === void 0 ? void 0 : serverConfig.CLIENT_NAME) || resolveio_server_app_1.ResolveIOServer.getClientName();
307
+ reportBuilderTimezone = process.env.REPORT_BUILDER_TZ
308
+ || ((typeof clientName === 'string' && clientName.toLowerCase() === 'geochem')
309
+ ? 'UTC'
310
+ : (process.env.TZ_CLIENT || 'America/Chicago'));
305
311
  lookupAliases = collectLookupAliases(selectedFields, filterArrayFields, groupsRow);
306
312
  _a = splitFiltersByLookup(filters, lookupAliases), rootFilters_1 = _a.rootFilters, lookupFilters_1 = _a.lookupFilters;
307
313
  additionalCollectionsMap_1 = new Map();
@@ -728,45 +734,45 @@ function loadReportBuilderMethods(methodManager) {
728
734
  dateFieldPath = (typeof date_field === 'string') ? date_field.replace(/\.\$/g, '') : '';
729
735
  if (dateFieldPath) {
730
736
  if (date_interval === 'Seconds') {
731
- queryGroup_1._id['second'] = { '$second': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
732
- queryGroup_1._id['minute'] = { '$minute': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
733
- queryGroup_1._id['hour'] = { '$hour': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
734
- queryGroup_1._id['day'] = { '$dayOfMonth': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
735
- queryGroup_1._id['month'] = { '$month': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
736
- queryGroup_1._id['year'] = { '$year': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
737
+ queryGroup_1._id['second'] = { '$second': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
738
+ queryGroup_1._id['minute'] = { '$minute': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
739
+ queryGroup_1._id['hour'] = { '$hour': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
740
+ queryGroup_1._id['day'] = { '$dayOfMonth': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
741
+ queryGroup_1._id['month'] = { '$month': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
742
+ queryGroup_1._id['year'] = { '$year': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
737
743
  }
738
744
  else if (date_interval === 'Minutes') {
739
- queryGroup_1._id['minute'] = { '$minute': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
740
- queryGroup_1._id['hour'] = { '$hour': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
741
- queryGroup_1._id['day'] = { '$dayOfMonth': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
742
- queryGroup_1._id['month'] = { '$month': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
743
- queryGroup_1._id['year'] = { '$year': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
745
+ queryGroup_1._id['minute'] = { '$minute': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
746
+ queryGroup_1._id['hour'] = { '$hour': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
747
+ queryGroup_1._id['day'] = { '$dayOfMonth': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
748
+ queryGroup_1._id['month'] = { '$month': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
749
+ queryGroup_1._id['year'] = { '$year': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
744
750
  }
745
751
  else if (date_interval === 'Hours') {
746
- queryGroup_1._id['hour'] = { '$hour': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
747
- queryGroup_1._id['day'] = { '$dayOfMonth': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
748
- queryGroup_1._id['month'] = { '$month': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
749
- queryGroup_1._id['year'] = { '$year': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
752
+ queryGroup_1._id['hour'] = { '$hour': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
753
+ queryGroup_1._id['day'] = { '$dayOfMonth': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
754
+ queryGroup_1._id['month'] = { '$month': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
755
+ queryGroup_1._id['year'] = { '$year': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
750
756
  }
751
757
  else if (date_interval === 'Daily') {
752
- queryGroup_1._id['day'] = { '$dayOfMonth': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
753
- queryGroup_1._id['month'] = { '$month': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
754
- queryGroup_1._id['year'] = { '$year': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
758
+ queryGroup_1._id['day'] = { '$dayOfMonth': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
759
+ queryGroup_1._id['month'] = { '$month': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
760
+ queryGroup_1._id['year'] = { '$year': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
755
761
  }
756
762
  else if (date_interval === 'Weekly') {
757
- queryGroup_1._id['week'] = { '$isoWeek': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
758
- queryGroup_1._id['year'] = { '$isoWeekYear': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
763
+ queryGroup_1._id['week'] = { '$isoWeek': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
764
+ queryGroup_1._id['year'] = { '$isoWeekYear': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
759
765
  }
760
766
  else if (date_interval === 'Monthly') {
761
- queryGroup_1._id['month'] = { '$month': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
762
- queryGroup_1._id['year'] = { '$year': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
767
+ queryGroup_1._id['month'] = { '$month': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
768
+ queryGroup_1._id['year'] = { '$year': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
763
769
  }
764
770
  else if (date_interval === 'Quarterly') {
765
- queryGroup_1._id['month'] = { '$month': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
766
- queryGroup_1._id['year'] = { '$year': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
771
+ queryGroup_1._id['month'] = { '$month': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
772
+ queryGroup_1._id['year'] = { '$year': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
767
773
  }
768
774
  else if (date_interval === 'Yearly') {
769
- queryGroup_1._id['year'] = { '$year': { 'date': '$' + dateFieldPath, 'timezone': process.env.TZ_CLIENT || 'America/Chicago' } };
775
+ queryGroup_1._id['year'] = { '$year': { 'date': '$' + dateFieldPath, 'timezone': reportBuilderTimezone } };
770
776
  }
771
777
  }
772
778
  }