@things-factory/dataset 6.0.115 → 6.0.118

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.115",
+  "version": "6.0.118",
   "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.115",
-    "@things-factory/aws-base": "^6.0.115",
-    "@things-factory/board-service": "^6.0.115",
+    "@things-factory/auth-base": "^6.0.118",
+    "@things-factory/aws-base": "^6.0.118",
+    "@things-factory/board-service": "^6.0.118",
     "@things-factory/env": "^6.0.101",
-    "@things-factory/organization": "^6.0.115",
-    "@things-factory/scheduler-client": "^6.0.115",
-    "@things-factory/shell": "^6.0.115",
-    "@things-factory/work-shift": "^6.0.115",
-    "@things-factory/worklist": "^6.0.115",
+    "@things-factory/organization": "^6.0.118",
+    "@things-factory/scheduler-client": "^6.0.118",
+    "@things-factory/shell": "^6.0.118",
+    "@things-factory/work-shift": "^6.0.118",
+    "@things-factory/worklist": "^6.0.118",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "4937b4fe2040f49d906a4df5cdfced17553b83ef"
+  "gitHead": "1e7ddc3436e494f42a9428443e834b221c7256bb"
 }

package/server/controllers/create-data-sample.ts

@@ -1,4 +1,5 @@
 import moment from 'moment-timezone'
+import { In } from 'typeorm'
 
 import { Role } from '@things-factory/auth-base'
 import { getRedirectSubdomainPath, pubsub } from '@things-factory/shell'
@@ -57,7 +58,7 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
   const { domain, user, tx } = context.state
 
   const dataSet = await tx.getRepository(DataSet).findOne({
-    where: { domain: { id: domain.id }, id: dataSample.dataSet.id },
+    where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSample.dataSet.id },
     relations: ['dataKeySet']
   })
 

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

@@ -2,6 +2,7 @@ const statistics = require('simple-statistics')
 const deepClone = require('lodash/cloneDeep')
 
 import moment from 'moment-timezone'
+import { In } from 'typeorm'
 
 import { Sorting, getQueryBuilderFromListParams } from '@things-factory/shell'
 import { logger } from '@things-factory/env'
