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

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

@@ -1,5 +1,16 @@
 import { Field, ID, ObjectType, registerEnumType } from 'type-graphql'
-import { Column, CreateDateColumn, Entity, Index, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  JoinColumn,
+  ManyToOne,
+  OneToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
@@ -33,7 +44,7 @@ export class DataOoc {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((dataOoc: DataOoc) => dataOoc.domain)
@@ -72,14 +83,24 @@ export class DataOoc {
 
   @Column({
     nullable: true,
-    type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'longtext' : DATABASE_TYPE == 'oracle' ? 'clob' : 'varchar'
+    type:
+      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'longtext'
+        : DATABASE_TYPE == 'oracle'
+          ? 'clob'
+          : 'varchar'
   })
   @Field({ nullable: true })
   correctiveInstruction?: string
 
   @Column({
     nullable: true,
-    type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'longtext' : DATABASE_TYPE == 'oracle' ? 'clob' : 'varchar'
+    type:
+      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'longtext'
+        : DATABASE_TYPE == 'oracle'
+          ? 'clob'
+          : 'varchar'
   })
   @Field({ nullable: true })
   correctiveAction?: string
@@ -133,7 +154,12 @@ export class DataOoc {
 
   @Column({
     nullable: true,
-    type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'longtext' : DATABASE_TYPE == 'oracle' ? 'clob' : 'varchar'
+    type:
+      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'longtext'
+        : DATABASE_TYPE == 'oracle'
+          ? 'clob'
+          : 'varchar'
   })
   @Field({ nullable: true })
   rawData?: string
@@ -209,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

@@ -1,5 +1,16 @@
 import { Field, ID, ObjectType } from 'type-graphql'
-import { Column, CreateDateColumn, Entity, Index, JoinColumn, ManyToOne, OneToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  JoinColumn,
+  ManyToOne,
+  OneToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
@@ -13,10 +24,24 @@ import { DataOoc } from '../data-ooc/data-ooc'
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
 @Entity()
-@Index('ix_data_sample_0', (dataSample: DataSample) => [dataSample.domain, dataSample.dataSet, dataSample.workDate, dataSample.workShift, dataSample.collectedAt], {
-  unique: false
-})
-@Index('ix_data_sample_1', (dataSample: DataSample) => [dataSample.domain, dataSample.dataSet, dataSample.collectedAt], { unique: false })
+@Index(
+  'ix_data_sample_0',
+  (dataSample: DataSample) => [
+    dataSample.domain,
+    dataSample.dataSet,
+    dataSample.workDate,
+    dataSample.workShift,
+    dataSample.collectedAt
+  ],
+  {
+    unique: false
+  }
+)
+@Index(
+  'ix_data_sample_1',
+  (dataSample: DataSample) => [dataSample.domain, dataSample.dataSet, dataSample.collectedAt],
+  { unique: false }
+)
 @ObjectType({ description: 'Entity for DataSample' })
 export class DataSample {
   @PrimaryGeneratedColumn('uuid')
@@ -24,7 +49,7 @@ export class DataSample {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((dataSample: DataSample) => dataSample.domain)
@@ -74,7 +99,12 @@ export class DataSample {
 
   @Column({
     nullable: true,
-    type: DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? 'longtext' : DATABASE_TYPE == 'oracle' ? 'clob' : 'varchar',
+    type:
+      DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
+        ? 'longtext'
+        : DATABASE_TYPE == 'oracle'
+          ? 'clob'
+          : 'varchar',
     transformer: json5Transformer
   })
   @Field({ nullable: true })
@@ -145,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

@@ -1,5 +1,14 @@
 import { Field, ID, ObjectType } from 'type-graphql'
-import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, UpdateDateColumn } from 'typeorm'
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  RelationId,
+  UpdateDateColumn
+} from 'typeorm'
 
 import { Domain } from '@things-factory/shell'
 import { Appliance, User } from '@things-factory/auth-base'
@@ -23,7 +32,7 @@ export class DataSensor {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((dataSensor: DataSensor) => dataSensor.domain)
@@ -102,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 리스트만 반환 */
@@ -66,7 +69,8 @@ export class DataSetQuery {
       where: { id: user.id },
       relations: ['roles']
     })
-    const roles = user.roles.filter(role => role.domainId === domain.id).map(role => role.id)
+
+    const roles = user.roles.filter(role => role.domainId === domain.id || (domain.parentId && role.domainId === domain.parentId)).map(role => role.id)
 
     if (!roles.length) {
       return { items: [], total: 0 }
@@ -87,7 +91,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 +180,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({

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

@@ -47,7 +47,7 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
   readonly version: number = 1
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((dataSetHistory: DataSetHistory) => dataSetHistory.domain)
@@ -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)
@@ -203,8 +203,8 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
       DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
         ? 'enum'
         : DATABASE_TYPE == 'oracle'
-        ? 'varchar2'
-        : 'smallint',
+          ? 'varchar2'
+          : 'smallint',
     enum: HistoryActionType
   })
   public action!: HistoryActionType

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

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

@@ -1,4 +1,13 @@
-import { CreateDateColumn, UpdateDateColumn, Entity, Index, Column, RelationId, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
+import {
+  CreateDateColumn,
+  UpdateDateColumn,
+  Entity,
+  Index,
+  Column,
+  RelationId,
+  ManyToOne,
+  PrimaryGeneratedColumn
+} from 'typeorm'
 import { ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
 
 import { Domain, ScalarObject } from '@things-factory/shell'
@@ -23,7 +32,11 @@ import { DataSet, DataSetSummaryPeriodType } from '../data-set/data-set'
   ],
   { unique: true }
 )
-@Index('ix_data_summary_1', (dataSummary: DataSummary) => [dataSummary.domain, dataSummary.dataSet, dataSummary.date, dataSummary.period], { unique: false })
+@Index(
+  'ix_data_summary_1',
+  (dataSummary: DataSummary) => [dataSummary.domain, dataSummary.dataSet, dataSummary.date, dataSummary.period],
+  { unique: false }
+)
 @ObjectType({ description: 'Entity for DataSummary' })
 export class DataSummary {
   @PrimaryGeneratedColumn('uuid')
@@ -31,7 +44,7 @@ export class DataSummary {
   readonly id: string
 
   @ManyToOne(type => Domain)
-  @Field({ nullable: true })
+  @Field(type => Domain)
   domain?: Domain
 
   @RelationId((dataSummary: DataSummary) => dataSummary.domain)