@things-factory/dataset 7.0.0-alpha.8 → 7.0.0

package/dist-server/utils/config-resolver.d.ts

@@ -0,0 +1 @@
+export declare function getEndpointUrl(endpoint: any, subpath?: string): string;

package/dist-server/utils/config-resolver.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEndpointUrl = void 0;
+exports.getEndpointUrl = getEndpointUrl;
 function getEndpointUrl(endpoint, subpath = '') {
     const { url = '', protocol = 'http', host = '', port = 80 } = endpoint;
     let _url = '';
@@ -29,5 +29,4 @@ function getEndpointUrl(endpoint, subpath = '') {
     }
     return _protocol + '://' + _url.split('/').concat(subpath.split('/')).filter(x => x).join('/');
 }
-exports.getEndpointUrl = getEndpointUrl;
 //# sourceMappingURL=config-resolver.js.map

package/dist-server/utils/config-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-resolver.js","sourceRoot":"","sources":["../../server/utils/config-resolver.ts"],"names":[],"mappings":";;;AACA,SAAgB,cAAc,CAAC,QAAY,EAAE,UAAe,EAAE;IAC1D,MAAM,EAAE,GAAG,GAAC,EAAE,EAAE,QAAQ,GAAC,MAAM,EAAE,IAAI,GAAC,EAAE,EAAE,IAAI,GAAC,EAAE,EAAE,GAAG,QAAQ,CAAA;IAE9D,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,IAAI,SAAS,GAAG,QAAQ,CAAA;IAExB,IAAI,GAAG,EAAE;QACL,IAAI,GAAG,GAAG,CAAA;KACb;SAAM;QACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC/B,yBAAyB;QACzB,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;YACnB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACtB,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACpB,qBAAqB;YACrB,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC/B,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnB,IAAI,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;aACrC;iBAAM;gBACH,IAAI,GAAG,GAAG,KAAK,IAAI,IAAI,EAAE,CAAA;aAC5B;SACJ;aAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE;YAC1B,IAAI,GAAG,GAAG,IAAI,IAAI,IAAI,EAAE,CAAA;SAC3B;KACJ;IAED,OAAO,SAAS,GAAG,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAChG,CAAC;AA3BD,wCA2BC","sourcesContent":["\nexport function getEndpointUrl(endpoint:any, subpath:string=''):string {\n    const { url='', protocol='http', host='', port=80 } = endpoint\n    \n    let _url = ''\n    let _protocol = protocol\n\n    if (url) {\n        _url = url\n    } else {\n        const hosts = host.split('://')\n        // host에 protocol을 포함한 경우\n        if (hosts.length == 2) {\n            const _host = hosts[1]\n            _protocol = hosts[0]\n            // host에 port를 포함한 경우\n            const _hosts = _host.split(':')\n            if (_hosts.length > 1) {\n                _url = `${_hosts[0]}:${_hosts[1]}`\n            } else {\n                _url = `${_host}:${port}`\n            }\n        } else if (hosts.length == 1) { \n            _url = `${host}:${port}`\n        }\n    }\n\n    return _protocol + '://' + _url.split('/').concat(subpath.split('/')).filter(x=>x).join('/')\n}\n"]}
+{"version":3,"file":"config-resolver.js","sourceRoot":"","sources":["../../server/utils/config-resolver.ts"],"names":[],"mappings":";;AACA,wCA2BC;AA3BD,SAAgB,cAAc,CAAC,QAAY,EAAE,UAAe,EAAE;IAC1D,MAAM,EAAE,GAAG,GAAC,EAAE,EAAE,QAAQ,GAAC,MAAM,EAAE,IAAI,GAAC,EAAE,EAAE,IAAI,GAAC,EAAE,EAAE,GAAG,QAAQ,CAAA;IAE9D,IAAI,IAAI,GAAG,EAAE,CAAA;IACb,IAAI,SAAS,GAAG,QAAQ,CAAA;IAExB,IAAI,GAAG,EAAE,CAAC;QACN,IAAI,GAAG,GAAG,CAAA;IACd,CAAC;SAAM,CAAC;QACJ,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;QAC/B,yBAAyB;QACzB,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YACpB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACtB,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;YACpB,qBAAqB;YACrB,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC/B,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACpB,IAAI,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAA;YACtC,CAAC;iBAAM,CAAC;gBACJ,IAAI,GAAG,GAAG,KAAK,IAAI,IAAI,EAAE,CAAA;YAC7B,CAAC;QACL,CAAC;aAAM,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;YAC3B,IAAI,GAAG,GAAG,IAAI,IAAI,IAAI,EAAE,CAAA;QAC5B,CAAC;IACL,CAAC;IAED,OAAO,SAAS,GAAG,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA,EAAE,CAAA,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AAChG,CAAC","sourcesContent":["\nexport function getEndpointUrl(endpoint:any, subpath:string=''):string {\n    const { url='', protocol='http', host='', port=80 } = endpoint\n    \n    let _url = ''\n    let _protocol = protocol\n\n    if (url) {\n        _url = url\n    } else {\n        const hosts = host.split('://')\n        // host에 protocol을 포함한 경우\n        if (hosts.length == 2) {\n            const _host = hosts[1]\n            _protocol = hosts[0]\n            // host에 port를 포함한 경우\n            const _hosts = _host.split(':')\n            if (_hosts.length > 1) {\n                _url = `${_hosts[0]}:${_hosts[1]}`\n            } else {\n                _url = `${_host}:${port}`\n            }\n        } else if (hosts.length == 1) { \n            _url = `${host}:${port}`\n        }\n    }\n\n    return _protocol + '://' + _url.split('/').concat(subpath.split('/')).filter(x=>x).join('/')\n}\n"]}

package/dist-server/utils/index.d.ts

@@ -0,0 +1 @@
+export * from './config-resolver';

package/helps/dataset/data-sensor.md

@@ -1,11 +1,14 @@
 # DataSensor
+
 데이타 센서를 등록하고 조회합니다.<br>
+
 - 이름: 데이타 센서 이름을 설정합니다.<br>
 - 설명: 데이타 센서에 대한 설명을 설정합니다.<br>
 - 활성화: 사용 여부를 설정합니다. 비활성화된 센서 데이타는 데이타 샘플로 저장하지 않습니다.<br>
 - 디바이스 아이디: 유일한 센서의 아이디를 설정합니다 <br>
 - 태그이름: (deprecated 검토 중)<br>
 - 어플라이언스: 데이타 등록 권한을 가진 어플라이언스를 설정합니다.<br>
+- 디코더 시나리오: 외부에서 받은 데이터를 시나리오를 지정하여 parsing후, 시나리오의 마지막 결과 Key를 'data'로 지정하여 data 필드에 데이터를 쌓습니다.</br>
 - 데이터셋: 해당 센서 데이터에 반영할 데이터셋을 설정합니다. <br>
 - 모델: 센서 모델 정보를 설정합니다.<br>
 - 브랜드: 센서 브랜드를 설정합니다.<br>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "7.0.0-alpha.8",
+  "version": "7.0.0",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,33 +27,34 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@material/mwc-fab": "^0.27.0",
-    "@material/mwc-icon": "^0.27.0",
-    "@operato/app": "^2.0.0-alpha.0",
-    "@operato/data-grist": "^2.0.0-alpha.0",
-    "@operato/dataset": "^2.0.0-alpha.0",
-    "@operato/ghost-print": "^2.0.0-alpha.0",
-    "@operato/graphql": "^2.0.0-alpha.0",
-    "@operato/grist-editor": "^2.0.0-alpha.0",
-    "@operato/i18n": "^2.0.0-alpha.0",
-    "@operato/layout": "^2.0.0-alpha.0",
-    "@operato/shell": "^2.0.0-alpha.0",
-    "@operato/styles": "^2.0.0-alpha.0",
-    "@operato/utils": "^2.0.0-alpha.0",
-    "@things-factory/auth-base": "^7.0.0-alpha.8",
-    "@things-factory/aws-base": "^7.0.0-alpha.8",
-    "@things-factory/board-service": "^7.0.0-alpha.8",
-    "@things-factory/env": "^7.0.0-alpha.0",
-    "@things-factory/integration-base": "^7.0.0-alpha.8",
-    "@things-factory/organization": "^7.0.0-alpha.8",
-    "@things-factory/scheduler-client": "^7.0.0-alpha.8",
-    "@things-factory/shell": "^7.0.0-alpha.8",
-    "@things-factory/work-shift": "^7.0.0-alpha.8",
-    "@things-factory/worklist": "^7.0.0-alpha.8",
+    "@operato/app": "^7.0.0",
+    "@operato/data-grist": "^7.0.0",
+    "@operato/dataset": "^7.0.0",
+    "@operato/ghost-print": "^7.0.0",
+    "@operato/graphql": "^7.0.0",
+    "@operato/grist-editor": "^7.0.0",
+    "@operato/i18n": "^7.0.0",
+    "@operato/layout": "^7.0.0",
+    "@operato/moment-timezone-es": "^7.0.0",
+    "@operato/p13n": "^7.0.0",
+    "@operato/shell": "^7.0.0",
+    "@operato/styles": "^7.0.0",
+    "@operato/utils": "^7.0.0",
+    "@things-factory/auth-base": "^7.0.0",
+    "@things-factory/aws-base": "^7.0.0",
+    "@things-factory/board-service": "^7.0.0",
+    "@things-factory/env": "^7.0.0",
+    "@things-factory/integration-base": "^7.0.0",
+    "@things-factory/organization": "^7.0.0",
+    "@things-factory/personalization": "^7.0.0",
+    "@things-factory/scheduler-client": "^7.0.0",
+    "@things-factory/shell": "^7.0.0",
+    "@things-factory/work-shift": "^7.0.0",
+    "@things-factory/worklist": "^7.0.0",
     "cron-parser": "^4.3.0",
-    "moment-timezone": "^0.5.40",
+    "moment-timezone": "^0.5.45",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "b4981ea2721e7eaf4dbd618b6c77316ebc000ee5"
+  "gitHead": "00f3917ca132679e3571f3f4fd16f4caf84f488e"
 }

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

@@ -1,3 +1,4 @@
+import { In } from 'typeorm'
 import { Activity, ActivityInstance, ActivityInstanceStatus, UpdateActivityInstanceStateAddendum } from '@things-factory/worklist'
 import { issue } from '@things-factory/worklist/dist-server/controllers/activity-instance/issue'
 
@@ -10,7 +11,7 @@ async function callback(activityInstance: ActivityInstance, addendum: UpdateActi
 
   if (state == ActivityInstanceStatus.Ended) {
     const activity = (await tx.getRepository(Activity).findOneBy({
-      domain: { id: domain.id },
+      domain: domain.parentId ? In([domain.id, domain.parentId]) : { id: domain.id },
       name: 'OOC Resolve'
     })) as Activity
 

package/server/activities/index.ts

@@ -7,5 +7,5 @@ import { ActivityOocReview } from './activity-ooc-review'
 
 /* activity templates installation */
 ;[ActivityOocReview, ActivityOocResolve, ActivityDataCollect, ActivityDataReview].forEach(template => {
-  ActivityInstallations.installActivityTemplate(template)
+  ActivityInstallations.installActivityTemplate(template as any)
 })

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

@@ -19,7 +19,7 @@ import { DataUseCase } from './data-use-case'
 // See README.md at ## Data Samples
 process.env.TZ = 'UTC'
 
-const fillDataKeys = (dataKeySet, data) => {
+const fillDataKeys = (dataKeySet, data = {}) => {
   const keys = dataKeySet?.dataKeyItems || []
   return keys.reduce((sum, key, index) => {
     const value = data[key.dataKey]
@@ -63,7 +63,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
     relations: ['dataKeySet']
   })
 
-  const { dataItems, tag: publishTag, normalScenarioId, outlierScenarioId } = dataSet
+  const { dataItems = [], tag: publishTag, normalScenarioId, outlierScenarioId } = dataSet
   const collectedAt = newDataSample.collectedAt || new Date()
 
   const timezone = dataSet.timezone || domain.timezone || 'UTC'
@@ -221,33 +221,38 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
     if (outlierScenarioId) {
       const scenario = await tx.getRepository(Scenario).findOne({
         where: {
-          domain: { id: domain.id },
+          domain: domain.parentId ? { id: In([domain.id, domain.parentId]) } : { id: domain.id },
           id: outlierScenarioId
         },
         relations: ['domain', 'steps', 'updater']
       })
 
       if (scenario) {
-        scenario.start(scenario.name + ':' + dataSet.name + ':' + dataSample.id, {
-          dataOocId: dataOoc.id,
-          dataSampleId: dataSample.id,
-          dataSet: dataSet.id,
-          data,
-          ooc,
-          oos,
-          judgment,
-          collectedAt,
-          workDate,
-          workShift,
-          domain: {
-            id: domain.id,
-            subdomain: domain.subdomain,
-            name: domain.name
-          },
-          updator: {
-            id: user.id,
-            email: user.email,
-            name: user.name
+        scenario.start({
+          instanceName: scenario.name + ':' + dataSet.name + ':' + dataSample.id,
+          domain,
+          user,
+          variables: {
+            dataOocId: dataOoc.id,
+            dataSampleId: dataSample.id,
+            dataSet: dataSet.id,
+            data,
+            ooc,
+            oos,
+            judgment,
+            collectedAt,
+            workDate,
+            workShift,
+            domain: {
+              id: domain.id,
+              subdomain: domain.subdomain,
+              name: domain.name
+            },
+            updator: {
+              id: user.id,
+              email: user.email,
+              name: user.name
+            }
           }
         })
       } else {
@@ -256,12 +261,14 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
     }
 
     const activity = (await tx.getRepository(Activity).findOneBy({
-      domain: { id: domain.id },
+      domain: domain.parentId ? { id: In([domain.id, domain.parentId]) } : { id: domain.id },
       name: 'OOC Review'
     })) as Activity
 
     if (activity) {
-      const assignee = dataSet.supervisoryRoleId && (await tx.getRepository(Role).findOneBy({ domain: { id: domain.id }, id: dataSet.supervisoryRoleId }))
+      const assignee =
+        dataSet.supervisoryRoleId &&
+        (await tx.getRepository(Role).findOneBy({ domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSet.supervisoryRoleId }))
 
       const assignees = dataSet.supervisoryRoleId ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }] : []
 
@@ -279,13 +286,15 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
           approvalLine: []
         }
 
-        dataOoc.reviewActivityInstance = await issue(activityInstance, context)
+        dataOoc.reviewActivityInstance = await issue(activityInstance as any, context)
         await tx.getRepository(DataOoc).save(dataOoc)
       } else {
-        console.error(`Assignees are not set. So Data OOC Review task for ${dataOoc.name}(${dataOoc.id}) could not be issued.`)
+        console.error(
+          `Assignees are not set. So Data OOC Review task for ${dataOoc.name}(${dataOoc.id}) could not be issued.`
+        )
       }
     } else {
-      console.error('OOC Review Activity not installed.')
+      console.warn('OOC Review Activity not installed.')
     }
 
     try {
@@ -311,32 +320,37 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
     if (normalScenarioId) {
       const scenario = await tx.getRepository(Scenario).findOne({
         where: {
-          domain: { id: domain.id },
+          domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
           id: normalScenarioId
         },
         relations: ['domain', 'steps', 'updater']
       })
 
       if (scenario) {
-        scenario.start(scenario.name + ':' + dataSet.name + ':' + dataSample.id, {
-          dataSampleId: dataSample.id,
-          dataSet: dataSet.id,
-          data,
-          ooc,
-          oos,
-          judgment,
-          collectedAt,
-          workDate,
-          workShift,
-          domain: {
-            id: domain.id,
-            subdomain: domain.subdomain,
-            name: domain.name
-          },
-          updator: {
-            id: user.id,
-            email: user.email,
-            name: user.name
+        scenario.start({
+          instanceName: scenario.name + ':' + dataSet.name + ':' + dataSample.id, 
+          domain,
+          user,
+          variables: {
+            dataSampleId: dataSample.id,
+            dataSet: dataSet.id,
+            data,
+            ooc,
+            oos,
+            judgment,
+            collectedAt,
+            workDate,
+            workShift,
+            domain: {
+              id: domain.id,
+              subdomain: domain.subdomain,
+              name: domain.name
+            },
+            updator: {
+              id: user.id,
+              email: user.email,
+              name: user.name
+            }
           }
         })
       } else {
@@ -346,14 +360,18 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
 
     if (dataSet.requiresReview) {
       const activity = (await tx.getRepository(Activity).findOneBy({
-        domain: { id: domain.id },
+        domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
         name: 'Data Review'
       })) as Activity
 
       if (activity) {
-        const assignee = dataSet.supervisoryRoleId && (await tx.getRepository(Role).findOneBy({ domain: { id: domain.id }, id: dataSet.supervisoryRoleId }))
+        const assignee =
+          dataSet.supervisoryRoleId &&
+          (await tx.getRepository(Role).findOneBy({ domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSet.supervisoryRoleId }))
 
-        const assignees = dataSet.supervisoryRoleId ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }] : []
+        const assignees = dataSet.supervisoryRoleId
+          ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }]
+          : []
 
         /* 해당 dataset의 supervisor로 하여금, data를 리뷰하고 instruction을 작성해서, approvalLine을 이용해서 승인을 한다. */
         if (assignees && assignees instanceof Array && assignees.length > 0) {
@@ -370,7 +388,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
             approvalLine: dataSet.reviewApprovalLine
           }
 
-          dataSample.reviewActivityInstance = await issue(activityInstance, context)
+          dataSample.reviewActivityInstance = await issue(activityInstance as any, context)
           await tx.getRepository(DataSample).save(dataSample)
 
           try {
@@ -388,7 +406,9 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
             logger.error('Notification', err)
           }
         } else {
-          console.error(`Assignees are not set. So Data Review task for ${dataSet.name}(${dataSet.id}) could not be issued.`)
+          console.error(
+            `Assignees are not set. So Data Review task for ${dataSet.name}(${dataSet.id}) could not be issued.`
+          )
         }
       } else {
         console.error('Data Review Activity not installed.')

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

@@ -5,7 +5,11 @@ import { Activity, ActivityInstance, issue } from '@things-factory/worklist'
 
 import { DataSet } from '../service/data-set/data-set'
 
-export async function issueCollectData(domainId: string, dataSetId: string, context: ResolverContext): Promise<ActivityInstance> {
+export async function issueCollectData(
+  domainId: string,
+  dataSetId: string,
+  context: ResolverContext
+): Promise<ActivityInstance | void> {
   await getDataSource().transaction(async tx => {
     const domain = await tx.getRepository(Domain).findOneBy({ id: domainId })
 
@@ -23,7 +27,7 @@ export async function issueCollectData(domainId: string, dataSetId: string, cont
     })
 
     const activity = (await tx.getRepository(Activity).findOneBy({
-      domain: { id: domain.id },
+      domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
       name: 'Collect Data'
     })) as Activity
 
@@ -52,7 +56,9 @@ export async function issueCollectData(domainId: string, dataSetId: string, cont
 
         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.`)
+        throw new Error(
+          `Assignees not set. So Data Collect Activity for ${dataSet.name}($dataSet.id) could not be issued.`
+        )
       }
     } else {
       throw new Error(`Data Collect Activity is not installed.`)

package/server/engine/task/create-data-sample.ts

@@ -6,11 +6,18 @@ import i18next from 'i18next'
 import { DataSet } from '../../service/data-set/data-set'
 
 import { createDataSample } from '../../controllers/create-data-sample'
+import { TaskHandler } from '@things-factory/integration-base/dist-server/engine/types'
 
 async function CreateDataSample(step: InputStep, context: Context) {
-  const { logger, data, domain, user, lng } = context
+  const { data, domain, user, lng } = context
   var {
-    params: { dataset: dataSetId, source: sourceAccessor, rawData: rawDataAccessor, data: dataAccessor, timestamp }
+    params: {
+      dataset: dataSetId,
+      source: sourceAccessor,
+      rawData: rawDataAccessor,
+      data: dataAccessor,
+      timestamp: timestampAccessor
+    }
   } = step
 
   if (!dataSetId) {
@@ -18,7 +25,7 @@ async function CreateDataSample(step: InputStep, context: Context) {
   }
 
   // make new data-sample
-  await getDataSource().transaction(async tx => {
+  return await getDataSource().transaction(async tx => {
     const dataSet = await tx.getRepository(DataSet).findOne({
       where: {
         id: dataSetId
@@ -28,6 +35,7 @@ async function CreateDataSample(step: InputStep, context: Context) {
     var source = await access(sourceAccessor, data)
     var extractedData = await access(dataAccessor, data)
     var extractedRawData = rawDataAccessor && (await access(rawDataAccessor, data))
+    var timestamp = timestampAccessor && (await access(timestampAccessor, data))
 
     const dataSample = await createDataSample(
       {
@@ -89,4 +97,4 @@ CreateDataSample.parameterSpec = [
 CreateDataSample.connectorFree = true
 CreateDataSample.help = 'dataset/task/create-data-sample'
 
-TaskRegistry.registerTaskHandler('create-data-sample', CreateDataSample)
+TaskRegistry.registerTaskHandler('create-data-sample', CreateDataSample as TaskHandler)

package/server/routes.ts

@@ -47,20 +47,24 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
         throw new Error(`Appliance of the sensor given deviceId(${deviceId}) is not set up`)
       }
 
-      // if (!sensor.dataSet) {
-      //   throw new Error(`DataSet of the sensor given deviceId(${deviceId}) is not set up`)
-      // }
-
       const domain = sensor.domain
       const dataSet = sensor.dataSet
-      // const user: User = await tx.getRepository(User).findOne({
-      //   where: {
-      //     reference: sensor.appliance.id,
-      //     userType: 'appliance'
-      //   }
-      // })
+
+      /* 
+        원칙적으로 user 인증정보를 가지고 요청해야 하지만, 인증정보를 보낼 수 없는 상황이라고 전제하여 처리한다.
+        앞으로, 보완되어야 한다.
+      */
+      const user: User =
+        context.user ||
+        (await tx.getRepository(User).findOne({
+          where: {
+            reference: sensor.appliance.id,
+            userType: 'appliance'
+          }
+        }))
 
       context.state = {
+        user,
         ...context.state,
         domain,
         tx

package/server/service/data-archive/data-archive-query.ts

@@ -22,7 +22,10 @@ export class DataArchiveQuery {
 
   @Directive('@privilege(category: "data-archive", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => DataArchiveList, { description: 'To fetch multiple DataArchives' })
-  async dataArchives(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataArchiveList> {
+  async dataArchives(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<DataArchiveList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

package/server/service/data-archive/data-archive.ts

@@ -23,7 +23,7 @@ export class DataArchive {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((dataArchive: DataArchive) => dataArchive.domain)
@@ -54,14 +54,14 @@ export class DataArchive {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((dataArchive: DataArchive) => dataArchive.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((dataArchive: DataArchive) => dataArchive.updater)

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

@@ -20,7 +20,10 @@ export class DataKeySetQuery {
   }
 
   @Query(returns => DataKeySetList, { description: 'To fetch multiple DataKeySets' })
-  async dataKeySets(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataKeySetList> {
+  async dataKeySets(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<DataKeySetList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

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

@@ -25,7 +25,7 @@ export class DataKeySet {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((dataKeySet: DataKeySet) => dataKeySet.domain)
@@ -68,14 +68,14 @@ export class DataKeySet {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((dataKeySet: DataKeySet) => dataKeySet.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((dataKeySet: DataKeySet) => dataKeySet.updater)

package/server/service/data-ooc/data-ooc-query.ts

@@ -25,7 +25,7 @@ export class DataOocQuery {
 
   @Directive('@privilege(category: "data-ooc", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => DataOocList, { description: 'To fetch multiple DataOoc' })
-  async dataOocs(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataOocList> {
+  async dataOocs(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<DataOocList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -65,12 +65,18 @@ export class DataOocQuery {
 
   @FieldResolver(type => ActivityInstance)
   async reviewActivityInstance(@Root() dataOoc: DataOoc): Promise<ActivityInstance> {
-    return dataOoc.reviewActivityInstanceId && (await getRepository(ActivityInstance).findOneBy({ id: dataOoc.reviewActivityInstanceId }))
+    return (
+      dataOoc.reviewActivityInstanceId &&
+      (await getRepository(ActivityInstance).findOneBy({ id: dataOoc.reviewActivityInstanceId }))
+    )
   }
 
   @FieldResolver(type => ActivityInstance)
   async resolveActivityInstance(@Root() dataOoc: DataOoc): Promise<ActivityInstance> {
-    return dataOoc.resolveActivityInstanceId && (await getRepository(ActivityInstance).findOneBy({ id: dataOoc.resolveActivityInstanceId }))
+    return (
+      dataOoc.resolveActivityInstanceId &&
+      (await getRepository(ActivityInstance).findOneBy({ id: dataOoc.resolveActivityInstanceId }))
+    )
   }
 
   @FieldResolver(type => User)