@things-factory/dataset 5.0.0-alpha.14 → 5.0.0-alpha.18

package/dist-server/service/data-set/data-set.js

@@ -11,10 +11,10 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var _a, _b, _c, _d, _e;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataSet = void 0;
-const typeorm_1 = require("typeorm");
-const shell_1 = require("@things-factory/shell");
 const type_graphql_1 = require("type-graphql");
+const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
+const shell_1 = require("@things-factory/shell");
 const data_item_1 = require("../data-item/data-item");
 let DataSet = class DataSet {
 };
@@ -55,7 +55,7 @@ __decorate([
     (0, typeorm_1.ManyToOne)(type => auth_base_1.Role, {
         nullable: true
     }),
-    (0, type_graphql_1.Field)({ nullable: true }),
+    (0, type_graphql_1.Field)(type => auth_base_1.Role, { nullable: true }),
     __metadata("design:type", typeof (_b = typeof auth_base_1.Role !== "undefined" && auth_base_1.Role) === "function" ? _b : Object)
 ], DataSet.prototype, "supervisoryRole", void 0);
 __decorate([

package/dist-server/service/data-set/data-set.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-set.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-set.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "5.0.0-alpha.14",
+  "version": "5.0.0-alpha.18",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,19 +24,19 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@operato/app": "1.0.0-alpha.34",
-    "@operato/data-grist": "1.0.0-alpha.34",
-    "@operato/dataset": "1.0.0-alpha.34",
-    "@operato/graphql": "1.0.0-alpha.34",
-    "@operato/i18n": "1.0.0-alpha.34",
-    "@operato/layout": "1.0.0-alpha.34",
-    "@operato/shell": "1.0.0-alpha.34",
-    "@operato/styles": "1.0.0-alpha.34",
-    "@operato/utils": "1.0.0-alpha.34",
-    "@things-factory/auth-base": "^5.0.0-alpha.14",
-    "@things-factory/env": "^5.0.0-alpha.14",
-    "@things-factory/shell": "^5.0.0-alpha.14",
+    "@operato/app": "1.0.0-alpha.37",
+    "@operato/data-grist": "1.0.0-alpha.37",
+    "@operato/dataset": "1.0.0-alpha.37",
+    "@operato/graphql": "1.0.0-alpha.37",
+    "@operato/i18n": "1.0.0-alpha.37",
+    "@operato/layout": "1.0.0-alpha.37",
+    "@operato/shell": "1.0.0-alpha.37",
+    "@operato/styles": "1.0.0-alpha.37",
+    "@operato/utils": "1.0.0-alpha.37",
+    "@things-factory/auth-base": "^5.0.0-alpha.18",
+    "@things-factory/env": "^5.0.0-alpha.18",
+    "@things-factory/shell": "^5.0.0-alpha.18",
     "moment": "^2.29.1"
   },
-  "gitHead": "e64e66b147eca1d3219fed7d9764fe2a221a5569"
+  "gitHead": "724366d140177b67a583e21d43a4bc6e25ada3e8"
 }

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

