@things-factory/dataset 7.0.1-beta.8 → 7.0.1-rc.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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "7.0.1-beta.8",
+  "version": "7.0.1-rc.0",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,34 +27,34 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@operato/app": "^2.0.0-beta.0",
-    "@operato/data-grist": "^2.0.0-beta.0",
-    "@operato/dataset": "^2.0.0-beta.0",
-    "@operato/ghost-print": "^2.0.0-beta.0",
-    "@operato/graphql": "^2.0.0-beta.0",
-    "@operato/grist-editor": "^2.0.0-beta.0",
-    "@operato/i18n": "^2.0.0-beta.0",
-    "@operato/layout": "^2.0.0-beta.0",
-    "@operato/moment-timezone-es": "^2.0.0-beta.0",
-    "@operato/p13n": "^2.0.0-beta.0",
-    "@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.8",
-    "@things-factory/aws-base": "^7.0.1-beta.8",
-    "@things-factory/board-service": "^7.0.1-beta.8",
-    "@things-factory/env": "^7.0.1-beta.6",
-    "@things-factory/integration-base": "^7.0.1-beta.8",
-    "@things-factory/organization": "^7.0.1-beta.8",
-    "@things-factory/personalization": "^7.0.1-beta.8",
-    "@things-factory/scheduler-client": "^7.0.1-beta.8",
-    "@things-factory/shell": "^7.0.1-beta.8",
-    "@things-factory/work-shift": "^7.0.1-beta.8",
-    "@things-factory/worklist": "^7.0.1-beta.8",
+    "@operato/app": "^7.0.0-rc",
+    "@operato/data-grist": "^7.0.0-rc",
+    "@operato/dataset": "^7.0.0-rc",
+    "@operato/ghost-print": "^7.0.0-rc",
+    "@operato/graphql": "^7.0.0-rc",
+    "@operato/grist-editor": "^7.0.0-rc",
+    "@operato/i18n": "^7.0.0-rc",
+    "@operato/layout": "^7.0.0-rc",
+    "@operato/moment-timezone-es": "^7.0.0-rc",
+    "@operato/p13n": "^7.0.0-rc",
+    "@operato/shell": "^7.0.0-rc",
+    "@operato/styles": "^7.0.0-rc",
+    "@operato/utils": "^7.0.0-rc",
+    "@things-factory/auth-base": "^7.0.1-rc.0",
+    "@things-factory/aws-base": "^7.0.1-rc.0",
+    "@things-factory/board-service": "^7.0.1-rc.0",
+    "@things-factory/env": "^7.0.1-rc.0",
+    "@things-factory/integration-base": "^7.0.1-rc.0",
+    "@things-factory/organization": "^7.0.1-rc.0",
+    "@things-factory/personalization": "^7.0.1-rc.0",
+    "@things-factory/scheduler-client": "^7.0.1-rc.0",
+    "@things-factory/shell": "^7.0.1-rc.0",
+    "@things-factory/work-shift": "^7.0.1-rc.0",
+    "@things-factory/worklist": "^7.0.1-rc.0",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.45",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "d2ca60f7fca6feb2b7cb86b4f825378573fcc335"
+  "gitHead": "45476b164b69aef2c211d9a5257897f42d8e2f5f"
 }

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

@@ -221,7 +221,7 @@ 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']
@@ -256,12 +256,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: 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.')
@@ -311,7 +315,7 @@ 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]) },
           id: normalScenarioId
         },
         relations: ['domain', 'steps', 'updater']
@@ -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-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

@@ -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

@@ -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)

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

