@things-factory/dataset 6.0.49 → 6.0.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.49",
+  "version": "6.0.51",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -39,13 +39,13 @@
     "@things-factory/aws-base": "^6.0.49",
     "@things-factory/board-service": "^6.0.49",
     "@things-factory/env": "^6.0.49",
-    "@things-factory/organization": "^6.0.49",
+    "@things-factory/organization": "^6.0.50",
     "@things-factory/scheduler-client": "^6.0.49",
     "@things-factory/shell": "^6.0.49",
     "@things-factory/work-shift": "^6.0.49",
-    "@things-factory/worklist": "^6.0.49",
+    "@things-factory/worklist": "^6.0.51",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "e107d6f692d008add950e000d2653bcbbd711a24"
+  "gitHead": "c5e471014d7cdca7f5a9f75fc1da97c152782947"
 }

package/server/activities/activity-data-collect.ts

@@ -12,9 +12,8 @@ async function callback(activityInstance: ActivityInstance, context: ResolverCon
       name: 'Collect Data'
     })) as Activity
 
-    /* collect-data 액티비티는 한명의 assignee(thread)만 수행하도록 한다. 따라서, output 중에서 샘플 한개만을 data로 취한다. */
-    const assignees = Object.keys(output)
-    const data = assignees.length > 0 && output[assignees[0]]
+    /* collect-data 액티비티는 한명의 assignee(thread)만 수행하는 multiple: false 액티비티이다. 따라서, output에는 assignee key가 없이, 순수한 data만 들어있다. */
+    const data = output
 
     if (activity) {
       const dataSample: NewDataSample = {
@@ -47,7 +46,8 @@ export const ActivityDataCollect = {
       tKey: 'data-set-name'
     }
   ],
-  startable: false,
+  startingType: '',
+  multiple: 'single',
   model: [
     {
       name: 'dataSetId',

package/server/activities/activity-ooc-resolve.ts

@@ -24,9 +24,7 @@ async function callback(activityInstance: ActivityInstance, context: ResolverCon
     const corrector = activityThreads[0]?.assignee
 
     const { dataOocId } = input
-    const correctiveAction = Object.values(output)
-      .map((o: any) => o.action)
-      .join('\n')
+    const correctiveAction = output.action
 
     var dataOoc = await tx.getRepository(DataOoc).findOne({
       where: {
@@ -64,7 +62,8 @@ export const ActivityOocResolve = {
       tKey: 'data-ooc-id'
     }
   ],
-  startable: false,
+  startingType: '',
+  multiple: 'single',
   model: [
     {
       name: 'dataOocId',

package/server/activities/activity-ooc-review.ts

@@ -14,9 +14,7 @@ async function callback(activityInstance: ActivityInstance, context: ResolverCon
 
     if (activity) {
       const { dataOocId } = input
-      const correctiveInstruction = Object.values(output)
-        .map((o: any) => o.instruction)
-        .join('\n')
+      const correctiveInstruction = output.instruction
 
       var dataOoc = await tx.getRepository(DataOoc).findOne({
         where: {
@@ -42,8 +40,8 @@ async function callback(activityInstance: ActivityInstance, context: ResolverCon
       if (assignees && assignees instanceof Array && assignees.length > 0) {
         const activityInstance = {
           name: `[OOC 조치] ${dataSet.name}`,
+          description: dataSet.description,
           activityId: activity.id,
-          description: `Data OOC occurred on '${dataSet.name}'`,
           dueAt: new Date(terminatedAt.getTime() + 24 * 60 * 60 * 1000),
           input: {
             dataOocId,
@@ -81,7 +79,8 @@ export const ActivityOocReview = {
       tKey: 'data-ooc-id'
     }
   ],
-  startable: false,
+  startingType: '',
+  multiple: 'single',
   model: [
     {
       name: 'dataOocId',

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

@@ -144,8 +144,8 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
       if (assignees && assignees instanceof Array && assignees.length > 0) {
         const activityInstance = {
           name: `[OOC 검토] ${dataSet.name}`,
+          description: dataSet.description,
           activityId: activity.id,
-          description: `Data OOC occurred on '${dataSet.name}'`,
           dueAt: new Date(collectedAt.getTime() + 24 * 60 * 60 * 1000),
           input: {
             dataOocId: dataOoc.id

package/server/routes.ts

@@ -115,8 +115,8 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
         if (assignees && assignees instanceof Array && assignees.length > 0) {
           const activityInstance = {
             name: `[Data 수집] ${dataSet.name}`,
+            description: dataSet.description,
             activityId: activity.id,
-            description: `Data Collect for '${dataSet.name}'`,
             dueAt: new Date(Date.now() + 24 * 60 * 60 * 1000),
             input: {
               dataSetId: dataSet.id,