@@ -0,0 +1,142 @@
+import moment from 'moment'
+import { EntityManager } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { Domain, getRedirectSubdomainPath, pubsub } from '@things-factory/shell'
+
+import { DataItem } from '../service/data-item/data-item'
+import { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'
+import { DataSample } from '../service/data-sample/data-sample'
+import { NewDataSample } from '../service/data-sample/data-sample-type'
+import { DataSet } from '../service/data-set/data-set'
+import { DataUseCase } from './data-use-case'
+
+const debug = require('debug')('things-factory:dataset:controller/save-data-sample')
+
+// parse variable javascript string pattern
+const replaceVariables = (keys, dic) => {
+  for (const k in keys) {
+    const matches = keys[k].match(/\$\{\w*\}/g)
+    matches &&
+      matches.forEach(m => {
+        keys[k] = keys[k].replace(m, dic[m.slice(2, -1)])
+      })
+  }
+  return keys
+}
+
+// It is required UTC date for Partitioning File System like AWS S3 from Athena.
+// ex) %YYYY, %MM, %DD
+const formatDate = (keys, _moment) => {
+  for (const k in keys) {
+    const matches = keys[k].match(/%\w*/g)
+    matches &&
+      matches.forEach(m => {
+        keys[k] = keys[k].replace(m, _moment.format(m.substr(1)))
+      })
+  }
+  return keys
+}
+
+export async function createDataSample(
+  dataSample: NewDataSample,
+  context: {
+    state: {
+      domain: Domain
+      user: User
+      tx: EntityManager
+    }
+  }
+): Promise<DataSample> {
+  const { domain, user, tx } = context.state
+
+  const dataSet = await tx.getRepository(DataSet).findOne({
+    where: { id: dataSample.dataSet.id }
+  })
+
+  const dataItems = await tx.getRepository(DataItem).find({
+    where: {
+      domain,
+      dataSet
+    },
+    order: {
+      sequence: 'DESC'
+    }
+  })
+
+  const spec = dataItems.reduce((spec, dataItem) => {
+    spec[dataItem.tag] = {
+      ...dataItem.spec,
+      name: dataItem.name /* do we need ? */
+    }
+
+    return spec
+  }, {})
+
+  var partitionKeys = {
+    ...dataSet.partitionKeys
+  }
+
+  const collectedAt = dataSample.collectedAt || new Date()
+  partitionKeys = formatDate(partitionKeys, moment(collectedAt).utc())
+  partitionKeys = replaceVariables(partitionKeys, {
+    domain: domain.subdomain,
+    dataSetId: dataSample.dataSet.id,
+    ...dataSample.data
+  })
+
+  const { ooc, oos } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}
+
+  const result = await tx.getRepository(DataSample).save({
+    name: dataSet.name,
+    description: dataSet.description,
+    ...dataSample,
+    domain,
+    partitionKeys,
+    spec,
+    ooc,
+    oos,
+    collectedAt,
+    creator: user,
+    updater: user
+  })
+
+  if (ooc || oos) {
+    const dataOoc = await tx.getRepository(DataOoc).save({
+      name: dataSet.name,
+      description: dataSet.description,
+      dataSet,
+      dataSample: result,
+      data: dataSample.data,
+      domain,
+      partitionKeys,
+      spec,
+      ooc,
+      oos,
+      state: DataOocStatus.CREATED,
+      collectedAt,
+      creator: user,
+      updater: user
+    })
+
+    debug('dataOoc is about to publish...', dataOoc)
+
+    pubsub.publish('data-ooc', {
+      dataOoc,
+      supervisoryRoleId: dataSet.supervisoryRoleId
+    })
+
+    pubsub.publish('notification', {
+      notification: {
+        domain,
+        type: 'error',
+        title: `Data OOC occurred on '${dataSet.name}'`,
+        body: `Data OOC occurred on '${dataSet.name}'`,
+        url: getRedirectSubdomainPath(context, domain.subdomain, `/data-ooc/${dataOoc.id}`),
+        timestamp: collectedAt
+      }
+    })
+  }
+
+  return result
+}

package/server/controllers/data-use-case.ts

@@ -43,12 +43,12 @@ export abstract class DataUseCase {
 
     for (let i = 0; i < dataItems.length; i++) {
       const dataItem = dataItems[i]
-      const { name, active } = dataItem
-      if (!active) {
+      const { active, tag } = dataItem
+      if (!active || !tag) {
         continue
       }
 
-      let values: any | any[] = data[name]
+      let values: any | any[] = data[tag]
       if (typeof values === 'undefined') {
         continue // TODO what if in case no value ?
       }

package/server/routes.ts

@@ -1,7 +1,8 @@
-import { getConnection } from 'typeorm'
+import { getConnection, getRepository } from 'typeorm'
 
-import { DataSample } from './service'
-import { DataItem } from './service/data-item/data-item'
+import { User } from '@things-factory/auth-base'
+
+import { createDataSample } from './controllers/create-data-sample'
 import { DataSensor } from './service/data-sensor/data-sensor'
 
 const debug = require('debug')('things-factory:dataset:routes')
@@ -47,41 +48,26 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
 
       const domain = sensor.domain
       const dataSet = sensor.dataSet
-      const user = sensor.appliance
-
-      const dataItems = await tx.getRepository(DataItem).find({
+      const user: User = await getRepository(User).findOne({
         where: {
-          domain,
-          dataSet
-        },
-        order: {
-          sequence: 'DESC'
+          reference: sensor.appliance.id,
+          userType: 'appliance'
         }
       })
 
-      var spec = {} as any
-
-      dataItems.forEach(dataItem => {
-        spec[dataItem.name] = dataItem.spec
-      })
-
-      await tx.getRepository(DataSample).save({
-        domain,
-        name: dataSet.name,
-        description: dataSet.description,
-        partitionKeys: dataSet.partitionKeys,
-        dataSet,
-        data,
-        rawData,
-        spec,
-        source: deviceId,
-        collectedAt: new Date(timestamp),
-        creator: user,
-        updater: user
-      })
+      return await createDataSample(
+        {
+          dataSet,
+          data,
+          rawData,
+          source: deviceId,
+          collectedAt: new Date(timestamp)
+        },
+        { state: { domain, user, tx } }
+      )
     })
 
-    return 'OK'
+    context.status = 200
   })
 })
 

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

