@things-factory/dataset 8.0.0-alpha.5 → 8.0.0-alpha.6

package/helps/dataset/task/issue-collect-data.ja.md

@@ -20,7 +20,7 @@
 
 ## 機能
 
-実行時に、タスクはデータセット ID の存在を確認します。ID が提供されていない場合、タスクはデータセットが見つからないことを示すエラーを投げます。有効なデータセット ID が提供された場合、タスクはそのデータセットに特定のデータ収集活動を発行します。`issueCollectData` によって処理される基本的なプロセスには、データセットの存在の検証、データ収集環境の準備、およびデータセットの構成および関連するデータソースに従ってデータ収集プロセスを開始するなどの操作が含まれます。
+実行時に、タスクはデータセット ID の存在を確認します。ID が提供されていない場合、タスクはデータセットが見つからないことを示すエラーを投げます。有効なデータセット ID が提供された場合、タスクはそのデータセットに特定のデータ収集活動を発行します。`IssueCollectData` によって処理される基本的なプロセスには、データセットの存在の検証、データ収集環境の準備、およびデータセットの構成および関連するデータソースに従ってデータ収集プロセスを開始するなどの操作が含まれます。
 
 タスクは開始された活動のインスタンスを返し、これを使用して進行状況を追跡し、データ収集ワークフローを管理するか、収集したデータを処理するための後続のタスクと統合することができます。
 

package/helps/dataset/task/issue-collect-data.ko.md

@@ -17,7 +17,7 @@
 
 ## 기능
 
-실행 시, 작업은 데이터셋 ID의 존재를 확인합니다. ID가 제공되지 않으면, 데이터셋이 발견되지 않았다는 오류를 발생시킵니다. 유효한 데이터셋 ID가 제공되면, 작업은 해당 데이터셋에 특정한 데이터 수집 활동을 발행합니다. `issueCollectData`에 의해 처리되는 기본 프로세스는 데이터셋의 존재를 확인, 데이터 수집 환경 준비, 데이터셋의 구성 및 관련 데이터 소스에 따라 데이터 수집 프로세스 시작과 같은 작업을 포함합니다.
+실행 시, 작업은 데이터셋 ID의 존재를 확인합니다. ID가 제공되지 않으면, 데이터셋이 발견되지 않았다는 오류를 발생시킵니다. 유효한 데이터셋 ID가 제공되면, 작업은 해당 데이터셋에 특정한 데이터 수집 활동을 발행합니다. `IssueCollectData`에 의해 처리되는 기본 프로세스는 데이터셋의 존재를 확인, 데이터 수집 환경 준비, 데이터셋의 구성 및 관련 데이터 소스에 따라 데이터 수집 프로세스 시작과 같은 작업을 포함합니다.
 
 작업은 시작된 활동의 인스턴스를 반환하며, 이는 진행 상황을 추적하고, 데이터 수집 워크플로를 관리하거나, 수집된 데이터를 처리하기 위한 후속 작업과 통합하는 데 사용할 수 있습니다.
 

package/helps/dataset/task/issue-collect-data.md

@@ -17,7 +17,7 @@ The `IssueCollectData` task is an automated function that triggers a data collec
 
 ## Functionality
 
-Upon execution, the task checks for the presence of a dataset ID. If the ID is not provided, the task will throw an error indicating that no dataset has been found. If a valid dataset ID is provided, the task proceeds to issue a data collection activity specific to that dataset. The underlying process handled by `issueCollectData` involves operations such as validating the dataset's existence, preparing the data collection environment, and initiating the data collection process according to the dataset's configuration and associated data sources.
+Upon execution, the task checks for the presence of a dataset ID. If the ID is not provided, the task will throw an error indicating that no dataset has been found. If a valid dataset ID is provided, the task proceeds to issue a data collection activity specific to that dataset. The underlying process handled by `IssueCollectData` involves operations such as validating the dataset's existence, preparing the data collection environment, and initiating the data collection process according to the dataset's configuration and associated data sources.
 
 The task returns an instance of the activity initiated, which can be used to track the progress, manage the data collection workflow, or integrate with subsequent tasks for processing the collected data.
 

