@things-factory/dataset 5.0.1 → 5.0.4

package/dist-server/service/data-set/data-set.js

@@ -8,13 +8,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var _a, _b, _c, _d, _e, _f;
+var _a, _b, _c, _d, _e, _f, _g;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataSet = exports.DataSetReportType = exports.DataSetMonitorType = exports.DataSetEntryType = 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_key_set_1 = require("../data-key-set/data-key-set");
 const data_item_type_1 = require("./data-item-type");
 var DataSetEntryType;
 (function (DataSetEntryType) {
@@ -74,9 +75,7 @@ __decorate([
     __metadata("design:type", String)
 ], DataSet.prototype, "name", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataSet.prototype, "description", void 0);
@@ -86,80 +85,69 @@ __decorate([
     __metadata("design:type", Number)
 ], DataSet.prototype, "version", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", Boolean)
 ], DataSet.prototype, "active", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(type => auth_base_1.Role, {
-        nullable: true
-    }),
-    (0, type_graphql_1.Field)(type => auth_base_1.Role, { nullable: true }),
+    (0, typeorm_1.ManyToOne)(type => data_key_set_1.DataKeySet, { nullable: true }),
+    (0, type_graphql_1.Field)(type => data_key_set_1.DataKeySet, { nullable: true }),
     __metadata("design:type", typeof (_b = typeof auth_base_1.Role !== "undefined" && auth_base_1.Role) === "function" ? _b : Object)
+], DataSet.prototype, "dataKeySet", void 0);
+__decorate([
+    (0, typeorm_1.RelationId)((dataSet) => dataSet.dataKeySet),
+    __metadata("design:type", String)
+], DataSet.prototype, "dataKeySetId", void 0);
+__decorate([
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.Role, { nullable: true }),
+    (0, type_graphql_1.Field)(type => auth_base_1.Role, { nullable: true }),
+    __metadata("design:type", typeof (_c = typeof auth_base_1.Role !== "undefined" && auth_base_1.Role) === "function" ? _c : Object)
 ], DataSet.prototype, "entryRole", void 0);
 __decorate([
     (0, typeorm_1.RelationId)((dataSet) => dataSet.entryRole),
     __metadata("design:type", String)
 ], DataSet.prototype, "entryRoleId", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(type => auth_base_1.Role, {
-        nullable: true
-    }),
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.Role, { nullable: true }),
     (0, type_graphql_1.Field)(type => auth_base_1.Role, { nullable: true }),
-    __metadata("design:type", typeof (_c = typeof auth_base_1.Role !== "undefined" && auth_base_1.Role) === "function" ? _c : Object)
+    __metadata("design:type", typeof (_d = typeof auth_base_1.Role !== "undefined" && auth_base_1.Role) === "function" ? _d : Object)
 ], DataSet.prototype, "supervisoryRole", void 0);
 __decorate([
     (0, typeorm_1.RelationId)((dataSet) => dataSet.supervisoryRole),
     __metadata("design:type", String)
 ], DataSet.prototype, "supervisoryRoleId", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataSet.prototype, "type", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataSet.prototype, "entryType", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataSet.prototype, "entryView", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataSet.prototype, "monitorType", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataSet.prototype, "monitorView", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataSet.prototype, "reportType", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataSet.prototype, "reportView", void 0);
