@things-factory/dataset 5.0.9 → 5.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "5.0.9",
+  "version": "5.0.10",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -43,5 +43,5 @@
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.34"
   },
-  "gitHead": "ccfdd4f2119dc94fbfabb711b2e0a22dc1c8c4ec"
+  "gitHead": "88c669d6f0e5e8d498201e520db9029516533733"
 }

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

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'
@@ -77,6 +78,16 @@ 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> {
     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