@things-factory/dataset 5.0.11 → 5.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "5.0.11",
+  "version": "5.0.14",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -34,14 +34,14 @@
     "@operato/shell": "^1.0.1",
     "@operato/styles": "^1.0.0",
     "@operato/utils": "^1.0.1",
-    "@things-factory/auth-base": "^5.0.11",
-    "@things-factory/aws-base": "^5.0.11",
-    "@things-factory/board-service": "^5.0.11",
+    "@things-factory/auth-base": "^5.0.14",
+    "@things-factory/aws-base": "^5.0.14",
+    "@things-factory/board-service": "^5.0.14",
     "@things-factory/env": "^5.0.0",
-    "@things-factory/shell": "^5.0.11",
-    "@things-factory/work-shift": "^5.0.11",
+    "@things-factory/shell": "^5.0.14",
+    "@things-factory/work-shift": "^5.0.14",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.34"
   },
-  "gitHead": "37cd4feb62e062899cae7029588d86a5d4b4036a"
+  "gitHead": "9ceaa39746fcf42953e429fab2001353cd821ded"
 }

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

@@ -42,7 +42,7 @@ export class DataItem {
   unit?: string
 
   @Field(type => Int, { nullable: true })
-  quota: number
+  quota?: number
 
   @Field(type => ScalarObject, { nullable: true })
   spec?: { [key: string]: any }

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

@@ -38,7 +38,9 @@ export class DataSetMutation {
     const dataSetRepo = tx.getRepository(DataSet)
 
     const dataSet = await dataSetRepo.findOne({
-      where: { domain, id }
+      where: { domain, id },
+      relations: ['domain', 'dataKeySet', 'entryRole', 'supervisoryRole', 'creator', 'updater']
+      /* history에 항상 반영될 수 있도록 relations가 있어야 함. */
     })
 
     const result = await dataSetRepo.save({
@@ -81,9 +83,7 @@ export class DataSetMutation {
         await this._createAttachment(context, newRecord.reportTemplate, { ref: result, cuFlag })
 
         results.push({
-          ...(await dataSetRepo.findOne(result.id, {
-            relations: ['domain', 'creator', 'updater', 'supervisoryRole', 'entryRole']
-          })),
+          ...result,
           cuFlag
         })
       }
@@ -93,7 +93,10 @@ export class DataSetMutation {
       const cuFlag = 'M'
       for (let i = 0; i < _updateRecords.length; i++) {
         const newRecord = _updateRecords[i]
-        const dataSet = await dataSetRepo.findOne(newRecord.id)
+        const dataSet = await dataSetRepo.findOne(newRecord.id, {
+          /* history에 항상 반영될 수 있도록 relations가 있어야 함. */
+          relations: ['domain', 'dataKeySet', 'entryRole', 'supervisoryRole', 'creator', 'updater']
+        })
 
         const result = await dataSetRepo.save({
           ...dataSet,
@@ -104,9 +107,7 @@ export class DataSetMutation {
         await this._createAttachment(context, newRecord.reportTemplate, { ref: result, cuFlag })
 
         results.push({
-          ...(await dataSetRepo.findOne(result.id, {
-            relations: ['domain', 'creator', 'updater', 'supervisoryRole', 'entryRole']
-          })),
+          ...result,
           cuFlag
         })
       }
@@ -176,7 +177,7 @@ export class DataSetMutation {
         id: In(ids),
         domain
       },
-      relations: ['domain', 'supervisoryRole', 'entryRole']
+      relations: ['domain', 'supervisoryRole', 'entryRole', 'dataKeySet']
     })
 
     if (originals.length == 0) {
@@ -191,9 +192,12 @@ export class DataSetMutation {
         id: dataSetId,
         name: dataSet.name + ' (' + dataSetId + ')',
         active: false,
+        version: 1,
         domain,
         creator: user,
-        updater: user
+        updater: user,
+        updatedAt: undefined,
+        createdAt: undefined
       }
     })
 

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

@@ -6,9 +6,9 @@ import { Role, User } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
 import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
 
-import { DataItem } from '../data-item/data-item'
 import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataSample } from '../data-sample/data-sample'
+import { DataItem } from './data-item-type'
 import { DataSet } from './data-set'
 import { DataSetList } from './data-set-type'
 
@@ -104,14 +104,11 @@ export class DataSetQuery {
 
   @FieldResolver(type => [DataItem])
   async dataItems(@Root() dataSet: DataSet): Promise<DataItem[]> {
-    /* TODO this fieldResolver should be removed. This is only for migration temporarily */
-    if (dataSet.dataItems) {
-      return dataSet.dataItems as DataItem[]
+    if (dataSet.dataItems instanceof Array) {
+      return dataSet.dataItems.filter(item => item.name)
     }
 
-    return await getRepository(DataItem).find({
-      dataSet
-    })
+    return []
   }
 
   @FieldResolver(type => Role)

package/server/service/index.ts

@@ -1,4 +1,3 @@
-import { entities as DataItemEntities } from './data-item'
 import { entities as DataKeySetEntities, resolvers as DataKeySetResolvers } from './data-key-set'
 import { entities as DataOocEntities, resolvers as DataOocResolvers } from './data-ooc'
 import { entities as DataSampleEntities, resolvers as DataSampleResolvers } from './data-sample'
@@ -24,7 +23,6 @@ export * from './data-spec/data-spec'
 export const entities = [
   /* ENTITIES */
   ...DataKeySetEntities,
-  ...DataItemEntities,
   ...DataOocEntities,
   ...DataSensorEntities,
   ...DataSampleEntities,

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

@@ -1,136 +0,0 @@
-import { Field, ID, Int, ObjectType, registerEnumType } from 'type-graphql'
-import {
-  Column,
-  CreateDateColumn,
-  Entity,
-  Index,
-  ManyToOne,
-  PrimaryGeneratedColumn,
-  RelationId,
-  UpdateDateColumn
-} from 'typeorm'
-
-import { User } from '@things-factory/auth-base'
-import { Domain, ScalarObject } from '@things-factory/shell'
-
-import { DataSet } from '../data-set/data-set'
-
-export enum DataItemType {
-  number = 'number',
-  text = 'text',
-  boolean = 'boolean',
-  select = 'select',
-  file = 'file'
-}
-
-registerEnumType(DataItemType, {
-  name: 'DataItemType',
-  description: 'state enumeration of a data-item'
-})
-
-@Entity()
-@Index('ix_data_item_0', (dataItem: DataItem) => [dataItem.domain, dataItem.dataSet, dataItem.name], { unique: true })
-@ObjectType({ description: 'Entity for DataItem' })
-export class DataItem {
-  @PrimaryGeneratedColumn('uuid')
-  @Field(type => ID)
-  readonly id: string
-
-  @ManyToOne(type => Domain)
-  @Field({ nullable: true })
-  domain?: Domain
-
-  @RelationId((dataItem: DataItem) => dataItem.domain)
-  domainId?: string
-
-  @Column()
-  @Field()
-  name: string
-
-  @Column({
-    nullable: true
-  })
-  @Field({ nullable: true })
-  description?: string
-
-  @ManyToOne(type => DataSet, dataSet => dataSet.dataItems, { onDelete: 'CASCADE' })
-  @Field(type => DataSet, { nullable: false })
-  dataSet?: DataSet
-
-  @RelationId((dataItem: DataItem) => dataItem.dataSet)
-  dataSetId?: string
-
-  @Column()
-  @Field(type => Int, { nullable: true })
-  sequence: number
-
-  @Column({
-    nullable: true
-  })
-  @Field({ nullable: true })
-  tag?: string
-
-  @Column({
-    nullable: true
-  })
-  @Field({ nullable: true })
-  active?: boolean
-
-  @Column({
-    nullable: true
-  })
-  @Field({ nullable: true })
-  hidden?: boolean
-
-  @Column({
-    nullable: true
-  })
-  @Field({ nullable: true })
-  type?: DataItemType
-
-  @Column('simple-json', { nullable: true })
-  @Field(type => ScalarObject, { nullable: true })
-  options?: { [option: string]: any }
-
-  @Column({
-    nullable: true
-  })
-  @Field({ nullable: true })
-  unit?: string
-
-  @Column({
-    nullable: true
-  })
-  @Field(type => Int, { nullable: true })
-  quota: number
-
-  @Column('simple-json', { nullable: true })
-  @Field(type => ScalarObject, { nullable: true })
-  spec?: { [key: string]: any }
-
-  @CreateDateColumn()
-  @Field({ nullable: true })
-  createdAt?: Date
-
-  @UpdateDateColumn()
-  @Field({ nullable: true })
-  updatedAt?: Date
-
-  @ManyToOne(type => User, {
-    nullable: true
-  })
-  @Field({ nullable: true })
-  creator?: User
-
-  @RelationId((dataItem: DataItem) => dataItem.creator)
-  creatorId?: string
-
-  @ManyToOne(type => User, {
-    nullable: true
-  })
-  @Field({ nullable: true })
-  updater?: User
-
-  @RelationId((dataItem: DataItem) => dataItem.creator)
-  updaterId?: string
-}

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

@@ -1,3 +0,0 @@
-import { DataItem } from './data-item'
-
-export const entities = [DataItem]