@@ -183,7 +184,7 @@ export async function generateLatestDataSummaries(dataSetId: string, context: Re
 
   try {
     const dataSet = await tx.getRepository(DataSet).findOne({
-      where: { domain: { id: domain.id }, id: dataSetId },
+      where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSetId },
       relations: ['dataKeySet']
     })
 
@@ -291,10 +292,12 @@ export async function generateDataSummary(
   const { domain, user, tx } = context.state
 
   try {
-    const dataSet = await tx.getRepository(DataSet).findOne({
-      where: { domain: { id: domain.id }, id: dataSetId },
-      relations: ['dataKeySet']
-    })
+    const dataSet =
+      dataSetId &&
+      (await tx.getRepository(DataSet).findOne({
+        where: { domain: In([domain.id, domain.parentId].filter(Boolean)), id: dataSetId },
+        relations: ['dataKeySet']
+      }))
 
     const dataKeyItems = dataSet.dataKeySet?.dataKeyItems || []
     const dataItems = dataSet.dataItems.filter(item => item.stat)

package/server/controllers/query-data-summary-by-period.ts

@@ -1,9 +1,9 @@
 import moment from 'moment-timezone'
+import { In } from 'typeorm'
 
 import { getQueryBuilderFromListParams, getRepository, ListParam, Sorting } from '@things-factory/shell'
 
 import { DataSet, DataSetSummaryPeriodType } from '../service/data-set/data-set'
-
 import { DataSummary } from '../service/data-summary/data-summary'
 
 const STAT_FUNCTION_MAP = {
@@ -63,7 +63,7 @@ export async function queryDataSummaryByPeriod(
   const { domain, user, tx } = context.state
 
   const dataSet = await getRepository(DataSet).findOne({
-    where: { domain: { id: domain.id }, name: dataSetName },
+    where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, name: dataSetName },
     relations: ['dataKeySet']
   })
 

package/server/routes.ts

@@ -1,3 +1,5 @@
+import { In } from 'typeorm'
+
 import { Domain, getDataSource } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { Activity } from '@things-factory/worklist'
@@ -100,7 +102,9 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
         throw new Error(`domain(${domainId}) not found`)
       }
 
-      const dataSet = await tx.getRepository(DataSet).findOne({ where: { domain: { id: domainId }, id: dataSetId } })
+      const dataSet = await tx
+        .getRepository(DataSet)
+        .findOne({ where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSetId } })
 
       const activity = (await tx.getRepository(Activity).findOneBy({
         domain: { id: domainId },
@@ -165,7 +169,9 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
         throw new Error(`domain(${domainId}) not found`)
       }
 
-      const dataSet = await tx.getRepository(DataSet).findOne({ where: { domain: { id: domainId }, id: dataSetId } })
+      const dataSet = await tx
+        .getRepository(DataSet)
+        .findOne({ where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSetId } })
 
       // do what you gotta do
     })

package/server/service/data-ooc/data-ooc-query.ts

@@ -40,20 +40,20 @@ export class DataOocQuery {
 
   @FieldResolver(type => [DataItem])
   async dataItems(@Root() dataOoc: DataOoc): Promise<DataItem[]> {
-    const dataSetHistory: DataSetHistory = await getRepository(DataSetHistory).findOne({
-      where: {
-        originalId: dataOoc.dataSetId,
-        version: dataOoc.dataSetVersion
-      }
-    })
+    const dataSetHistory: DataSetHistory =
+      dataOoc.dataSetId &&
+      (await getRepository(DataSetHistory).findOne({
+        where: {
+          originalId: dataOoc.dataSetId,
+          version: dataOoc.dataSetVersion
+        }
+      }))
     return dataSetHistory?.dataItems || []
   }
 
   @FieldResolver(type => DataSet)
   async dataSet(@Root() dataOoc: DataOoc): Promise<DataSet> {
-    return await getRepository(DataSet).findOneBy({
-      id: dataOoc.dataSetId
-    })
+    return dataOoc.dataSetId && (await getRepository(DataSet).findOneBy({ id: dataOoc.dataSetId }))
   }
 
   @FieldResolver(type => User)

package/server/service/data-sample/data-sample-query.ts

@@ -1,3 +1,4 @@
+import { In } from 'typeorm'
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
 
 import { User } from '@things-factory/auth-base'
@@ -49,7 +50,7 @@ export class DataSampleQuery {
     const { domain } = context.state
 
     const dataSet = await getRepository(DataSet).findOne({
-      where: { domain: { id: domain.id }, id: dataSetId },
+      where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSetId },
       relations: ['dataKeySet']
     })
 
@@ -105,18 +106,21 @@ export class DataSampleQuery {
 
   @FieldResolver(type => [DataItem])
   async dataItems(@Root() dataSample: DataSample): Promise<DataItem[]> {
-    const dataSetHistory: DataSetHistory = await getRepository(DataSetHistory).findOne({
-      where: {
-        originalId: dataSample.dataSetId,
-        version: dataSample.dataSetVersion
-      }
-    })
+    const dataSetHistory: DataSetHistory =
+      dataSample.dataSetId &&
+      (await getRepository(DataSetHistory).findOne({
+        where: {
+          originalId: dataSample.dataSetId,
+          version: dataSample.dataSetVersion
+        }
+      }))
+
     return dataSetHistory?.dataItems || []
   }
 
   @FieldResolver(type => DataSet)
   async dataSet(@Root() dataSample: DataSample): Promise<DataSet> {
-    return await getRepository(DataSet).findOneBy({ id: dataSample.dataSetId })
+    return dataSample.dataSetId && (await getRepository(DataSet).findOneBy({ id: dataSample.dataSetId }))
   }
 
   @FieldResolver(type => Domain)

package/server/service/data-sensor/data-sensor-query.ts

@@ -36,12 +36,12 @@ export class DataSensorQuery {
 
   @FieldResolver(type => Appliance)
   async appliance(@Root() dataSensor: DataSensor): Promise<Appliance> {
-    return await getRepository(Appliance).findOneBy({ id: dataSensor.applianceId || '' })
+    return dataSensor.applianceId && (await getRepository(Appliance).findOneBy({ id: dataSensor.applianceId }))
   }
 
   @FieldResolver(type => Appliance)
   async dataSet(@Root() dataSensor: DataSensor): Promise<DataSet> {
-    return await getRepository(DataSet).findOneBy({ id: dataSensor.dataSetId || '' })
+    return dataSensor.dataSetId && (await getRepository(DataSet).findOneBy({ id: dataSensor.dataSetId }))
   }
 
   @FieldResolver(type => Domain)

package/server/service/data-set/data-set-mutation.ts

@@ -281,7 +281,7 @@ export class DataSetMutation {
     const originals = await dataSetRepo.find({
       where: {
         id: In(ids),
-        domain: { id: domain.id }
+        domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }
       },
       relations: ['domain', 'supervisoryRole', 'entryRole', 'dataKeySet']
     })

package/server/service/data-summary/data-summary-query.ts

@@ -1,3 +1,4 @@
+import { In } from 'typeorm'
 import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
@@ -56,7 +57,7 @@ export class DataSummaryQuery {
     const { domain } = context.state
 
     const dataSet = await getRepository(DataSet).findOne({
-      where: { domain: { id: domain.id }, name: dataSetName },
+      where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, name: dataSetName },
       relations: ['dataKeySet']
     })
 
@@ -92,7 +93,7 @@ export class DataSummaryQuery {
     const { domain } = context.state
 
     const dataSet = await getRepository(DataSet).findOne({
-      where: { domain: { id: domain.id }, id: dataSetId },
+      where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSetId },
       relations: ['dataKeySet']
     })
 
@@ -148,18 +149,14 @@ export class DataSummaryQuery {
 
   @FieldResolver(type => [DataItem])
   async dataItems(@Root() dataSummary: DataSummary): Promise<DataItem[]> {
-    const dataSet = await getRepository(DataSet).findOne({
-      where: {
-        id: dataSummary.dataSetId
-      }
-    })
+    const dataSet = dataSummary.dataSetId && (await getRepository(DataSet).findOneBy({ id: dataSummary.dataSetId }))
 
     return dataSet?.dataItems || []
   }
 
   @FieldResolver(type => DataSet)
   async dataSet(@Root() dataSummary: DataSummary): Promise<DataSet> {
-    return await getRepository(DataSet).findOneBy({ id: dataSummary.dataSetId })
+    return dataSummary.dataSetId && (await getRepository(DataSet).findOneBy({ id: dataSummary.dataSetId }))
   }
 
   @FieldResolver(type => Domain)