@@ -168,16 +156,14 @@ __decorate([
     __metadata("design:type", String)
 ], DataSet.prototype, "reportTemplate", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataSet.prototype, "useCase", void 0);
 __decorate([
     (0, typeorm_1.Column)('simple-json', { nullable: true }),
     (0, type_graphql_1.Field)(type => shell_1.ScalarObject, { nullable: true }),
-    __metadata("design:type", typeof (_d = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _d : Object)
+    __metadata("design:type", typeof (_e = typeof shell_1.ScalarObject !== "undefined" && shell_1.ScalarObject) === "function" ? _e : Object)
 ], DataSet.prototype, "partitionKeys", void 0);
 __decorate([
     (0, typeorm_1.Column)('simple-json', { nullable: true }),
@@ -185,16 +171,12 @@ __decorate([
     __metadata("design:type", Array)
 ], DataSet.prototype, "dataItems", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataSet.prototype, "schedule", void 0);
 __decorate([
-    (0, typeorm_1.Column)({
-        nullable: true
-    }),
+    (0, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataSet.prototype, "timezone", void 0);
@@ -209,22 +191,18 @@ __decorate([
     __metadata("design:type", Date)
 ], DataSet.prototype, "updatedAt", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(type => auth_base_1.User, {
-        nullable: true
-    }),
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
-    __metadata("design:type", typeof (_e = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _e : Object)
+    __metadata("design:type", typeof (_f = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _f : Object)
 ], DataSet.prototype, "creator", void 0);
 __decorate([
     (0, typeorm_1.RelationId)((dataSet) => dataSet.creator),
     __metadata("design:type", String)
 ], DataSet.prototype, "creatorId", void 0);
 __decorate([
-    (0, typeorm_1.ManyToOne)(type => auth_base_1.User, {
-        nullable: true
-    }),
+    (0, typeorm_1.ManyToOne)(type => auth_base_1.User, { nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true }),
-    __metadata("design:type", typeof (_f = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _f : Object)
+    __metadata("design:type", typeof (_g = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _g : Object)
 ], DataSet.prototype, "updater", void 0);
 __decorate([
     (0, typeorm_1.RelationId)((dataSet) => dataSet.creator),

package/dist-server/service/data-set/data-set.js.map

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

package/dist-server/service/data-set-history/data-set-history-query.js

@@ -20,6 +20,7 @@ const attachment_base_1 = require("@things-factory/attachment-base");
 const auth_base_1 = require("@things-factory/auth-base");
 const board_service_1 = require("@things-factory/board-service");
 const shell_1 = require("@things-factory/shell");
+const data_set_1 = require("../data-set/data-set");
 const data_set_history_1 = require("./data-set-history");
 const data_set_history_type_1 = require("./data-set-history-type");
 let DataSetHistoryQuery = class DataSetHistoryQuery {
@@ -78,7 +79,8 @@ let DataSetHistoryQuery = class DataSetHistoryQuery {
         const attachment = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
             where: {
                 domain: dataSetHistory.domainId,
-                refBy: `report-${dataSetHistory.originalId}`
+                refType: `${data_set_1.DataSet.name}-report-template`,
+                refBy: dataSetHistory.originalId
             }
         });
         return attachment === null || attachment === void 0 ? void 0 : attachment.path;

package/dist-server/service/data-set-history/data-set-history-query.js.map

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

package/dist-server/service/index.js

@@ -16,7 +16,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.schema = exports.subscribers = exports.entities = void 0;
 const data_item_1 = require("./data-item");
-/* IMPORT ENTITIES AND RESOLVERS */
+const data_key_set_1 = require("./data-key-set");
 const data_ooc_1 = require("./data-ooc");
 const data_sample_1 = require("./data-sample");
 const data_sensor_1 = require("./data-sensor");
@@ -24,6 +24,7 @@ const data_set_1 = require("./data-set");
 const data_set_history_1 = require("./data-set-history");
 const data_spec_1 = require("./data-spec");
 /* EXPORT ENTITY TYPES */
+__exportStar(require("./data-key-set/data-key-set"), exports);
 __exportStar(require("./data-ooc/data-ooc"), exports);
 __exportStar(require("./data-sensor/data-sensor"), exports);
 __exportStar(require("./data-sample/data-sample"), exports);
@@ -33,6 +34,7 @@ __exportStar(require("./data-set/data-item-type"), exports);
 __exportStar(require("./data-spec/data-spec"), exports);
 exports.entities = [
     /* ENTITIES */
+    ...data_key_set_1.entities,
     ...data_item_1.entities,
     ...data_ooc_1.entities,
     ...data_sensor_1.entities,
@@ -48,6 +50,7 @@ exports.subscribers = [
 exports.schema = {
     resolverClasses: [
         /* RESOLVER CLASSES */
+        ...data_key_set_1.resolvers,
         ...data_ooc_1.resolvers,
         ...data_sensor_1.resolvers,
         ...data_sample_1.resolvers,

package/dist-server/service/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA0D;AAC1D,mCAAmC;AACnC,yCAAuF;AACvF,+CAAgG;AAChG,+CAAgG;AAChG,yCAAuF;AACvF,yDAI2B;AAC3B,2CAA0F;AAE1F,yBAAyB;AACzB,sDAAmC;AACnC,4DAAyC;AACzC,4DAAyC;AACzC,sDAAmC;AACnC,sEAAmD;AACnD,4DAAyC;AACzC,wDAAqC;AAExB,QAAA,QAAQ,GAAG;IACtB,cAAc;IACd,GAAG,oBAAgB;IACnB,GAAG,mBAAe;IAClB,GAAG,sBAAkB;IACrB,GAAG,sBAAkB;IACrB,GAAG,mBAAe;IAClB,GAAG,2BAAsB;IACzB,GAAG,oBAAgB;CACpB,CAAA;AAEY,QAAA,WAAW,GAAG;IACzB,iBAAiB;IACjB,GAAG,8BAAyB;CAC7B,CAAA;AAEY,QAAA,MAAM,GAAG;IACpB,eAAe,EAAE;QACf,sBAAsB;QACtB,GAAG,oBAAgB;QACnB,GAAG,uBAAmB;QACtB,GAAG,uBAAmB;QACtB,GAAG,oBAAgB;QACnB,GAAG,4BAAuB;QAC1B,GAAG,qBAAiB;KACrB;CACF,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../server/service/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,2CAA0D;AAC1D,iDAAiG;AACjG,yCAAuF;AACvF,+CAAgG;AAChG,+CAAgG;AAChG,yCAAuF;AACvF,yDAI2B;AAC3B,2CAA0F;AAE1F,yBAAyB;AACzB,8DAA2C;AAC3C,sDAAmC;AACnC,4DAAyC;AACzC,4DAAyC;AACzC,sDAAmC;AACnC,sEAAmD;AACnD,4DAAyC;AACzC,wDAAqC;AAExB,QAAA,QAAQ,GAAG;IACtB,cAAc;IACd,GAAG,uBAAkB;IACrB,GAAG,oBAAgB;IACnB,GAAG,mBAAe;IAClB,GAAG,sBAAkB;IACrB,GAAG,sBAAkB;IACrB,GAAG,mBAAe;IAClB,GAAG,2BAAsB;IACzB,GAAG,oBAAgB;CACpB,CAAA;AAEY,QAAA,WAAW,GAAG;IACzB,iBAAiB;IACjB,GAAG,8BAAyB;CAC7B,CAAA;AAEY,QAAA,MAAM,GAAG;IACpB,eAAe,EAAE;QACf,sBAAsB;QACtB,GAAG,wBAAmB;QACtB,GAAG,oBAAgB;QACnB,GAAG,uBAAmB;QACtB,GAAG,uBAAmB;QACtB,GAAG,oBAAgB;QACnB,GAAG,4BAAuB;QAC1B,GAAG,qBAAiB;KACrB;CACF,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "5.0.1",
+  "version": "5.0.4",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -36,12 +36,12 @@
     "@operato/utils": "^1.0.1",
     "@things-factory/auth-base": "^5.0.1",
     "@things-factory/aws-base": "^5.0.1",
-    "@things-factory/board-service": "^5.0.1",
+    "@things-factory/board-service": "^5.0.2",
     "@things-factory/env": "^5.0.0",
     "@things-factory/shell": "^5.0.1",
     "@things-factory/work-shift": "^5.0.1",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.34"
   },
-  "gitHead": "47225f76058999bb8bb075ac960cfb24f058093f"
+  "gitHead": "53af7004376fb8221cebe0c4c2ff3ed82418c22a"
 }

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

@@ -13,6 +13,17 @@ 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) => {
+    const value = data[key.dataKey]
+    if (value != null) {
+      sum[`key0${index + 1}`] = value instanceof Array ? value[0] : value
+    }
+    return sum
+  }, {})
+}
+
 // parse variable javascript string pattern
 const replaceVariables = (keys, dic) => {
   for (const k in keys) {
@@ -40,18 +51,13 @@ const formatDate = (keys, _moment) => {
 
 export async function createDataSample(
   dataSample: NewDataSample,
-  context: {
-    state: {
-      domain: Domain
-      user: User
-      tx: EntityManager
-    }
-  }
+  context: { state: { domain: Domain; user: User; tx: EntityManager } }
 ): Promise<DataSample> {
   const { domain, user, tx } = context.state
 
   const dataSet = await tx.getRepository(DataSet).findOne({
-    where: { id: dataSample.dataSet.id }
+    where: { id: dataSample.dataSet.id },
+    relations: ['dataKeySet']
   })
 
   const dataItems = dataSet.dataItems
@@ -80,9 +86,9 @@ export async function createDataSample(
   }
 
   partitionKeys = formatDate(partitionKeys, localDateTz)
-  partitionKeys = replaceVariables(partitionKeys, {
-    ...dataSample.data
-  })
+  partitionKeys = replaceVariables(partitionKeys, dataSample.data)
+
+  const dataKeys = fillDataKeys(dataSet?.dataKeySet, dataSample.data)
 
   const { ooc, oos, judgment } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}
   const result = await tx.getRepository(DataSample).save({
@@ -90,6 +96,7 @@ export async function createDataSample(
     description: dataSet.description,
     useCase: dataSet.useCase,
     ...dataSample,
+    ...dataKeys,
     dataSetVersion: dataSet.version,
     domain,
     partitionKeys,
@@ -137,4 +144,4 @@ export async function createDataSample(
   }
 
   return result
-}
+}

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

@@ -0,0 +1,31 @@
+import { Field, InputType, ObjectType } from 'type-graphql'
+
+@ObjectType({ description: 'Entity for DataKeyItem' })
+export class DataKeyItem {
+  @Field()
+  name: string
+
+  @Field({ nullable: true })
+  description?: string
+
+  @Field({ nullable: true })
+  dataKey: string
+
+  @Field({ nullable: true })
+  tKey?: string
+}
+
+@InputType()
+export class DataKeyItemPatch {
+  @Field({ nullable: true })
+  name?: string
+
+  @Field({ nullable: true })
+  description?: string
+
+  @Field({ nullable: true })
+  dataKey?: string
+
+  @Field({ nullable: true })
+  tKey?: string
+}

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

@@ -0,0 +1,198 @@
+import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
+import { getRepository, In } from 'typeorm'
+
+import { createAttachment, deleteAttachmentsByRef } from '@things-factory/attachment-base'
+
+import { DataKeySet } from './data-key-set'
+import { NewDataKeySet, DataKeySetPatch } from './data-key-set-type'
+
+@Resolver(DataKeySet)
+export class DataKeySetMutation {
+  @Directive('@transaction')
+  @Mutation(returns => DataKeySet, { description: 'To create new DataKeySet' })
+  async createDataKeySet(@Arg('dataKeySet') dataKeySet: NewDataKeySet, @Ctx() context: any): Promise<DataKeySet> {
+    const { domain, user, tx } = context.state
+
+    const result = await tx.getRepository(DataKeySet).save({
+      ...dataKeySet,
+      domain,
+      creator: user,
+      updater: user
+    })
+
+    if (dataKeySet.thumbnail) {
+      await createAttachment(
+        null,
+        {
+          attachment: {
+            file: dataKeySet.thumbnail,
+            refType: DataKeySet.name,
+            refBy: result.id
+          }
+        },
+        context
+      )
+    }
+
+    return result
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => DataKeySet, { description: 'To modify DataKeySet information' })
+  async updateDataKeySet(
+    @Arg('id') id: string,
+    @Arg('patch') patch: DataKeySetPatch,
+    @Ctx() context: any
+  ): Promise<DataKeySet> {
+    const { domain, user, tx } = context.state
+
+    const repository = tx.getRepository(DataKeySet)
+    const dataKeySet = await repository.findOne({
+      where: { domain, id }
+    })
+
+    const result = await repository.save({
+      ...dataKeySet,
+      ...patch,
+      updater: user
+    })
+
+    if (patch.thumbnail) {
+      await deleteAttachmentsByRef(null, { refBys: [result.id] }, context)
+      await createAttachment(
+        null,
+        {
+          attachment: {
+            file: patch.thumbnail,
+            refType: DataKeySet.name,
+            refBy: result.id
+          }
+        },
+        context
+      )
+    }
+
+    return result
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => [DataKeySet], { description: "To modify multiple DataKeySets' information" })
+  async updateMultipleDataKeySet(
+    @Arg('patches', type => [DataKeySetPatch]) patches: DataKeySetPatch[],
+    @Ctx() context: any
+  ): Promise<DataKeySet[]> {
+    const { domain, user, tx } = context.state
+
+    let results = []
+    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')
+    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')
+    const dataKeySetRepo = tx.getRepository(DataKeySet)
+
+    if (_createRecords.length > 0) {
+      for (let i = 0; i < _createRecords.length; i++) {
+        const newRecord = _createRecords[i]
+
+        const result = await dataKeySetRepo.save({
+          ...newRecord,
+          domain,
+          creator: user,
+          updater: user
+        })
+
+        if (newRecord.thumbnail) {
+          await createAttachment(
+            null,
+            {
+              attachment: {
+                file: newRecord.thumbnail,
+                refType: DataKeySet.name,
+                refBy: result.id
+              }
+            },
+            context
+          )
+        }
+
+        results.push({ ...result, cuFlag: '+' })
+      }
+    }
+
+    if (_updateRecords.length > 0) {
+      for (let i = 0; i < _updateRecords.length; i++) {
+        const updateRecord = _updateRecords[i]
+        const dataKeySet = await dataKeySetRepo.findOne(updateRecord.id)
+
+        const result = await dataKeySetRepo.save({
+          ...dataKeySet,
+          ...updateRecord,
+          updater: user
+        })
+
+        if (updateRecord.thumbnail) {
+          await deleteAttachmentsByRef(null, { refBys: [result.id] }, context)
+          await createAttachment(
+            null,
+            {
+              attachment: {
+                file: updateRecord.thumbnail,
+                refType: DataKeySet.name,
+                refBy: result.id
+              }
+            },
+            context
+          )
+        }
+
+        results.push({ ...result, cuFlag: 'M' })
+      }
+    }
+
+    return results
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => Boolean, { description: 'To delete DataKeySet' })
+  async deleteDataKeySet(@Arg('id') id: string, @Ctx() context: any): Promise<boolean> {
+    const { domain, tx } = context.state
+
+    await tx.getRepository(DataKeySet).delete({ domain, id })
+    await deleteAttachmentsByRef(null, { refBys: [id] }, context)
+
+    return true
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => Boolean, { description: 'To delete multiple DataKeySets' })
+  async deleteDataKeySets(
+    @Arg('ids', type => [String]) ids: string[],
+    @Ctx() context: any
+  ): Promise<boolean> {
+    const { domain, tx } = context.state
+
+    await tx.getRepository(DataKeySet).delete({
+      domain,
+      id: In(ids)
+    })
+
+    await deleteAttachmentsByRef(null, { refBys: ids }, context)
+
+    return true
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => Boolean, { description: 'To import multiple DataKeySets' })
+  async importDataKeySets(
+    @Arg('dataKeySets', type => [DataKeySetPatch]) dataKeySets: DataKeySetPatch[],
+    @Ctx() context: any
+  ): Promise<boolean> {
+    const { domain, tx } = context.state
+
+    await Promise.all(
+      dataKeySets.map(async (dataKeySet: DataKeySetPatch) => {
+        const createdDataKeySet: DataKeySet = await tx.getRepository(DataKeySet).save({ domain, ...dataKeySet })
+      })
+    )
+
+    return true
+  }
+}