@things-factory/dataset 7.0.1-beta.14 → 7.0.1-beta.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "7.0.1-beta.14",
+  "version": "7.0.1-beta.18",
   "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.14",
-    "@things-factory/aws-base": "^7.0.1-beta.14",
-    "@things-factory/board-service": "^7.0.1-beta.14",
-    "@things-factory/env": "^7.0.1-beta.6",
-    "@things-factory/integration-base": "^7.0.1-beta.14",
-    "@things-factory/organization": "^7.0.1-beta.14",
-    "@things-factory/personalization": "^7.0.1-beta.14",
-    "@things-factory/scheduler-client": "^7.0.1-beta.14",
-    "@things-factory/shell": "^7.0.1-beta.14",
-    "@things-factory/work-shift": "^7.0.1-beta.14",
-    "@things-factory/worklist": "^7.0.1-beta.14",
+    "@things-factory/auth-base": "^7.0.1-beta.18",
+    "@things-factory/aws-base": "^7.0.1-beta.18",
+    "@things-factory/board-service": "^7.0.1-beta.18",
+    "@things-factory/env": "^7.0.1-beta.18",
+    "@things-factory/integration-base": "^7.0.1-beta.18",
+    "@things-factory/organization": "^7.0.1-beta.18",
+    "@things-factory/personalization": "^7.0.1-beta.18",
+    "@things-factory/scheduler-client": "^7.0.1-beta.18",
+    "@things-factory/shell": "^7.0.1-beta.18",
+    "@things-factory/work-shift": "^7.0.1-beta.18",
+    "@things-factory/worklist": "^7.0.1-beta.18",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.45",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "f98cf5cb94295657c43465d39cf55162f5566c59"
+  "gitHead": "44f0df6a133577bad8d184a529796c69249a8296"
 }

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-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 리스트만 반환 */

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({

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

@@ -181,14 +181,14 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.updater)

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

@@ -21,7 +21,10 @@ export class DataSummaryQuery {
   }
 
   @Query(returns => DataSummaryList, { description: 'To fetch multiple DataSummaries' })
-  async dataSummaries(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<DataSummaryList> {
+  async dataSummaries(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSummaryList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -41,7 +44,7 @@ export class DataSummaryQuery {
     @Arg('period') period: 'today' | 'this month' | '30 days' | 'this year' | '12 months',
     @Arg('dataSetName') dataSetName: string,
     @Arg('dataKeys', type => [String], { nullable: true }) dataKeys: string[] | null,
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<DynamicDataSummary[]> {
     return await queryDataSummaryByPeriod(period, dataSetName, dataKeys, params, context)
@@ -51,7 +54,7 @@ export class DataSummaryQuery {
   @Query(returns => DataSummaryList, { description: 'To fetch multiple data summaries by data set name' })
   async dataSummariesByDataSetName(
     @Arg('dataSetName') dataSetName: string,
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<DataSummaryList> {
     const { domain } = context.state
@@ -87,7 +90,7 @@ export class DataSummaryQuery {
   @Query(returns => DataSummaryList, { description: 'To fetch multiple data summaries by data set' })
   async dataSummariesByDataSet(
     @Arg('dataSetId') dataSetId: string,
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<DataSummaryList> {
     const { domain } = context.state
@@ -123,7 +126,7 @@ export class DataSummaryQuery {
   @Query(returns => DataSummaryList, { description: 'To fetch multiple data summaries by data key set' })
   async dataSummariesByDataKeySet(
     @Arg('dataKeySetId') dataKeySetId: string,
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<DataSummaryList> {
     const { domain } = context.state