@things-factory/dataset 5.0.9 → 5.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "5.0.9",
+  "version": "5.0.12",
   "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.7",
-    "@things-factory/aws-base": "^5.0.7",
-    "@things-factory/board-service": "^5.0.7",
+    "@things-factory/auth-base": "^5.0.11",
+    "@things-factory/aws-base": "^5.0.11",
+    "@things-factory/board-service": "^5.0.11",
     "@things-factory/env": "^5.0.0",
-    "@things-factory/shell": "^5.0.7",
-    "@things-factory/work-shift": "^5.0.7",
+    "@things-factory/shell": "^5.0.11",
+    "@things-factory/work-shift": "^5.0.11",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.34"
   },
-  "gitHead": "ccfdd4f2119dc94fbfabb711b2e0a22dc1c8c4ec"
+  "gitHead": "fc92c5a8449721503a893d67aae8e65ce21a7890"
 }

package/server/controllers/create-data-sample.ts

@@ -11,8 +11,6 @@ import { NewDataSample } from '../service/data-sample/data-sample-type'
 import { DataSet } from '../service/data-set/data-set'
 import { DataUseCase } from './data-use-case'
 
-const debug = require('debug')('things-factory:dataset:controller/save-data-sample')
-
 const fillDataKeys = (dataKeySet, data) => {
   const keys = dataKeySet?.dataKeyItems || []
   return keys.reduce((sum, key, index) => {

package/server/controllers/data-use-case.ts

@@ -5,12 +5,13 @@ export type DataItemSpec = {
   type: string
   label: string
   name: string
-  property: { [option: string]: any }
+  property?: { [option: string]: any }
 }
 
 export type DataItemSpecSet = {
   name: string
   description: string
+  help?: string
   specs: DataItemSpec[]
 }
 

package/server/routes.ts

@@ -6,8 +6,6 @@ import { createDataSample } from './controllers/create-data-sample'
 import { renderJasperReport } from './controllers/jasper-report'
 import { DataSensor } from './service/data-sensor/data-sensor'
 
-const debug = require('debug')('things-factory:dataset:routes')
-
 process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRouter) => {
   /*
    * can add global public routes to application (auth not required, tenancy not required)

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

@@ -1,3 +1,4 @@
+import { Field, ID, Int, ObjectType, registerEnumType } from 'type-graphql'
 import {
   Column,
   CreateDateColumn,
@@ -8,11 +9,11 @@ import {
   RelationId,
   UpdateDateColumn
 } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
 import { Domain, ScalarObject } from '@things-factory/shell'
-import { Field, ID, Int, ObjectType, registerEnumType } from 'type-graphql'
 
 import { DataSet } from '../data-set/data-set'
-import { User } from '@things-factory/auth-base'
 
 export enum DataItemType {
   number = 'number',
@@ -89,7 +90,7 @@ export class DataItem {
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  options?: ScalarObject
+  options?: { [option: string]: any }
 
   @Column({
     nullable: true
@@ -105,7 +106,7 @@ export class DataItem {
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  spec?: ScalarObject
+  spec?: { [key: string]: any }
 
   @CreateDateColumn()
   @Field({ nullable: true })

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

@@ -1,11 +1,11 @@
-import { Resolver, Subscription, Root } from 'type-graphql'
 import { withFilter } from 'graphql-subscriptions'
-import { pubsub } from '@things-factory/shell'
-import { User } from '@things-factory/auth-base'
-import { DataOoc } from './data-ooc'
+import { Resolver, Root, Subscription } from 'type-graphql'
 import { getRepository } from 'typeorm'
 
-const debug = require('debug')('things-factory:dataset:data-ooc-subscription')
+import { User } from '@things-factory/auth-base'
+import { pubsub } from '@things-factory/shell'
+
+import { DataOoc } from './data-ooc'
 
 @Resolver(DataOoc)
 export class DataOocSubscription {
@@ -14,8 +14,6 @@ export class DataOocSubscription {
       const { domain, user } = context.state
       const subdomain = domain?.subdomain
 
-      debug('subscribe', subdomain)
-
       if (!domain) {
         throw new Error('domain required')
       }
@@ -40,7 +38,7 @@ export class DataOocSubscription {
             relations: ['roles']
           })
 
-          return userWithRoles.roles.find(role => role.id === supervisoryRoleId)
+          return !!userWithRoles.roles.find(role => role.id === supervisoryRoleId)
         }
       )(_, args, context, info)
     }

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

@@ -25,7 +25,7 @@ export class NewDataOoc {
   state?: DataOocStatus
 
   @Field(type => ScalarObject, { nullable: true })
-  data?: ScalarObject
+  data?: any
 
   @Field({ nullable: true })
   rawData?: string

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

@@ -131,22 +131,22 @@ export class DataOoc {
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  partitionKeys?: ScalarObject
+  partitionKeys?: { [key: string]: any }
 
   @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[]
 
   @Column('simple-json', { nullable: true })
   @Field(type => ScalarObject, { nullable: true })
-  history?: ScalarObject
+  history?: any
 
   @Column({
     nullable: true,

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-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-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()

package/dist-server/service/data-item/data-item-mutation.js

@@ -1,73 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataItemMutation = void 0;
-const type_graphql_1 = require("type-graphql");
-const typeorm_1 = require("typeorm");
-const data_set_1 = require("../data-set/data-set");
-const data_item_1 = require("./data-item");
-const data_item_type_1 = require("./data-item-type");
-let DataItemMutation = class DataItemMutation {
-    async updateMultipleDataItem(dataSetId, patches, context) {
-        const { domain, user, tx } = context.state;
-        let results = [];
-        const dataItemRepo = tx.getRepository(data_item_1.DataItem);
-        const dataSet = await tx.getRepository(data_set_1.DataSet).findOne(dataSetId);
-        await dataItemRepo.delete({ domain, dataSet: dataSetId });
-        for (let i = 0; i < patches.length; i++) {
-            const patch = patches[i];
-            if (!patch.options) {
-                patch.options = {};
-            }
-            const result = await dataItemRepo.save(Object.assign(Object.assign({ quota: 1 }, patch), { sequence: i, dataSet,
-                domain, creator: user, updater: user }));
-            results.push(Object.assign(Object.assign({}, result), { cuFlag: '+' }));
-        }
-        return results;
-    }
-    async deleteDataItems(ids, context) {
-        const { domain, tx } = context.state;
-        await tx.getRepository(data_item_1.DataItem).delete({
-            domain,
-            id: (0, typeorm_1.In)(ids)
-        });
-        return true;
-    }
-};
-__decorate([
-    (0, type_graphql_1.Directive)('@privilege(category: "data-set", privilege: "mutation", domainOwnerGranted: true)'),
-    (0, type_graphql_1.Directive)('@transaction'),
-    (0, type_graphql_1.Mutation)(returns => [data_item_1.DataItem], { description: "To modify multiple DataItems' information" }),
-    __param(0, (0, type_graphql_1.Arg)('dataSetId')),
-    __param(1, (0, type_graphql_1.Arg)('patches', type => [data_item_type_1.DataItemPatch])),
-    __param(2, (0, type_graphql_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Array, Object]),
-    __metadata("design:returntype", Promise)
-], DataItemMutation.prototype, "updateMultipleDataItem", null);
-__decorate([
-    (0, type_graphql_1.Directive)('@privilege(category: "data-set", privilege: "mutation", domainOwnerGranted: true)'),
-    (0, type_graphql_1.Directive)('@transaction'),
-    (0, type_graphql_1.Mutation)(returns => Boolean, { description: 'To delete multiple dataItems' }),
-    __param(0, (0, type_graphql_1.Arg)('ids', type => [String])),
-    __param(1, (0, type_graphql_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [Array, Object]),
-    __metadata("design:returntype", Promise)
-], DataItemMutation.prototype, "deleteDataItems", null);
-DataItemMutation = __decorate([
-    (0, type_graphql_1.Resolver)(data_item_1.DataItem)
-], DataItemMutation);
-exports.DataItemMutation = DataItemMutation;
-//# sourceMappingURL=data-item-mutation.js.map

package/dist-server/service/data-item/data-item-mutation.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"data-item-mutation.js","sourceRoot":"","sources":["../../../server/service/data-item/data-item-mutation.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,+CAAsE;AACtE,qCAA4B;AAE5B,mDAA8C;AAC9C,2CAAsC;AACtC,qDAAgD;AAGhD,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;IAI3B,KAAK,CAAC,sBAAsB,CACR,SAAiB,EACM,OAAwB,EAC1D,OAAY;QAEnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAE1C,IAAI,OAAO,GAAG,EAAE,CAAA;QAChB,MAAM,YAAY,GAAG,EAAE,CAAC,aAAa,CAAC,oBAAQ,CAAC,CAAA;QAC/C,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,kBAAO,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAA;QAElE,MAAM,YAAY,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAA;QAEzD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvC,MAAM,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC,CAAA;YACxB,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE;gBAClB,KAAK,CAAC,OAAO,GAAG,EAAE,CAAA;aACnB;YAED,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,IAAI,+BACpC,KAAK,EAAE,CAAC,IACL,KAAK,KACR,QAAQ,EAAE,CAAC,EACX,OAAO;gBACP,MAAM,EACN,OAAO,EAAE,IAAI,EACb,OAAO,EAAE,IAAI,IACb,CAAA;YAEF,OAAO,CAAC,IAAI,iCAAM,MAAM,KAAE,MAAM,EAAE,GAAG,IAAG,CAAA;SACzC;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;IAKD,KAAK,CAAC,eAAe,CAA+B,GAAa,EAAS,OAAY;QACpF,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEpC,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAQ,CAAC,CAAC,MAAM,CAAC;YACtC,MAAM;YACN,EAAE,EAAE,IAAA,YAAE,EAAC,GAAG,CAAC;SACZ,CAAC,CAAA;QAEF,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA;AAhDC;IAHC,IAAA,wBAAS,EAAC,mFAAmF,CAAC;IAC9F,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,CAAC,oBAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,2CAA2C,EAAE,CAAC;IAE3F,WAAA,IAAA,kBAAG,EAAC,WAAW,CAAC,CAAA;IAChB,WAAA,IAAA,kBAAG,EAAC,SAAS,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,8BAAa,CAAC,CAAC,CAAA;IACvC,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;8DA8BP;AAKD;IAHC,IAAA,wBAAS,EAAC,mFAAmF,CAAC;IAC9F,IAAA,wBAAS,EAAC,cAAc,CAAC;IACzB,IAAA,uBAAQ,EAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,8BAA8B,EAAE,CAAC;IACvD,WAAA,IAAA,kBAAG,EAAC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;IAAiB,WAAA,IAAA,kBAAG,GAAE,CAAA;;;;uDASxE;AAnDU,gBAAgB;IAD5B,IAAA,uBAAQ,EAAC,oBAAQ,CAAC;GACN,gBAAgB,CAoD5B;AApDY,4CAAgB"}

package/dist-server/service/data-item/data-item-query.js

@@ -1,104 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var __param = (this && this.__param) || function (paramIndex, decorator) {
-    return function (target, key) { decorator(target, key, paramIndex); }
-};
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.DataItemQuery = void 0;
-const type_graphql_1 = require("type-graphql");
-const typeorm_1 = require("typeorm");
-const auth_base_1 = require("@things-factory/auth-base");
-const shell_1 = require("@things-factory/shell");
-const data_set_1 = require("../data-set/data-set");
-const data_item_1 = require("./data-item");
-const data_item_type_1 = require("./data-item-type");
-let DataItemQuery = class DataItemQuery {
-    async dataItem(id, context) {
-        const { domain } = context.state;
-        return await (0, typeorm_1.getRepository)(data_item_1.DataItem).findOne({
-            where: { domain, id }
-        });
-    }
-    async dataItems(params, context) {
-        const { domain } = context.state;
-        const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
-            repository: (0, typeorm_1.getRepository)(data_item_1.DataItem),
-            params,
-            domain
-        });
-        const [items, total] = await queryBuilder.getManyAndCount();
-        return { items, total };
-    }
-    async dataSet(dataItem) {
-        return await (0, typeorm_1.getRepository)(data_set_1.DataSet).findOne(dataItem.dataSetId);
-    }
-    async domain(dataItem) {
-        return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(dataItem.domainId);
-    }
-    async updater(dataItem) {
-        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(dataItem.updaterId);
-    }
-    async creator(dataItem) {
-        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(dataItem.creatorId);
-    }
-};
-__decorate([
-    (0, type_graphql_1.Directive)('@privilege(category: "data-set", privilege: "query", domainOwnerGranted: true)'),
-    (0, type_graphql_1.Query)(returns => data_item_1.DataItem, { description: 'To fetch a DataItem' }),
-    __param(0, (0, type_graphql_1.Arg)('id')),
-    __param(1, (0, type_graphql_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object]),
-    __metadata("design:returntype", Promise)
-], DataItemQuery.prototype, "dataItem", null);
-__decorate([
-    (0, type_graphql_1.Directive)('@privilege(category: "data-set", privilege: "query", domainOwnerGranted: true)'),
-    (0, type_graphql_1.Query)(returns => data_item_type_1.DataItemList, { description: 'To fetch multiple DataItems' }),
-    __param(0, (0, type_graphql_1.Args)()),
-    __param(1, (0, type_graphql_1.Ctx)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [typeof (_a = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _a : Object, Object]),
-    __metadata("design:returntype", Promise)
-], DataItemQuery.prototype, "dataItems", null);
-__decorate([
-    (0, type_graphql_1.FieldResolver)(type => data_set_1.DataSet),
-    __param(0, (0, type_graphql_1.Root)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [data_item_1.DataItem]),
-    __metadata("design:returntype", Promise)
-], DataItemQuery.prototype, "dataSet", null);
-__decorate([
-    (0, type_graphql_1.FieldResolver)(type => shell_1.Domain),
-    __param(0, (0, type_graphql_1.Root)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [data_item_1.DataItem]),
-    __metadata("design:returntype", Promise)
-], DataItemQuery.prototype, "domain", null);
-__decorate([
-    (0, type_graphql_1.FieldResolver)(type => auth_base_1.User),
-    __param(0, (0, type_graphql_1.Root)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [data_item_1.DataItem]),
-    __metadata("design:returntype", Promise)
-], DataItemQuery.prototype, "updater", null);
-__decorate([
-    (0, type_graphql_1.FieldResolver)(type => auth_base_1.User),
-    __param(0, (0, type_graphql_1.Root)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [data_item_1.DataItem]),
-    __metadata("design:returntype", Promise)
-], DataItemQuery.prototype, "creator", null);
-DataItemQuery = __decorate([
-    (0, type_graphql_1.Resolver)(data_item_1.DataItem)
-], DataItemQuery);
-exports.DataItemQuery = DataItemQuery;
-//# sourceMappingURL=data-item-query.js.map

package/dist-server/service/data-item/data-item-query.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"data-item-query.js","sourceRoot":"","sources":["../../../server/service/data-item/data-item-query.ts"],"names":[],"mappings":"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"}