@things-factory/dataset 6.2.97 → 6.2.98

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.2.97",
+  "version": "6.2.98",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -46,11 +46,11 @@
     "@things-factory/scheduler-client": "^6.2.96",
     "@things-factory/shell": "^6.2.96",
     "@things-factory/work-shift": "^6.2.96",
-    "@things-factory/worklist": "^6.2.97",
+    "@things-factory/worklist": "^6.2.98",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "62f9a4d0fe8a3377b9e2342667fda3fca9c1f174"
+  "gitHead": "72d30969be4b3775047b2dc504aaf6188163b228"
 }

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

@@ -1,21 +1,14 @@
 import { Field, ID, ObjectType, registerEnumType } 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 { User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
 import { Domain, ScalarObject } from '@things-factory/shell'
+import { ActivityInstance } from '@things-factory/worklist'
 
 import { DataItem } from '../data-set/data-item-type'
 import { DataSet } from '../data-set/data-set'
+import { DataSample } from '../data-sample/data-sample'
 
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
@@ -87,24 +80,14 @@ 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
@@ -162,12 +145,7 @@ 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
@@ -178,6 +156,27 @@ export class DataOoc {
   @Field({ nullable: true })
   source?: string
 
+  @ManyToOne(type => DataSample, { nullable: true })
+  @Field({ nullable: true })
+  dataSample?: DataSample
+
+  @RelationId((dataOoc: DataOoc) => dataOoc.dataSample)
+  dataSampleId?: string
+
+  @ManyToOne(type => ActivityInstance, { nullable: true })
+  @Field({ nullable: true })
+  reviewActivityInstance?: ActivityInstance
+
+  @RelationId((dataOoc: DataOoc) => dataOoc.reviewActivityInstance)
+  reviewActivityInstanceId?: string
+
+  @ManyToOne(type => ActivityInstance, { nullable: true })
+  @Field({ nullable: true })
+  resolveActivityInstance?: ActivityInstance
+
+  @RelationId((dataOoc: DataOoc) => dataOoc.resolveActivityInstance)
+  resolveActivityInstanceId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   workDate?: string

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

@@ -1,18 +1,10 @@
 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 { User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
 import { Domain, ScalarObject } from '@things-factory/shell'
+import { ActivityInstance } from '@things-factory/worklist'
 
 import { DataItem } from '../data-set/data-item-type'
 import { DataSet } from '../data-set/data-set'
@@ -20,22 +12,10 @@ import { DataSet } from '../data-set/data-set'
 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')
@@ -99,12 +79,7 @@ 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'
   })
   @Field({ nullable: true })
   rawData?: string
@@ -155,6 +130,13 @@ export class DataSample {
   @Field({ nullable: true })
   workShift?: string
 
+  @ManyToOne(type => ActivityInstance, { nullable: true })
+  @Field({ nullable: true })
+  reviewActivityInstance?: ActivityInstance
+
+  @RelationId((dataSample: DataSample) => dataSample.reviewActivityInstance)
+  reviewActivityInstanceId?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   collectedAt?: Date