@@ -1,7 +1,11 @@
-import { Resolver, Query, FieldResolver, Root, Args, Arg, Ctx, Directive } from 'type-graphql'
+import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
 import { getRepository } from 'typeorm'
-import { Domain, ListParam, convertListParams } from '@things-factory/shell'
+
 import { User } from '@things-factory/auth-base'
+import { convertListParams, Domain, ListParam } from '@things-factory/shell'
+
+import { DataSample } from '../data-sample/data-sample'
+import { DataSet } from '../data-set/data-set'
 import { DataOoc } from './data-ooc'
 import { DataOocList } from './data-ooc-type'
 
@@ -28,6 +32,20 @@ export class DataOocQuery {
     return { items, total }
   }
 
+  @FieldResolver(type => DataSet)
+  async dataSet(@Root() dataOoc: DataOoc): Promise<DataSet> {
+    return await getRepository(DataSet).findOne({
+      id: dataOoc.dataSetId
+    })
+  }
+
+  @FieldResolver(type => DataSample)
+  async dataSample(@Root() dataOoc: DataOoc): Promise<DataSample> {
+    return await getRepository(DataSample).findOne({
+      id: dataOoc.dataSampleId
+    })
+  }
+
   @FieldResolver(type => Domain)
   async domain(@Root() dataOoc: DataOoc): Promise<Domain> {
     return await getRepository(Domain).findOne(dataOoc.domainId)

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

@@ -0,0 +1,51 @@
+import { Resolver, Subscription, Root } from 'type-graphql'
+import { withFilter } from 'graphql-subscriptions'
+import { pubsub } from '@things-factory/shell'
+import { User } from '@things-factory/auth-base'
+import { DataOoc } from './data-ooc'
+import { getRepository } from 'typeorm'
+
+const debug = require('debug')('things-factory:dataset:data-ooc-subscription')
+
+@Resolver(DataOoc)
+export class DataOocSubscription {
+  @Subscription({
+    subscribe: (_, args, context, info) => {
+      const { domain, user } = context.state
+      const subdomain = domain?.subdomain
+
+      debug('subscribe', subdomain)
+
+      if (!domain) {
+        throw new Error('domain required')
+      }
+
+      if (!user.domains?.find(d => d.subdomain === subdomain)) {
+        throw new Error(`domain(${subdomain}) is not working for user(${user.email}).`)
+      }
+
+      return withFilter(
+        () => pubsub.asyncIterator('data-ooc'),
+        async (payload, variables, context, info) => {
+          const { dataOoc, supervisoryRoleId } = payload
+          const { domain } = dataOoc
+
+          if (subdomain !== domain?.subdomain) {
+            return false
+          }
+
+          // check if the user has that role
+          const userWithRoles: User = await getRepository(User).findOne({
+            where: { id: user.id },
+            relations: ['roles']
+          })
+
+          return userWithRoles.roles.find(role => role.id === supervisoryRoleId)
+        }
+      )(_, args, context, info)
+    }
+  })
+  dataOoc(@Root() payload: { dataOoc: DataOoc; supervisoryRoleId: string }): DataOoc {
+    return payload.dataOoc
+  }
+}

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

@@ -1,6 +1,7 @@
 import { DataOoc } from './data-ooc'
 import { DataOocMutation } from './data-ooc-mutation'
 import { DataOocQuery } from './data-ooc-query'
+import { DataOocSubscription } from './data-ooc-subscription'
 
 export const entities = [DataOoc]
-export const resolvers = [DataOocQuery, DataOocMutation]
+export const resolvers = [DataOocQuery, DataOocMutation, DataOocSubscription]

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

@@ -1,121 +1,18 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 
-import { DataItem } from '../data-item/data-item'
-import { DataSet } from '../data-set/data-set'
 import { DataSample } from './data-sample'
 import { NewDataSample } from './data-sample-type'
 
-import moment from 'moment'
-import { DataUseCase } from '../../controllers'
-import { DataOoc, DataOocStatus } from '../data-ooc/data-ooc'
+import { createDataSample } from '../../controllers/create-data-sample'
 
 const debug = require('debug')('things-factory:dataset:data-sample:data-sample-mutation')
 
-// parse variable javascript string pattern
-const replaceVariables = (keys, dic) => {
-  for (const k in keys) {
-    const matches = keys[k].match(/\$\{\w*\}/g)
-    matches &&
-      matches.forEach(m => {
-        keys[k] = keys[k].replace(m, dic[m.slice(2, -1)])
-      })
-  }
-  return keys
-}
-
-// It is required UTC date for Partitioning File System like AWS S3 from Athena.
-// ex) %YYYY, %MM, %DD
-const formatDate = (keys, _moment) => {
-  for (const k in keys) {
-    const matches = keys[k].match(/%\w*/g)
-    matches &&
-      matches.forEach(m => {
-        keys[k] = keys[k].replace(m, _moment.format(m.substr(1)))
-      })
-  }
-  return keys
-}
-
 @Resolver(DataSample)
 export class DataSampleMutation {
   @Directive('@privilege(category: "data-sample", privilege: "mutation", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Mutation(returns => DataSample, { description: 'To create new data sample' })
   async createDataSample(@Arg('dataSample') dataSample: NewDataSample, @Ctx() context: any): Promise<DataSample> {
-    const { domain, user, tx } = context.state
-
-    const dataSet = await tx.getRepository(DataSet).findOne({
-      where: { id: dataSample.dataSet.id }
-    })
-    const dataItems = await tx.getRepository(DataItem).find({
-      where: {
-        domain,
-        dataSet
-      },
-      order: {
-        sequence: 'DESC'
-      }
-    })
-
-    const spec = dataItems.reduce((spec, dataItem) => {
-      spec[dataItem.tag] = {
-        ...dataItem.spec,
-        name: dataItem.name /* do we need ? */
-      }
-
-      return spec
-    }, {})
-
-    // appending spec to data for reporting and optimizing AWS Athena search
-    dataSample.data = { ...dataSample.data, _spec: JSON.stringify(spec) }
-
-    var partitionKeys = {
-      ...dataSet.partitionKeys
-    }
-
-    const collectedAt = dataSample.collectedAt || new Date()
-    partitionKeys = formatDate(partitionKeys, moment(collectedAt).utc())
-    partitionKeys = replaceVariables(partitionKeys, {
-      domain: domain.subdomain,
-      dataSetId: dataSample.dataSet.id,
-      ...dataSample.data
-    })
-
-    const { ooc, oos } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}
-
-    const result = await tx.getRepository(DataSample).save({
-      name: dataSet.name,
-      description: dataSet.description,
-      ...dataSample,
-      domain,
-      partitionKeys,
-      spec,
-      ooc,
-      oos,
-      collectedAt,
-      creator: user,
-      updater: user
-    })
-
-    if (ooc || oos) {
-      await tx.getRepository(DataOoc).save({
-        name: dataSet.name,
-        description: dataSet.description,
-        dataSet,
-        dataSample: result,
-        data: dataSample.data,
-        domain,
-        partitionKeys,
-        spec,
-        ooc,
-        oos,
-        state: DataOocStatus.CREATED,
-        collectedAt,
-        creator: user,
-        updater: user
-      })
-    }
-
-    return result
+    return await createDataSample(dataSample, context)
   }
 }

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

@@ -1,3 +1,4 @@
+import { Field, ID, ObjectType } from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -8,12 +9,12 @@ import {
   RelationId,
   UpdateDateColumn
 } from 'typeorm'
-import { Domain, ScalarObject } from '@things-factory/shell'
-import { Field, ID, ObjectType } from 'type-graphql'
 
-import { DataSet } from '../data-set/data-set'
 import { User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
+import { Domain, ScalarObject } from '@things-factory/shell'
+
+import { DataSet } from '../data-set/data-set'
 
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type

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

@@ -1,7 +1,7 @@
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
 import { getRepository } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { Role, User } from '@things-factory/auth-base'
 import { convertListParams, Domain, ListParam } from '@things-factory/shell'
 
 import { DataItem } from '../data-item/data-item'
@@ -38,6 +38,13 @@ export class DataSetQuery {
     })
   }
 
