@things-factory/dataset 5.0.11 → 5.0.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "5.0.11",
+  "version": "5.0.12",
   "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": "37cd4feb62e062899cae7029588d86a5d4b4036a"
+  "gitHead": "fc92c5a8449721503a893d67aae8e65ce21a7890"
 }

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