@things-factory/dataset 5.0.0-alpha.35 → 5.0.0-alpha.38

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

@@ -1,9 +1,9 @@
 import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { Equal, getRepository } from 'typeorm'
+import { getRepository } from 'typeorm'
 
 import { Role, User } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
-import { convertListParams, Domain, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
 
 import { DataItem } from '../data-item/data-item'
 import { DataSample } from '../data-sample/data-sample'
@@ -29,47 +29,67 @@ export class DataSetQuery {
   async dataSets(@Args() params: ListParam, @Ctx() context: any): Promise<DataSetList> {
     const { domain } = context.state
 
-    const convertedParams = convertListParams(params, domain.id)
-    const [items, total] = await getRepository(DataSet).findAndCount(convertedParams)
+    const queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(DataSet),
+      params,
+      domain,
+      alias: 'dataset'
+    })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
 
     return { items, total }
   }
 
   @Query(returns => DataSetList, { description: 'To fetch multiple DataSets for data entry manually' })
   async dataSetsForEntry(@Args() params: ListParam, @Ctx() context: any): Promise<DataSetList> {
-    const { domain } = context.state
+    var { domain, user } = context.state
 
-    /* TODO. 조회한 사용자가 entry-role을 가진 data-set 리스트만 반환 */
-
-    const { where = {}, order, skip, take } = convertListParams(params, domain.id)
-    where.active = Equal(true)
+    /* 조회한 사용자가 entry-role을 가진 data-set 리스트만 반환 */
+    user = await getRepository(User).findOne({
+      where: { id: user.id },
+      relations: ['roles']
+    })
+    const roles = user.roles.filter(role => role.domainId === domain.id).map(role => role.id)
 
-    const [items, total] = await getRepository(DataSet).findAndCount({
-      where,
-      order,
-      skip,
-      take
+    const queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(DataSet),
+      params,
+      domain,
+      alias: 'dataset'
     })
 
+    queryBuilder.andWhere(`dataset.active = :active`, { active: true })
+    queryBuilder.andWhere(`dataset.entry_role_id IN (:...roles)`, { roles })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
+
     return { items, total }
   }
 
   @Query(returns => DataSetList, { description: 'To fetch multiple DataSets to see data report' })
   async dataSetsForReport(@Args() params: ListParam, @Ctx() context: any): Promise<DataSetList> {
-    const { domain } = context.state
-
-    /* TODO. 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
+    var { domain, user } = context.state
 
-    const { where = {}, order, skip, take } = convertListParams(params, domain.id)
-    where.active = Equal(true)
+    /* 조회한 사용자가 supervisory 역할을 가진 data-set 리스트만 반환 */
+    user = await getRepository(User).findOne({
+      where: { id: user.id },
+      relations: ['roles']
+    })
+    const roles = user.roles.filter(role => role.domainId === domain.id).map(role => role.id)
 
-    const [items, total] = await getRepository(DataSet).findAndCount({
-      where,
-      order,
-      skip,
-      take
+    const queryBuilder = getQueryBuilderFromListParams({
+      repository: getRepository(DataSet),
+      params,
+      domain,
+      alias: 'dataset'
     })
 
+    queryBuilder.andWhere(`dataset.active = :active`, { active: true })
+    queryBuilder.andWhere(`dataset.supervisory_role_id IN (:...roles)`, { roles })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
+
     return { items, total }
   }
 
@@ -136,14 +156,14 @@ export class DataSetQuery {
 
   @FieldResolver(type => Date, { nullable: true })
   async nextSchedule(@Root() dataSet: DataSet): Promise<Date> {
-    const { domain, schedule, timezone } = dataSet
+    const { domainId, schedule, timezone } = dataSet
 
     if (!schedule) {
       return
     }
 
     var interval = parser.parseExpression(schedule, {
-      tz: timezone || domain.timezone || 'UTC'
+      tz: timezone || ((await getRepository(Domain).findOne(domainId)) as Domain).timezone || 'UTC'
     })
 
     return interval.next().toDate()
@@ -151,14 +171,14 @@ export class DataSetQuery {
 
   @FieldResolver(type => Date, { nullable: true })
   async prevSchedule(@Root() dataSet: DataSet): Promise<Date> {
-    const { domain, schedule, timezone } = dataSet
+    const { domainId, schedule, timezone } = dataSet
 
     if (!schedule) {
       return
     }
 
     var interval = parser.parseExpression(schedule, {
-      tz: timezone || domain.timezone || 'UTC'
+      tz: timezone || ((await getRepository(Domain).findOne(domainId)) as Domain).timezone || 'UTC'
     })
 
     return interval.prev().toDate()

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

@@ -75,6 +75,9 @@ export class DataSetPatch {
   @Field({ nullable: true })
   active?: boolean
 
+  @Field({ nullable: true })
+  type?: 'manual' | 'automatic' | string
+
   @Field({ nullable: true })
   useCase?: string