+  @FieldResolver(type => Role)
+  async supervisoryRole(@Root() dataSet: DataSet): Promise<Role> {
+    return await getRepository(Role).findOne({
+      id: dataSet.supervisoryRoleId
+    })
+  }
+
   @FieldResolver(type => Domain)
   async domain(@Root() dataSet: DataSet): Promise<Domain> {
     return await getRepository(Domain).findOne(dataSet.domainId)

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

@@ -1,3 +1,4 @@
+import { Field, ID, ObjectType } from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -9,9 +10,9 @@ import {
   RelationId,
   UpdateDateColumn
 } from 'typeorm'
-import { Domain, ScalarObject } from '@things-factory/shell'
-import { Field, ID, ObjectType } from 'type-graphql'
+
 import { Role, User } from '@things-factory/auth-base'
+import { Domain, ScalarObject } from '@things-factory/shell'
 
 import { DataItem } from '../data-item/data-item'
 
@@ -49,7 +50,7 @@ export class DataSet {
   @ManyToOne(type => Role, {
     nullable: true
   })
-  @Field({ nullable: true })
+  @Field(type => Role, { nullable: true })
   supervisoryRole?: Role
 
   @RelationId((dataSet: DataSet) => dataSet.supervisoryRole)

package/translations/en.json

@@ -26,7 +26,8 @@
   "text.data sample created successfully": "a data sample created successfully",
   "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
+  "title.data-ooc list": "data OOC list",
   "title.data-sample list": "data sample list",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list"
-}
+}

