@things-factory/dataset 7.0.1-alpha.1 → 7.0.1-alpha.100

package/helps/dataset/data-sensor.md

@@ -1,11 +1,14 @@
 # DataSensor
+
 데이타 센서를 등록하고 조회합니다.<br>
+
 - 이름: 데이타 센서 이름을 설정합니다.<br>
 - 설명: 데이타 센서에 대한 설명을 설정합니다.<br>
 - 활성화: 사용 여부를 설정합니다. 비활성화된 센서 데이타는 데이타 샘플로 저장하지 않습니다.<br>
 - 디바이스 아이디: 유일한 센서의 아이디를 설정합니다 <br>
 - 태그이름: (deprecated 검토 중)<br>
 - 어플라이언스: 데이타 등록 권한을 가진 어플라이언스를 설정합니다.<br>
+- 디코더 시나리오: 외부에서 받은 데이터를 시나리오를 지정하여 parsing후, 시나리오의 마지막 결과 Key를 'data'로 지정하여 data 필드에 데이터를 쌓습니다.</br>
 - 데이터셋: 해당 센서 데이터에 반영할 데이터셋을 설정합니다. <br>
 - 모델: 센서 모델 정보를 설정합니다.<br>
 - 브랜드: 센서 브랜드를 설정합니다.<br>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "7.0.1-alpha.1",
+  "version": "7.0.1-alpha.100",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,8 +27,6 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@material/mwc-fab": "^0.27.0",
-    "@material/mwc-icon": "^0.27.0",
     "@operato/app": "^2.0.0-alpha.0",
     "@operato/data-grist": "^2.0.0-alpha.0",
     "@operato/dataset": "^2.0.0-alpha.0",
@@ -37,23 +35,26 @@
     "@operato/grist-editor": "^2.0.0-alpha.0",
     "@operato/i18n": "^2.0.0-alpha.0",
     "@operato/layout": "^2.0.0-alpha.0",
+    "@operato/moment-timezone-es": "^2.0.0-alpha.0",
+    "@operato/p13n": "^2.0.0-alpha.0",
     "@operato/shell": "^2.0.0-alpha.0",
     "@operato/styles": "^2.0.0-alpha.0",
     "@operato/utils": "^2.0.0-alpha.0",
-    "@things-factory/auth-base": "^7.0.1-alpha.1",
-    "@things-factory/aws-base": "^7.0.1-alpha.1",
-    "@things-factory/board-service": "^7.0.1-alpha.1",
-    "@things-factory/env": "^7.0.1-alpha.0",
-    "@things-factory/integration-base": "^7.0.1-alpha.1",
-    "@things-factory/organization": "^7.0.1-alpha.1",
-    "@things-factory/scheduler-client": "^7.0.1-alpha.1",
-    "@things-factory/shell": "^7.0.1-alpha.1",
-    "@things-factory/work-shift": "^7.0.1-alpha.1",
-    "@things-factory/worklist": "^7.0.1-alpha.1",
+    "@things-factory/auth-base": "^7.0.1-alpha.100",
+    "@things-factory/aws-base": "^7.0.1-alpha.100",
+    "@things-factory/board-service": "^7.0.1-alpha.100",
+    "@things-factory/env": "^7.0.1-alpha.71",
+    "@things-factory/integration-base": "^7.0.1-alpha.100",
+    "@things-factory/organization": "^7.0.1-alpha.100",
+    "@things-factory/personalization": "^7.0.1-alpha.100",
+    "@things-factory/scheduler-client": "^7.0.1-alpha.100",
+    "@things-factory/shell": "^7.0.1-alpha.100",
+    "@things-factory/work-shift": "^7.0.1-alpha.100",
+    "@things-factory/worklist": "^7.0.1-alpha.100",
     "cron-parser": "^4.3.0",
-    "moment-timezone": "^0.5.40",
+    "moment-timezone": "^0.5.45",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "6cc9a9da9059f32f8c2968c57831c1d353a2ec97"
+  "gitHead": "f5062c5559383d06fc8f9f870b56163952557c70"
 }

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

@@ -19,7 +19,7 @@ import { DataUseCase } from './data-use-case'
 // See README.md at ## Data Samples
 process.env.TZ = 'UTC'
 