package/helps/dataset/task/issue-collect-data.ms.md

@@ -19,7 +19,7 @@ Tugas `IssueCollectData` adalah fungsi automatik yang memicu proses pengumpulan
 
 ## Fungsi
 
-Saat dieksekusi, tugas memeriksa keberadaan ID set data. Jika ID tidak disediakan, tugas akan melempar kesalahan yang menunjukkan bahwa tidak ada set data yang ditemukan. Jika ID set data yang valid disediakan, tugas melanjutkan untuk mengeluarkan aktiviti pengumpulan data yang spesifik untuk set data tersebut. Proses dasar yang ditangani oleh `issueCollectData` melibatkan operasi seperti validasi keberadaan set data, persiapan lingkungan pengumpulan data, dan memulai proses pengumpulan data sesuai dengan konfigurasi set data dan sumber data terkait.
+Saat dieksekusi, tugas memeriksa keberadaan ID set data. Jika ID tidak disediakan, tugas akan melempar kesalahan yang menunjukkan bahwa tidak ada set data yang ditemukan. Jika ID set data yang valid disediakan, tugas melanjutkan untuk mengeluarkan aktiviti pengumpulan data yang spesifik untuk set data tersebut. Proses dasar yang ditangani oleh `IssueCollectData` melibatkan operasi seperti validasi keberadaan set data, persiapan lingkungan pengumpulan data, dan memulai proses pengumpulan data sesuai dengan konfigurasi set data dan sumber data terkait.
 
 Tugas mengembalikan instansi aktivitas yang dimulai, yang dapat digunakan untuk melacak kemajuan, mengurus alur kerja pengumpulan data, atau mengintegrasikan dengan tugas berikutnya untuk memproses data yang dikumpulkan.
 

package/helps/dataset/task/issue-collect-data.zh.md

@@ -17,7 +17,7 @@
 
 ## 功能
 
-执行时，任务会检查数据集 ID 的存在。如果未提供 ID，则任务会抛出错误，指示未找到数据集。如果提供了有效的数据集 ID，则任务将继续针对该数据集发起数据收集活动。`issueCollectData` 处理的底层过程涉及验证数据集的存在、准备数据收集环境以及根据数据集的配置和关联数据源启动数据收集过程。
+执行时，任务会检查数据集 ID 的存在。如果未提供 ID，则任务会抛出错误，指示未找到数据集。如果提供了有效的数据集 ID，则任务将继续针对该数据集发起数据收集活动。`IssueCollectData` 处理的底层过程涉及验证数据集的存在、准备数据收集环境以及根据数据集的配置和关联数据源启动数据收集过程。
 
 任务返回启动的活动实例，可用于跟踪进度、管理数据收集工作流或与后续任务集成以处理收集的数据。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "8.0.0-alpha.5",
+  "version": "8.0.0-alpha.6",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -42,7 +42,7 @@
     "@operato/utils": "^8.0.0-alpha",
     "@things-factory/auth-base": "^8.0.0-alpha.2",
     "@things-factory/aws-base": "^8.0.0-alpha.2",
-    "@things-factory/board-service": "^8.0.0-alpha.3",
+    "@things-factory/board-service": "^8.0.0-alpha.6",
     "@things-factory/env": "^8.0.0-alpha.0",
     "@things-factory/integration-base": "^8.0.0-alpha.2",
     "@things-factory/organization": "^8.0.0-alpha.5",
@@ -50,11 +50,11 @@
     "@things-factory/scheduler-client": "^8.0.0-alpha.2",
     "@things-factory/shell": "^8.0.0-alpha.2",
     "@things-factory/work-shift": "^8.0.0-alpha.2",