package/translations/ko.json

@@ -26,7 +26,8 @@
   "text.data sample created successfully": "데이타 샘플이 성공적으로 생성되었습니다",
   "title.data-entry-form": "데이타 입력",
   "title.data-item list": "데이타 아이템 조회",
+  "title.data-ooc list": "데이타 이탈점 조회",
   "title.data-sample list": "데이타 샘플 조회",
   "title.data-sensor list": "데이타 센서 조회",
   "title.data-set list": "데이타 셋 조회"
-}
+}

package/translations/ms.json

@@ -18,7 +18,7 @@
   "field.ref-by": "ref. by",
   "field.serial-no": "serial #",
   "field.spec": "spec",
-  "field.state": "state",
+  "field.state": "keadaan",
   "field.supervisory-role": "supervisory role",
   "field.tag": "tag name",
   "field.unit": "unit",
@@ -26,6 +26,7 @@
   "text.data sample created successfully": "a data sample created successfully",
   "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
+  "title.data-ooc list": "data OOC list",
   "title.data-sample list": "data sample list",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list"

package/translations/zh.json

@@ -18,7 +18,7 @@
   "field.ref-by": "ref. by",
   "field.serial-no": "serial #",
   "field.spec": "spec",
-  "field.state": "state",
+  "field.state": "状态",
   "field.supervisory-role": "supervisory role",
   "field.tag": "tag name",
   "field.unit": "unit",
@@ -26,6 +26,7 @@
   "text.data sample created successfully": "a data sample created successfully",
   "title.data-entry-form": "data entry form",
   "title.data-item list": "data item list",
+  "title.data-ooc list": "data OOC list",
   "title.data-sample list": "data sample list",
   "title.data-sensor list": "data sensor list",
   "title.data-set list": "data set list"