@things-factory/dataset 7.0.1-beta.1 → 7.0.1-beta.10

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.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,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;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"]}

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "7.0.1-beta.1",
+  "version": "7.0.1-beta.10",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -40,21 +40,21 @@
     "@operato/shell": "^2.0.0-beta.0",
     "@operato/styles": "^2.0.0-beta.0",
     "@operato/utils": "^2.0.0-beta.0",
-    "@things-factory/auth-base": "^7.0.1-beta.1",
-    "@things-factory/aws-base": "^7.0.1-beta.1",
-    "@things-factory/board-service": "^7.0.1-beta.1",
-    "@things-factory/env": "^7.0.1-beta.1",
-    "@things-factory/integration-base": "^7.0.1-beta.1",
-    "@things-factory/organization": "^7.0.1-beta.1",
-    "@things-factory/personalization": "^7.0.1-beta.1",
-    "@things-factory/scheduler-client": "^7.0.1-beta.1",
-    "@things-factory/shell": "^7.0.1-beta.1",
-    "@things-factory/work-shift": "^7.0.1-beta.1",
-    "@things-factory/worklist": "^7.0.1-beta.1",
+    "@things-factory/auth-base": "^7.0.1-beta.10",
+    "@things-factory/aws-base": "^7.0.1-beta.10",
+    "@things-factory/board-service": "^7.0.1-beta.10",
+    "@things-factory/env": "^7.0.1-beta.6",
+    "@things-factory/integration-base": "^7.0.1-beta.10",
+    "@things-factory/organization": "^7.0.1-beta.10",
+    "@things-factory/personalization": "^7.0.1-beta.10",
+    "@things-factory/scheduler-client": "^7.0.1-beta.10",
+    "@things-factory/shell": "^7.0.1-beta.10",
+    "@things-factory/work-shift": "^7.0.1-beta.10",
+    "@things-factory/worklist": "^7.0.1-beta.10",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.45",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "f117e0029bfbd061d3f76caa067ed81305f6c2b7"
+  "gitHead": "facbff076fc6af507fa83d5e0b033ad88cdb2fc8"
 }

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

@@ -261,7 +261,9 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
     })) 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: domain.id }, id: dataSet.supervisoryRoleId }))
 
       const assignees = dataSet.supervisoryRoleId ? [{ type: 'Role', value: dataSet.supervisoryRoleId, assignee }] : []
 
@@ -279,10 +281,12 @@ 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.')
@@ -351,9 +355,13 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
       })) 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: domain.id }, 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 +378,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 +396,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 })
 
@@ -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: timestampAccessor }
+    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
@@ -90,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/service/data-set/data-set-mutation.ts

@@ -96,7 +96,7 @@ function getAssigneesValue(patch: NewDataSet | DataSetPatch): AssigneeItem[] {
       return {
         type: m.type,
         assignee: m.assignee
-      } as ApprovalLineItem
+      }
     })
     .filter(m => m.type)
     .filter(m => {
@@ -139,7 +139,11 @@ export class DataSetMutation {
   @Directive('@privilege(category: "data-set", privilege: "mutation", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Mutation(returns => DataSet, { description: 'To modify DataSet information' })
-  async updateDataSet(@Arg('id') id: string, @Arg('patch') patch: DataSetPatch, @Ctx() context: ResolverContext): Promise<DataSet> {
+  async updateDataSet(
+    @Arg('id') id: string,
+    @Arg('patch') patch: DataSetPatch,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSet> {
     const { domain, user, tx } = context.state
     const dataSetRepo = tx.getRepository(DataSet)
 
@@ -166,7 +170,10 @@ export class DataSetMutation {
   @Directive('@privilege(category: "data-set", privilege: "mutation", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Mutation(returns => [DataSet], { description: "To modify multiple DataSets' information" })
-  async updateMultipleDataSet(@Arg('patches', type => [DataSetPatch]) patches: DataSetPatch[], @Ctx() context: ResolverContext): Promise<DataSet[]> {
+  async updateMultipleDataSet(
+    @Arg('patches', type => [DataSetPatch]) patches: DataSetPatch[],
+    @Ctx() context: ResolverContext
+  ): Promise<DataSet[]> {
     const { domain, user, tx } = context.state
     const dataSetRepo = tx.getRepository(DataSet)
 
@@ -259,7 +266,10 @@ export class DataSetMutation {
 
   @Directive('@transaction')
   @Mutation(returns => DataSet, { description: 'To start data collection schedule for the given dataset' })
-  async startDataCollectionSchedule(@Arg('dataSetId') dataSetId: string, @Ctx() context: ResolverContext): Promise<DataSet> {
+  async startDataCollectionSchedule(
+    @Arg('dataSetId') dataSetId: string,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSet> {
     const { domain, tx } = context.state
 
     var repository = tx.getRepository(DataSet)
@@ -322,7 +332,10 @@ export class DataSetMutation {
     nullable: true,
     description: 'To stop data collection schedule for the given dataset'
   })
-  async stopDataCollectionSchedule(@Arg('dataSetId') dataSetId: string, @Ctx() context: ResolverContext): Promise<DataSet | undefined> {
+  async stopDataCollectionSchedule(
+    @Arg('dataSetId') dataSetId: string,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSet | undefined> {
     const { domain, tx } = context.state
 
     var repository = tx.getRepository(DataSet)
@@ -352,7 +365,10 @@ export class DataSetMutation {
 
   @Directive('@transaction')
   @Mutation(returns => DataSet, { description: 'To start data summary schedule for the given dataset' })
-  async startDataSummarySchedule(@Arg('dataSetId') dataSetId: string, @Ctx() context: ResolverContext): Promise<DataSet> {
+  async startDataSummarySchedule(
+    @Arg('dataSetId') dataSetId: string,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSet> {
     const { domain, tx } = context.state
 
     var repository = tx.getRepository(DataSet)
@@ -426,7 +442,10 @@ export class DataSetMutation {
     nullable: true,
     description: 'To stop data summary schedule for the given dataset'
   })
-  async stopDataSummarySchedule(@Arg('dataSetId') dataSetId: string, @Ctx() context: ResolverContext): Promise<DataSet | undefined> {
+  async stopDataSummarySchedule(
+    @Arg('dataSetId') dataSetId: string,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSet | undefined> {
     const { domain, tx } = context.state
 
     var repository = tx.getRepository(DataSet)
@@ -458,7 +477,10 @@ export class DataSetMutation {
   @Directive('@privilege(category: "data-set", privilege: "mutation", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To import multiple data-sets' })
-  async importDataSets(@Arg('dataSets', type => [DataSetPatch]) dataSets: DataSet[], @Ctx() context: ResolverContext): Promise<boolean> {
+  async importDataSets(
+    @Arg('dataSets', type => [DataSetPatch]) dataSets: DataSet[],
+    @Ctx() context: ResolverContext
+  ): Promise<boolean> {
     const { domain, tx } = context.state
     const dataSetRepo = tx.getRepository(DataSet)
 

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

@@ -173,7 +173,6 @@ export class DataSetQuery {
       // "value" deprecated. to be removed
       var { type, assignee, value } = item
       var id = assignee?.id || id
-      var assignee
 
       switch (type) {
         case 'Employee':