-const fillDataKeys = (dataKeySet, data) => {
+const fillDataKeys = (dataKeySet, data = {}) => {
   const keys = dataKeySet?.dataKeyItems || []
   return keys.reduce((sum, key, index) => {
     const value = data[key.dataKey]

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

@@ -23,7 +23,7 @@ export class DataArchive {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((dataArchive: DataArchive) => dataArchive.domain)

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

@@ -25,7 +25,7 @@ export class DataKeySet {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((dataKeySet: DataKeySet) => dataKeySet.domain)

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

@@ -1,5 +1,16 @@
 import { Field, ID, ObjectType, registerEnumType } from 'type-graphql'
-import { Column, CreateDateColumn, Entity, Index, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  JoinColumn,
+  ManyToOne,
+  OneToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
@@ -33,7 +44,7 @@ export class DataOoc {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((dataOoc: DataOoc) => dataOoc.domain)
@@ -72,14 +83,24 @@ export class DataOoc {
 
   @Column({
     nullable: true,
-    type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'longtext' : DATABASE_TYPE == 'oracle' ? 'clob' : 'varchar'
+    type:
+      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'longtext'
+        : DATABASE_TYPE == 'oracle'
+          ? 'clob'
+          : 'varchar'
   })
   @Field({ nullable: true })
   correctiveInstruction?: string
 
   @Column({
     nullable: true,
-    type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'longtext' : DATABASE_TYPE == 'oracle' ? 'clob' : 'varchar'
+    type:
+      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'longtext'
+        : DATABASE_TYPE == 'oracle'
+          ? 'clob'
+          : 'varchar'
   })
   @Field({ nullable: true })
   correctiveAction?: string
@@ -133,7 +154,12 @@ export class DataOoc {
 
   @Column({
     nullable: true,
-    type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'longtext' : DATABASE_TYPE == 'oracle' ? 'clob' : 'varchar'
+    type:
+      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'longtext'
+        : DATABASE_TYPE == 'oracle'
+          ? 'clob'
+          : 'varchar'
   })
   @Field({ nullable: true })
   rawData?: string

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

@@ -1,5 +1,16 @@
 import { Field, ID, ObjectType } from 'type-graphql'
-import { Column, CreateDateColumn, Entity, Index, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  JoinColumn,
+  ManyToOne,
+  OneToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
@@ -13,10 +24,24 @@ import { DataOoc } from '../data-ooc/data-ooc'
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
 @Entity()
-@Index('ix_data_sample_0', (dataSample: DataSample) => [dataSample.domain, dataSample.dataSet, dataSample.workDate, dataSample.workShift, dataSample.collectedAt], {
-  unique: false
-})
-@Index('ix_data_sample_1', (dataSample: DataSample) => [dataSample.domain, dataSample.dataSet, dataSample.collectedAt], { unique: false })
+@Index(
+  'ix_data_sample_0',
+  (dataSample: DataSample) => [
+    dataSample.domain,
+    dataSample.dataSet,
+    dataSample.workDate,
+    dataSample.workShift,
+    dataSample.collectedAt
+  ],
+  {
+    unique: false
+  }
+)
+@Index(
+  'ix_data_sample_1',
+  (dataSample: DataSample) => [dataSample.domain, dataSample.dataSet, dataSample.collectedAt],
+  { unique: false }
+)
 @ObjectType({ description: 'Entity for DataSample' })
 export class DataSample {
   @PrimaryGeneratedColumn('uuid')
@@ -24,7 +49,7 @@ export class DataSample {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((dataSample: DataSample) => dataSample.domain)
@@ -74,7 +99,12 @@ export class DataSample {
 
   @Column({
     nullable: true,
-    type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'longtext' : DATABASE_TYPE == 'oracle' ? 'clob' : 'varchar',
+    type:
+      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'longtext'
+        : DATABASE_TYPE == 'oracle'
+          ? 'clob'
+          : 'varchar',
     transformer: json5Transformer
   })
   @Field({ nullable: true })

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

@@ -1,5 +1,14 @@
 import { Field, ID, ObjectType } from 'type-graphql'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
 
 import { Domain } from '@things-factory/shell'
 import { Appliance, User } from '@things-factory/auth-base'
@@ -23,7 +32,7 @@ export class DataSensor {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((dataSensor: DataSensor) => dataSensor.domain)

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

@@ -47,7 +47,7 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
   readonly version: number = 1
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.domain)
@@ -203,8 +203,8 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-        ? 'varchar2'
-        : 'smallint',
+          ? 'varchar2'
+          : 'smallint',
     enum: HistoryActionType
   })
   public action!: HistoryActionType

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

@@ -1,4 +1,13 @@
-import { CreateDateColumn, UpdateDateColumn, Entity, Index, Column, RelationId, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
+import {
+  CreateDateColumn,
+  UpdateDateColumn,
+  Entity,
+  Index,
+  Column,
+  RelationId,
+  ManyToOne,
+  PrimaryGeneratedColumn
+} from 'typeorm'
 import { ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
 
 import { Domain, ScalarObject } from '@things-factory/shell'
@@ -23,7 +32,11 @@ import { DataSet, DataSetSummaryPeriodType } from '../data-set/data-set'
   ],
   { unique: true }
 )
-@Index('ix_data_summary_1', (dataSummary: DataSummary) => [dataSummary.domain, dataSummary.dataSet, dataSummary.date, dataSummary.period], { unique: false })
+@Index(
+  'ix_data_summary_1',
+  (dataSummary: DataSummary) => [dataSummary.domain, dataSummary.dataSet, dataSummary.date, dataSummary.period],
+  { unique: false }
+)
 @ObjectType({ description: 'Entity for DataSummary' })
 export class DataSummary {
   @PrimaryGeneratedColumn('uuid')
@@ -31,7 +44,7 @@ export class DataSummary {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((dataSummary: DataSummary) => dataSummary.domain)