@things-factory/dataset 6.0.80 → 6.0.82

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.80",
+  "version": "6.0.82",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -36,19 +36,19 @@
     "@operato/shell": "^1.0.1",
     "@operato/styles": "^1.0.0",
     "@operato/utils": "^1.0.1",
-    "@things-factory/auth-base": "^6.0.78",
-    "@things-factory/aws-base": "^6.0.78",
-    "@things-factory/board-service": "^6.0.78",
+    "@things-factory/auth-base": "^6.0.82",
+    "@things-factory/aws-base": "^6.0.82",
+    "@things-factory/board-service": "^6.0.82",
     "@things-factory/env": "^6.0.78",
-    "@things-factory/organization": "^6.0.78",
-    "@things-factory/scheduler-client": "^6.0.78",
-    "@things-factory/shell": "^6.0.78",
-    "@things-factory/work-shift": "^6.0.78",
-    "@things-factory/worklist": "^6.0.78",
+    "@things-factory/organization": "^6.0.82",
+    "@things-factory/scheduler-client": "^6.0.82",
+    "@things-factory/shell": "^6.0.82",
+    "@things-factory/work-shift": "^6.0.82",
+    "@things-factory/worklist": "^6.0.82",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "0b02fefdccfc63cbceae281aedb7b0e64e10f337"
+  "gitHead": "6cd2a84db2c9ad8d9e75ecbdfcc53df1b20cf79f"
 }

package/server/controllers/generate-data-summary.ts

@@ -110,13 +110,14 @@ async function getLatestTimesForPeriod(
   const now = moment()
 
   if (periodType == DataSetSummaryPeriodType.Hour) {
-    const begin = now.clone().subtract(1, 'day').startOf('hour').toDate()
-    const end = now.clone().startOf('hour').toDate()
+    const begin = now.clone().subtract(1, 'hour').startOf('hour')
+    const end = now.clone().startOf('hour')
+    const date = begin.clone().tz(domain.timezone)
 
     return {
-      date: moment(begin).tz(domain.timezone).format('YYYY-MM-DD'),
-      period: String(begin.getHours()),
-      range: [begin, end]
+      date: date.format('YYYY-MM-DD'),
+      period: date.format('HH'),
+      range: [begin.toDate(), end.toDate()]
     }
   } else if (periodType == DataSetSummaryPeriodType.WorkShift) {
     const { workDate, workShift, shiftRange } = await getLatestWorkDateAndShift(domain, new Date())
@@ -127,12 +128,13 @@ async function getLatestTimesForPeriod(
 
     return { date: workDate, range: dateRange }
   } else if (periodType == DataSetSummaryPeriodType.Day) {
-    const begin = now.clone().subtract(1, 'day').startOf('day').toDate()
-    const end = now.clone().startOf('day').toDate()
+    const begin = now.clone().subtract(1, 'day').startOf('day')
+    const end = now.clone().startOf('day')
+    const date = begin.clone().tz(domain.timezone)
 
     return {
-      date: moment(begin).tz(domain.timezone).format('YYYY-MM-DD'),
-      range: [begin, end]
+      date: date.format('YYYY-MM-DD'),
+      range: [begin.toDate(), end.toDate()]
     }
   }
 }
@@ -203,14 +205,18 @@ export async function generateLatestDataSummaries(dataSetId: string, context: Re
     do {
       const samples = await getQueryBuilderFromListParams({
         repository: tx.getRepository(DataSample),
+        domain,
         params: {
           filters: [{ name: 'dataSetId', operator: 'eq', value: dataSetId }],
           pagination: { page, limit },
           sortings: [...buildKeySortingList(dataKeyItems), { name: 'collectedAt', desc: true }]
         },
-        domain
+        alias: 'datasample'
       })
-        .andWhere({ collectedAt: Between.call(range) })
+        // The 'Between' operator includes the 'to' time in the filtering, making it unsuitable for the desired use case.
+        // .andWhere({ collectedAt: Between.apply(null, range) })
+        .andWhere('datasample.collectedAt >= :from', { from: range[0] })
+        .andWhere('datasample.collectedAt < :to', { to: range[1] })
         .getMany()
 
       for (const sample of samples) {
@@ -316,11 +322,13 @@ export async function generateDataSummary(
           pagination: { page, limit },
           sortings: [...buildKeySortingList(dataKeyItems), { name: 'collectedAt', desc: true }]
         },
-        domain
+        domain,
+        alias: 'datasample'
       })
-        .andWhere({
-          collectedAt: Between.apply(null, range)
-        })
+        // The 'Between' operator includes the 'to' time in the filtering, making it unsuitable for the desired use case.
+        // .andWhere({ collectedAt: Between.apply(null, range) })
+        .andWhere('datasample.collectedAt >= :from', { from: range[0] })
+        .andWhere('datasample.collectedAt < :to', { to: range[1] })
         .getMany()
 
       for (const sample of samples) {