@@ -235,14 +235,14 @@ export class DataOoc {
   correctorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((dataOoc: DataOoc) => dataOoc.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((dataOoc: DataOoc) => dataOoc.updater)

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

@@ -2,7 +2,13 @@ import { In } from 'typeorm'
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
 
 import { User } from '@things-factory/auth-base'
-import { Domain, getQueryBuilderFromListParams, getRepository, getISOStringsForPeriod, ListParam } from '@things-factory/shell'
+import {
+  Domain,
+  getQueryBuilderFromListParams,
+  getRepository,
+  getISOStringsForPeriod,
+  ListParam
+} from '@things-factory/shell'
 import { ActivityInstance } from '@things-factory/worklist'
 
 import { DataKeySet } from '../data-key-set/data-key-set'
@@ -27,7 +33,10 @@ export class DataSampleQuery {
 
   @Directive('@privilege(category: "data-sample", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => DataSampleList, { description: 'To fetch multiple data samples' })
-  async dataSamples(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataSampleList> {
+  async dataSamples(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSampleList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -44,7 +53,11 @@ export class DataSampleQuery {
 
   @Directive('@privilege(category: "data-sample", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => DataSampleList, { description: 'To fetch multiple data samples by data set' })
-  async dataSamplesByDataSet(@Arg('dataSetId') dataSetId: string, @Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataSampleList> {
+  async dataSamplesByDataSet(
+    @Arg('dataSetId') dataSetId: string,
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSampleList> {
     const { domain } = context.state
 
     const dataSet = await getRepository(DataSet).findOne({
@@ -76,7 +89,11 @@ export class DataSampleQuery {
 
   @Directive('@privilege(category: "data-sample", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => DataSampleList, { description: 'To fetch multiple data samples by data key set' })
-  async dataSamplesByDataKeySet(@Arg('dataKeySetId') dataKeySetId: string, @Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataSampleList> {
+  async dataSamplesByDataKeySet(
+    @Arg('dataKeySetId') dataKeySetId: string,
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSampleList> {
     const { domain } = context.state
 
     const dataKeySet = await getRepository(DataKeySet).findOneBy({ id: dataKeySetId })
@@ -102,7 +119,7 @@ export class DataSampleQuery {
   async dataSamplesByPeriod(
     @Arg('period') period: 'today' | 'this month' | '30 days' | 'this year' | '12 months',
     @Arg('dataSetName') dataSetName: string,
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<DataSampleList> {
     const { domain } = context.state
@@ -175,7 +192,10 @@ export class DataSampleQuery {
 
   @FieldResolver(type => ActivityInstance)
   async reviewActivityInstance(@Root() dataSample: DataSample): Promise<ActivityInstance> {
-    return dataSample.reviewActivityInstanceId && (await getRepository(ActivityInstance).findOneBy({ id: dataSample.reviewActivityInstanceId }))
+    return (
+      dataSample.reviewActivityInstanceId &&
+      (await getRepository(ActivityInstance).findOneBy({ id: dataSample.reviewActivityInstanceId }))
+    )
   }
 
   @FieldResolver(type => Domain)

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

@@ -175,14 +175,14 @@ export class DataSample {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((dataSample: DataSample) => dataSample.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((dataSample: DataSample) => dataSample.updater)

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

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

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

@@ -111,14 +111,14 @@ export class DataSensor {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((dataSensor: DataSensor) => dataSensor.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((dataSensor: DataSensor) => dataSensor.updater)

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

@@ -41,7 +41,7 @@ export class DataSetQuery {
 
   @Directive('@privilege(category: "data-set", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => DataSetList, { description: 'To fetch multiple DataSets' })
-  async dataSets(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataSetList> {
+  async dataSets(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<DataSetList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -58,7 +58,10 @@ export class DataSetQuery {
   }
 
   @Query(returns => DataSetList, { description: 'To fetch multiple DataSets for data entry manually' })
-  async dataSetsForEntry(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataSetList> {
+  async dataSetsForEntry(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSetList> {
     var { domain, user } = context.state
 
     /* 조회한 사용자가 entry-role을 가진 data-set 리스트만 반환 */
@@ -87,7 +90,10 @@ export class DataSetQuery {
   }
 
   @Query(returns => DataSetList, { description: 'To fetch multiple DataSets to see data report' })
-  async dataSetsForReport(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataSetList> {
+  async dataSetsForReport(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSetList> {
     var { domain, user } = context.state
 
     /* 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
@@ -173,7 +179,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':

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

@@ -28,7 +28,10 @@ export class DataSetHistoryQuery {
 
   @Directive('@privilege(category: "data-set-history", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => DataSetHistoryList, { description: 'To fetch multiple DataSetHistories' })
-  async dataSetHistories(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataSetHistoryList> {
+  async dataSetHistories(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSetHistoryList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({