@things-factory/dataset 5.0.0-zeta.9 → 5.0.2

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

@@ -1,22 +1,42 @@
 import { Field, ID, ObjectType } from 'type-graphql'
-import { Column, Entity, ManyToOne, PrimaryColumn, RelationId } from 'typeorm'
-
+import { Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId } from 'typeorm'
+
+import {
+  HistoryActionColumn,
+  HistoryActionType,
+  HistoryEntityInterface,
+  HistoryOriginalIdColumn
+} from '@anchan828/typeorm-history'
 import { Role, User } from '@things-factory/auth-base'
+import { config } from '@things-factory/env'
 import { Domain, ScalarObject } from '@things-factory/shell'
 
 import { DataItem } from '../data-set/data-item-type'
-import { DataSetEntryType, DataSetMonitorType, DataSetReportType } from '../data-set/data-set'
+import { DataSet, DataSetEntryType, DataSetMonitorType, DataSetReportType } from '../data-set/data-set'
+
+const ORMCONFIG = config.get('ormconfig', {})
+const DATABASE_TYPE = ORMCONFIG.type
 
 @Entity()
+@Index(
+  'ix_data_set_history_0',
+  (dataSetHistory: DataSetHistory) => [dataSetHistory.originalId, dataSetHistory.version],
+  { unique: true }
+)
+@Index(
+  'ix_data_set_history_1',
+  (dataSetHistory: DataSetHistory) => [dataSetHistory.domain, dataSetHistory.originalId, dataSetHistory.version],
+  { unique: true }
+)
 @ObjectType({ description: 'Entity for DataSetHistory' })
-export class DataSetHistory {
-  @PrimaryColumn()
+export class DataSetHistory implements HistoryEntityInterface<DataSet> {
+  @PrimaryGeneratedColumn('uuid')
   @Field(type => ID)
   readonly id: string
 
-  @PrimaryColumn()
-  @Field()
-  readonly version: number
+  @Column({ default: 1 })
+  @Field({ nullable: true })
+  readonly version: number = 1
 
   @ManyToOne(type => Domain)
   @Field({ nullable: true })
@@ -29,84 +49,60 @@ export class DataSetHistory {
   @Field()
   name: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   description?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   active?: boolean
 
-  @ManyToOne(type => Role, {
-    nullable: true
-  })
+  @ManyToOne(type => Role, { nullable: true })
   @Field(type => Role, { nullable: true })
   entryRole?: Role
 
   @RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.entryRole)
   entryRoleId?: string
 
-  @ManyToOne(type => Role, {
-    nullable: true
-  })
+  @ManyToOne(type => Role, { nullable: true })
   @Field(type => Role, { nullable: true })
   supervisoryRole?: Role
 
   @RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.supervisoryRole)
   supervisoryRoleId?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   type?: 'manual' | 'automatic' | string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   entryType?: DataSetEntryType
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   entryView?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   monitorType?: DataSetMonitorType
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   monitorView?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   reportType?: DataSetReportType
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   reportView?: string
 
   @Field({ nullable: true })
   reportTemplate?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   useCase?: string
 
@@ -118,43 +114,48 @@ export class DataSetHistory {
   @Field(type => [DataItem], { nullable: true })
   dataItems: DataItem[]
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   schedule?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   timezone?: string
 
-  @Column({
-    nullable: true
-  })
+  @Column({ nullable: true })
   @Field({ nullable: true })
   createdAt?: Date
 
-  @PrimaryColumn()
+  @Column({ nullable: true })
   @Field({ nullable: true })
   updatedAt?: Date
 
-  @ManyToOne(type => User, {
-    nullable: true
-  })
+  @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
   creator?: User
 
   @RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.creator)
   creatorId?: string
 
-  @ManyToOne(type => User, {
-    nullable: true
-  })
+  @ManyToOne(type => User, { nullable: true })
   @Field({ nullable: true })
   updater?: User
 
   @RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.creator)
   updaterId?: string
+
+  @HistoryOriginalIdColumn({ nullable: true })
+  public originalId!: string
+
+  @HistoryActionColumn({
+    nullable: false,
+    type:
+      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'enum'
+        : DATABASE_TYPE == 'oracle'
+        ? 'varchar2'
+        : 'smallint',
+    enum: HistoryActionType
+  })
+  public action!: HistoryActionType
 }

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

