@things-factory/dataset 6.2.58 → 6.2.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.2.58",
+  "version": "6.2.59",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -51,5 +51,5 @@
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "decd44e000e44941409b829d72e99c49cb1829bf"
+  "gitHead": "44f0d0609b8db32e387059256d3852c8ec4856ee"
 }

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

@@ -229,8 +229,7 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
             dataOocId: dataOoc.id
           },
           assignees,
-          approvalLine: [],
-          outlierApprovalLine: []
+          approvalLine: []
         }
 
         await issue(activityInstance, context)
@@ -275,7 +274,7 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
 
       const assignees = dataSet.supervisoryRoleId ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }] : []
 
-      /* 해당 dataset의 supervisor로 하여금, OOC를 리뷰하고 instruction을 작성해서, OOC 해결을 위한 태스크를 dataset assignees에게 지시하도록 한다. */
+      /* 해당 dataset의 supervisor로 하여금, data를 리뷰하고 instruction을 작성해서, approvalLine을 이용 해서 승인을 한다. */
       if (assignees && assignees instanceof Array && assignees.length > 0) {
         result.dataItems = dataItems
         const activityInstance = {
@@ -287,11 +286,30 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
             dataSample: result
           },
           assignees,
-          approvalLine: [],
-          outlierApprovalLine: []
+          approvalLine: dataSet.reviewApprovalLine
         }
 
         await issue(activityInstance, context)
+
+        try {
+          pubsub.publish('data-set', {
+            dataSet,
+            supervisoryRoleId: dataSet.supervisoryRoleId
+          })
+    
+          pubsub.publish('notification', {
+            notification: {
+              domain,
+              type: 'info',
+              title: `[Data Review] ${dataSet.name}`,
+              body: `Data Review occurred on '${dataSet.name}'`,
+              url: getRedirectSubdomainPath(context, domain.subdomain, `/data-set/${dataSet.id}`),
+              timestamp: collectedAt
+            }
+          })
+        } catch (err) {
+          logger.error('Notification', err)
+        }
       } else {
         console.error(
           `Assignees are not set. So Data Review task for ${dataSet.name}(${dataSet.id}) could not be issued.`
@@ -300,26 +318,6 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
     } else {
       console.error('Data Review Activity not installed.')
     }
-
-    try {
-      pubsub.publish('data-set', {
-        dataSet,
-        supervisoryRoleId: dataSet.supervisoryRoleId
-      })
-
-      pubsub.publish('notification', {
-        notification: {
-          domain,
-          type: 'info',
-          title: `[Data Review] ${dataSet.name}`,
-          body: `Data Review occurred on '${dataSet.name}'`,
-          url: getRedirectSubdomainPath(context, domain.subdomain, `/data-set/${dataSet.id}`),
-          timestamp: collectedAt
-        }
-      })
-    } catch (err) {
-      logger.error('Notification', err)
-    }
   }
 
   return result