@things-factory/dataset 5.0.7 → 5.0.11

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

@@ -1,12 +1,9 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 
+import { createDataSample } from '../../controllers/create-data-sample'
 import { DataSample } from './data-sample'
 import { NewDataSample } from './data-sample-type'
 
-import { createDataSample } from '../../controllers/create-data-sample'
-
-const debug = require('debug')('things-factory:dataset:data-sample:data-sample-mutation')
-
 @Resolver(DataSample)
 export class DataSampleMutation {
   @Directive('@privilege(category: "data-sample", privilege: "mutation", domainOwnerGranted: true)')

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

@@ -19,7 +19,7 @@ export class NewDataSample {
   dataSetVersion?: number
 
   @Field(type => ScalarObject, { nullable: true })
-  data?: ScalarObject
+  data?: any
 
   @Field({ nullable: true })
   rawData?: string

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

@@ -68,7 +68,7 @@ export class DataSample {
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  partitionKeys?: ScalarObject
+  partitionKeys?: { [key: string]: any }
 
   @ManyToOne(type => DataSet)
   @Field(type => DataSet, { nullable: false })
@@ -83,11 +83,11 @@ export class DataSample {
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  data?: ScalarObject
+  data?: any
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  judgment?: ScalarObject
+  judgment?: any
 
   @Field(type => [DataItem], { nullable: true })
   dataItems?: DataItem[]

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

@@ -36,7 +36,7 @@ export class DataItem {
   type?: DataItemType
 
   @Field(type => ScalarObject, { nullable: true })
-  options?: ScalarObject
+  options?: { [option: string]: any }
 
   @Field({ nullable: true })
   unit?: string
@@ -45,7 +45,7 @@ export class DataItem {
   quota: number
 
   @Field(type => ScalarObject, { nullable: true })
-  spec?: ScalarObject
+  spec?: { [key: string]: any }
 }
 
 @InputType()
@@ -63,7 +63,7 @@ export class DataItemPatch {
   type?: DataItemType
 
   @Field(type => ScalarObject, { nullable: true })
-  options?: ScalarObject
+  options?: { [option: string]: any }
 
   @Field({ nullable: true })
   unit?: string
@@ -78,5 +78,5 @@ export class DataItemPatch {
   hidden?: boolean
 
   @Field(type => ScalarObject, { nullable: true })
-  spec?: ScalarObject
+  spec?: { [key: string]: any }
 }

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

@@ -34,7 +34,7 @@ export class NewDataSet {
   useCase?: string
 
   @Field(type => ScalarObject, { nullable: true })
-  partitionKeys?: ScalarObject
+  partitionKeys?: { [key: string]: any }
 
   @Field(type => [DataItemPatch], { nullable: true })
   dataItems?: DataItemPatch[]
@@ -97,7 +97,7 @@ export class DataSetPatch {
   useCase?: string
 
   @Field(type => ScalarObject, { nullable: true })
-  partitionKeys?: ScalarObject
+  partitionKeys?: { [key: string]: any }
 
   @Field(type => [DataItemPatch], { nullable: true })
   dataItems?: DataItemPatch[]

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

@@ -86,7 +86,7 @@ export class DataSet {
 
   @ManyToOne(type => DataKeySet, { nullable: true })
   @Field(type => DataKeySet, { nullable: true })
-  dataKeySet?: Role
+  dataKeySet?: DataKeySet
 
   @RelationId((dataSet: DataSet) => dataSet.dataKeySet)
   dataKeySetId?: string
@@ -142,7 +142,7 @@ export class DataSet {
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  partitionKeys?: ScalarObject
+  partitionKeys?: { [key: string]: any }
 
   @Column('simple-json', { nullable: true })
   @Field(type => [DataItem], { nullable: true })

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

@@ -6,6 +6,7 @@ import { Role, User } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
 import { Domain, getQueryBuilderFromListParams, ListParam, ScalarDate } from '@things-factory/shell'
 
+import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataSet } from '../data-set/data-set'
 import { DataSetHistory } from './data-set-history'
 import { DataSetHistoryList } from './data-set-history-type'
@@ -16,7 +17,7 @@ export class DataSetHistoryQuery {
   @Query(returns => DataSetHistory, { description: 'To fetch a DataSetHistory' })
   async dataSetHistory(
     @Arg('id') id: string,
-    @Arg('timestamp', type => ScalarDate) timestamp: ScalarDate,
+    @Arg('timestamp', type => ScalarDate) timestamp: Date,
     @Ctx() context: any
   ): Promise<DataSetHistory> {
     const { domain } = context.state
@@ -77,8 +78,18 @@ export class DataSetHistoryQuery {
     }
   }
 
+  @FieldResolver(type => DataKeySet, { nullable: true })
+  async dataKeySet(@Root() dataSet: DataSet) {
+    return (
+      dataSet.dataKeySet ||
+      (await getRepository(DataKeySet).findOne({
+        id: dataSet.dataKeySetId
+      }))
+    )
+  }
+
   @FieldResolver(type => User)
-  async timestamp(@Root() dataSetHistory: DataSetHistory): Promise<User> {
+  async timestamp(@Root() dataSetHistory: DataSetHistory): Promise<Date> {
     return dataSetHistory.updatedAt
   }
 

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

@@ -11,6 +11,7 @@ import { Role, User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
 import { Domain, ScalarObject } from '@things-factory/shell'
 
+import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataItem } from '../data-set/data-item-type'
 import { DataSet, DataSetEntryType, DataSetMonitorType, DataSetReportType } from '../data-set/data-set'
 
@@ -57,6 +58,13 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
   @Field({ nullable: true })
   active?: boolean
 
+  @ManyToOne(type => DataKeySet, { nullable: true })
+  @Field(type => DataKeySet, { nullable: true })
+  dataKeySet?: DataKeySet
+
+  @RelationId((dataSet: DataSet) => dataSet.dataKeySet)
+  dataKeySetId?: string
+
   @ManyToOne(type => Role, { nullable: true })
   @Field(type => Role, { nullable: true })
   entryRole?: Role
@@ -108,7 +116,7 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  partitionKeys?: ScalarObject
+  partitionKeys?: { [key: string]: any }
 
   @Column('simple-json', { nullable: true })
   @Field(type => [DataItem], { nullable: true })

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

@@ -1,4 +1,5 @@
-import { ObjectType, Field, Int } from 'type-graphql'
+import { Field, Int, ObjectType } from 'type-graphql'
+
 import { ScalarObject } from '@things-factory/shell'
 
 @ObjectType()
@@ -16,7 +17,7 @@ export class DataSpecItem {
   placeholder?: string
 
   @Field(type => ScalarObject, { nullable: true })
-  property?: ScalarObject
+  property?: { [key: string]: any }
 }
 
 @ObjectType()