@@ -0,0 +1,17 @@
+import { EventSubscriber } from 'typeorm'
+
+import { HistoryEntitySubscriber } from '@anchan828/typeorm-history'
+
+import { DataSet } from '../data-set/data-set'
+import { DataSetHistory } from './data-set-history'
+
+@EventSubscriber()
+export class DataSetHistoryEntitySubscriber extends HistoryEntitySubscriber<DataSet, DataSetHistory> {
+  public get entity() {
+    return DataSet
+  }
+
+  public get historyEntity() {
+    return DataSetHistory
+  }
+}

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

@@ -1,5 +1,7 @@
 import { DataSetHistory } from './data-set-history'
 import { DataSetHistoryQuery } from './data-set-history-query'
+import { DataSetHistoryEntitySubscriber } from './event-subscriber'
 
 export const entities = [DataSetHistory]
 export const resolvers = [DataSetHistoryQuery]
+export const subscribers = [DataSetHistoryEntitySubscriber]

package/server/service/index.ts

@@ -4,7 +4,11 @@ import { entities as DataOocEntities, resolvers as DataOocResolvers } from './da
 import { entities as DataSampleEntities, resolvers as DataSampleResolvers } from './data-sample'
 import { entities as DataSensorEntities, resolvers as DataSensorResolvers } from './data-sensor'
 import { entities as DataSetEntities, resolvers as DataSetResolvers } from './data-set'
-import { entities as DataSetHistoryEntities, resolvers as DataSetHistoryResolvers } from './data-set-history'
+import {
+  entities as DataSetHistoryEntities,
+  resolvers as DataSetHistoryResolvers,
+  subscribers as DataSetHistorySubscribers
+} from './data-set-history'
 import { entities as DataSpecEntities, resolvers as DataSpecResolvers } from './data-spec'
 
 /* EXPORT ENTITY TYPES */
@@ -27,6 +31,11 @@ export const entities = [
   ...DataSpecEntities
 ]
 
+export const subscribers = [
+  /* SUBSCRIBERS */
+  ...DataSetHistorySubscribers
+]
+
 export const schema = {
   resolverClasses: [
     /* RESOLVER CLASSES */

package/translations/en.json

@@ -32,7 +32,7 @@
   "field.report-view": "report view",
   "field.serial-no": "serial #",
   "field.spec": "spec",
-  "field.state": "state",
+  "field.status": "status",
   "field.supervisory-role": "supervisory role",
   "field.tag": "tag name",
   "field.unit": "unit",

package/translations/ko.json

@@ -32,7 +32,7 @@
   "field.report-view": "리포트용 화면",
   "field.serial-no": "시리얼번호",
   "field.spec": "명세",
-  "field.state": "상태",
+  "field.status": "상태",
   "field.supervisory-role": "관리자 역할",
   "field.tag": "태그이름",
   "field.unit": "단위",
@@ -41,8 +41,8 @@
   "field.work-shift": "교대근무조",
   "label.acceptables": "허용값",
   "label.critical-limits": "허용 한계범위",
-  "label.maximum value": "최대값",
   "label.minimum value": "최소값",
+  "label.maximum value": "최대값",
   "label.pass-limits": "통과 허용범위",
   "label.target-limits": "관리 목표범위",
   "text.automatically collected": "자동 수집",

package/translations/ms.json

@@ -31,7 +31,7 @@
   "field.report-view": "report view",
   "field.serial-no": "serial #",
   "field.spec": "spec",
-  "field.state": "keadaan",
+  "field.status": "keadaan",
   "field.supervisory-role": "supervisory role",
   "field.tag": "tag name",
   "field.unit": "unit",

package/translations/zh.json

@@ -31,7 +31,7 @@
   "field.report-view": "report view",
   "field.serial-no": "serial #",
   "field.spec": "spec",
-  "field.state": "状态",
+  "field.status": "状态",
   "field.supervisory-role": "supervisory role",
   "field.tag": "tag name",
   "field.unit": "unit",