-    "@things-factory/worklist": "^8.0.0-alpha.5",
+    "@things-factory/worklist": "^8.0.0-alpha.6",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.45",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "d226c264ff0d986257cdce930ef26f746d45bd6a"
+  "gitHead": "87d16e1d2c7b53928b468513c94c406afcd5021d"
 }

package/server/controllers/{issue-collect-data.ts → issue-data-collection-task.ts}

@@ -4,8 +4,9 @@ import { Domain, getDataSource } from '@things-factory/shell'
 import { Activity, ActivityInstance, issue } from '@things-factory/worklist'
 
 import { DataSet } from '../service/data-set/data-set'
+import { OrgMemberTargetType } from '@things-factory/organization'
 
-export async function issueCollectData(
+export async function issueDataCollectionTask(
   domainId: string,
   dataSetId: string,
   context: ResolverContext
@@ -23,7 +24,8 @@ export async function issueCollectData(
           id: In([domain.id, domain.parentId].filter(Boolean))
         },
         id: dataSetId
-      }
+      },
+      relations: ['entryRole']
     })
 
     const activity = (await tx.getRepository(Activity).findOneBy({
@@ -32,9 +34,11 @@ export async function issueCollectData(
     })) as Activity
 
     if (activity) {
-      const { assignees } = dataSet
+      const { entryRole } = dataSet
+
+      const assignees = entryRole ? [{ type: OrgMemberTargetType.Role, value: entryRole.id, assignee: entryRole }] : []
 
-      /* 해당 dataset에 대한 데이타 수집 태스크를 dataset assignees에게 할당한다. */
+      /* 해당 dataset에 대한 데이타 수집 태스크를 dataset entryRole에게 할당한다. */
       if (assignees && assignees instanceof Array && assignees.length > 0) {
         const activityInstance = {
           name: `[Data 수집] ${dataSet.name}`,
@@ -57,7 +61,7 @@ export async function issueCollectData(
         return await issue(activityInstance, context)
       } else {
         throw new Error(
-          `Assignees not set. So Data Collect Activity for ${dataSet.name}($dataSet.id) could not be issued.`
+          `Data Entry Role not set. So Data Collect Activity for ${dataSet.name}($dataSet.id) could not be issued.`
         )
       }
     } else {

package/server/engine/task/issue-collect-data.ts

@@ -1,5 +1,5 @@
 import { TaskRegistry, InputStep, Context } from '@things-factory/integration-base'
-import { issueCollectData } from '../../controllers/issue-collect-data'
+import { issueDataCollectionTask } from '../../controllers/issue-data-collection-task'
 import i18next from 'i18next'
 
 async function IssueCollectData(step: InputStep, context: Context) {
@@ -12,7 +12,7 @@ async function IssueCollectData(step: InputStep, context: Context) {
     throw new Error(`no dataset found`)
   }
 
-  const activityInstance = await issueCollectData(domain.id, dataSetId, {
+  const activityInstance = await issueDataCollectionTask(domain.id, dataSetId, {
     t: i18next.t,
     state: {
       domain,

package/server/routes.ts

@@ -8,7 +8,7 @@ import { ScheduleRegisterRequest } from '@things-factory/scheduler-client'
 import { createDataSample } from './controllers/create-data-sample'
 import { renderJasperReport } from './controllers/jasper-report'
 import { renderShinyReport } from './controllers/shiny-report'
-import { issueCollectData } from './controllers/issue-collect-data'
+import { issueDataCollectionTask } from './controllers/issue-data-collection-task'
 import { DataSensor } from './service/data-sensor/data-sensor'
 import { DataSet } from './service/data-set/data-set'
 
@@ -120,7 +120,7 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
       throw new Error(`group(${domainId}) and key(${dataSetId}) properties should not be empty`)
     }
 
-    await issueCollectData(domainId, dataSetId, context)
+    await issueDataCollectionTask(domainId, dataSetId, context)
 
     context.status = 200
   })
@@ -146,7 +146,9 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
         throw new Error(`domain(${domainId}) not found`)
       }
 
-      const dataSet = await tx.getRepository(DataSet).findOne({ where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSetId } })
+      const dataSet = await tx
+        .getRepository(DataSet)
+        .findOne({ where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSetId } })
 
       // do what you gotta do
     })

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

@@ -11,6 +11,7 @@ import { Activity, AssigneeItem, issue } from '@things-factory/worklist'
 import { getDataFinalizeCrontabSchedule } from '../../controllers/finalize-data-collection'
 import { DataSet } from './data-set'
 import { DataSetPatch, NewDataSet } from './data-set-type'
+import { issueDataCollectionTask } from '../../controllers/issue-data-collection-task'
 
 const crypto = require('crypto')
 
@@ -266,7 +267,6 @@ export class DataSetMutation {
     return true
   }
 
-  // @Directive('@privilege(category: "data-set", privilege: "mutation")')
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To issue data-collection task for the given dataset' })
   async issueDataCollection(@Arg('dataSetId') dataSetId: string, @Ctx() context: ResolverContext): Promise<boolean> {
@@ -281,9 +281,8 @@ export class DataSetMutation {
       }
     })
 
-    const { assignees, supervisoryRoleId } = dataSet
+    const { supervisoryRoleId } = dataSet
 
-    // role check
     const me = await getRepository(User, tx).findOne({
       where: { id: user.id },
       relations: ['roles']
@@ -293,41 +292,9 @@ export class DataSetMutation {
       throw new Error(`You don't have permission to issue data collection task for this dataset.`)
     }
 
-    const activity = (await getRepository(Activity, tx).findOneBy({
-      domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
-      name: 'Collect Data'
-    })) as Activity
-
-    if (activity) {
-      /* 해당 dataset에 대한 데이타 수집 태스크를 dataset assignees에게 할당한다. */
-      if (assignees && assignees instanceof Array && assignees.length > 0) {
-        const activityInstance = {
-          name: `[Data 수집] ${dataSet.name}`,
-          description: dataSet.description,
-          activityId: activity.id,
-          dueAt: new Date(Date.now() + 24 * 60 * 60 * 1000),
-          input: {
-            dataSetId: dataSet.id,
-            dataSetName: dataSet.name
-          },
-          assignees
-        }
-
-        context.state = {
-          ...context.state,
-          domain,
-          tx
-        }
+    const activityInstance = await issueDataCollectionTask(domain.id, dataSet.id, context)
 
-        await issue(activityInstance, context)
-      } else {
-        throw new Error(
-          `Assignees not set. So Data Collect Activity for ${dataSet.name}($dataSet.id) could not be issued.`
-        )
-      }
-    }
-
-    return true
+    return !!activityInstance
   }
 
   @Directive('@transaction')

package/dist-server/controllers/issue-collect-data.d.ts

@@ -1,2 +0,0 @@
-import { ActivityInstance } from '@things-factory/worklist';
-export declare function issueCollectData(domainId: string, dataSetId: string, context: ResolverContext): Promise<ActivityInstance | void>;

package/dist-server/controllers/issue-collect-data.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"issue-collect-data.js","sourceRoot":"","sources":["../../server/controllers/issue-collect-data.ts"],"names":[],"mappings":";;AAOA,4CA2DC;AAlED,qCAA4B;AAE5B,iDAA6D;AAC7D,uDAA4E;AAE5E,2DAAsD;AAE/C,KAAK,UAAU,gBAAgB,CACpC,QAAgB,EAChB,SAAiB,EACjB,OAAwB;IAExB,MAAM,IAAA,qBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;QAC3C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,cAAM,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;QAEzE,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,KAAK,CAAC,UAAU,QAAQ,aAAa,CAAC,CAAA;QAClD,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,kBAAO,CAAC,CAAC,OAAO,CAAC;YACtD,KAAK,EAAE;gBACL,MAAM,EAAE;oBACN,EAAE,EAAE,IAAA,YAAE,EAAC,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;iBACrD;gBACD,EAAE,EAAE,SAAS;aACd;SACF,CAAC,CAAA;QAEF,MAAM,QAAQ,GAAG,CAAC,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,SAAS,CAAC;YAC3D,MAAM,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE;YAChE,IAAI,EAAE,cAAc;SACrB,CAAC,CAAa,CAAA;QAEf,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAA;YAE7B,0DAA0D;YAC1D,IAAI,SAAS,IAAI,SAAS,YAAY,KAAK,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpE,MAAM,gBAAgB,GAAG;oBACvB,IAAI,EAAE,aAAa,OAAO,CAAC,IAAI,EAAE;oBACjC,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,UAAU,EAAE,QAAQ,CAAC,EAAE;oBACvB,KAAK,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;oBACjD,KAAK,EAAE;wBACL,SAAS,EAAE,OAAO,CAAC,EAAE;wBACrB,WAAW,EAAE,OAAO,CAAC,IAAI;qBAC1B;oBACD,SAAS;iBACV,CAAA;gBAED,OAAO,CAAC,KAAK,mCACR,OAAO,CAAC,KAAK,KAChB,MAAM;oBACN,EAAE,GACH,CAAA;gBAED,OAAO,MAAM,IAAA,gBAAK,EAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;YAC/C,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CACb,mDAAmD,OAAO,CAAC,IAAI,oCAAoC,CACpG,CAAA;YACH,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,KAAK,CAAC,yCAAyC,CAAC,CAAA;QAC5D,CAAC;IACH,CAAC,CAAC,CAAA;AACJ,CAAC","sourcesContent":["import { In } from 'typeorm'\n\nimport { Domain, getDataSource } from '@things-factory/shell'\nimport { Activity, ActivityInstance, issue } from '@things-factory/worklist'\n\nimport { DataSet } from '../service/data-set/data-set'\n\nexport async function issueCollectData(\n  domainId: string,\n  dataSetId: string,\n  context: ResolverContext\n): Promise<ActivityInstance | void> {\n  await getDataSource().transaction(async tx => {\n    const domain = await tx.getRepository(Domain).findOneBy({ id: domainId })\n\n    if (!domain) {\n      throw new Error(`domain(${domainId}) not found`)\n    }\n\n    const dataSet = await tx.getRepository(DataSet).findOne({\n      where: {\n        domain: {\n          id: In([domain.id, domain.parentId].filter(Boolean))\n        },\n        id: dataSetId\n      }\n    })\n\n    const activity = (await tx.getRepository(Activity).findOneBy({\n      domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },\n      name: 'Collect Data'\n    })) as Activity\n\n    if (activity) {\n      const { assignees } = dataSet\n\n      /* 해당 dataset에 대한 데이타 수집 태스크를 dataset assignees에게 할당한다. */\n      if (assignees && assignees instanceof Array && assignees.length > 0) {\n        const activityInstance = {\n          name: `[Data 수집] ${dataSet.name}`,\n          description: dataSet.description,\n          activityId: activity.id,\n          dueAt: new Date(Date.now() + 24 * 60 * 60 * 1000),\n          input: {\n            dataSetId: dataSet.id,\n            dataSetName: dataSet.name\n          },\n          assignees\n        }\n\n        context.state = {\n          ...context.state,\n          domain,\n          tx\n        }\n\n        return await issue(activityInstance, context)\n      } else {\n        throw new Error(\n          `Assignees not set. So Data Collect Activity for ${dataSet.name}($dataSet.id) could not be issued.`\n        )\n      }\n    } else {\n      throw new Error(`Data Collect Activity is not installed.`)\n    }\n  })\n}\n"]}