@things-factory/dataset 6.1.185 → 6.1.186

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.1.185",
+  "version": "6.1.186",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -37,19 +37,19 @@
     "@operato/shell": "^1.0.1",
     "@operato/styles": "^1.0.0",
     "@operato/utils": "^1.0.1",
-    "@things-factory/auth-base": "^6.1.185",
-    "@things-factory/aws-base": "^6.1.185",
-    "@things-factory/board-service": "^6.1.185",
+    "@things-factory/auth-base": "^6.1.186",
+    "@things-factory/aws-base": "^6.1.186",
+    "@things-factory/board-service": "^6.1.186",
     "@things-factory/env": "^6.1.175",
-    "@things-factory/organization": "^6.1.185",
-    "@things-factory/scheduler-client": "^6.1.185",
-    "@things-factory/shell": "^6.1.182",
-    "@things-factory/work-shift": "^6.1.185",
-    "@things-factory/worklist": "^6.1.185",
+    "@things-factory/organization": "^6.1.186",
+    "@things-factory/scheduler-client": "^6.1.186",
+    "@things-factory/shell": "^6.1.186",
+    "@things-factory/work-shift": "^6.1.186",
+    "@things-factory/worklist": "^6.1.186",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "b6793ed8361e9fc5a4776fb48010007960ffdec8"
+  "gitHead": "ddf508496cdd7d4b9d0e020703a2f7a586a42ec5"
 }

package/server/controllers/generate-data-summary.ts

@@ -9,7 +9,9 @@ import { logger } from '@things-factory/env'
 import {
   getDateRangeForWorkDate,
   getDateRangeForWorkShift,
-  getLatestWorkDateAndShift
+  getLatestWorkDateAndShift,
+  getSummaryScheduleForWorkDate,
+  getSummaryScheduleForWorkShift
 } from '@things-factory/work-shift'
 
 import { DataSample } from '../service/data-sample/data-sample'
@@ -179,6 +181,26 @@ async function getTimesForPeriod(
   }
 }
 
+export async function getDataSummaryCrontabSchedule(dataSet: DataSet, context: ResolverContext): Promise<string> {
+  const { domain, user, tx } = context.state
+
+  try {
+    const { summaryPeriod } = dataSet
+
+    if (summaryPeriod == DataSetSummaryPeriodType.Hour) {
+      return '0 5 * * * *'
+    } else if (summaryPeriod == DataSetSummaryPeriodType.WorkShift) {
+      return await getSummaryScheduleForWorkShift(domain)
+    } else if (summaryPeriod == DataSetSummaryPeriodType.WorkDate) {
+      return await getSummaryScheduleForWorkDate(domain)
+    } else if (summaryPeriod == DataSetSummaryPeriodType.Day) {
+      return '0 10 0 * * *'
+    }
+  } catch (err) {
+    console.error(err)
+  }
+}
+
 export async function generateLatestDataSummaries(dataSetId: string, context: ResolverContext): Promise<boolean> {
   const { domain, user, tx } = context.state
 

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

@@ -6,8 +6,9 @@ import { Application, CallbackBase, registerSchedule, unregisterSchedule } from
 import { ApprovalLineItem, OrgMemberTargetType } from '@things-factory/organization'
 import { AssigneeItem } from '@things-factory/worklist'
 
-import { DataSet } from './data-set'
+import { DataSet, DataSetSummaryPeriodType } from './data-set'
 import { DataSetPatch, NewDataSet } from './data-set-type'
+import { getDataSummaryCrontabSchedule } from '../../controllers/generate-data-summary'
 
 const crypto = require('crypto')
 
@@ -325,6 +326,117 @@ 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> {
+    const { domain, tx } = context.state
+
+    var repository = tx.getRepository(DataSet)
+    var dataSet = await repository.findOne({
+      where: { domain: { id: domain.id }, id: dataSetId }
+    })
+
+    if (!dataSet) {
+      throw new Error(
+        context.t('error.data-set not found', {
+          dataSet: dataSetId
+        })
+      )
+    }
+
+    if (!dataSet.summaryPeriod) {
+      throw new Error(
+        context.t('error.data-set summary-period not set', {
+          dataSet: dataSetId
+        })
+      )
+    }
+
+    const schedule = await getDataSummaryCrontabSchedule(dataSet, context)
+
+    try {
+      var handle = await registerSchedule({
+        name: dataSet.name,
+        client: {
+          application: Application,
+          group: `${domain.id}`,
+          type: 'data-set',
+          key: dataSet.id,
+          operation: 'summary'
+        },
+        type: 'cron',
+        schedule,
+        timezone: dataSet.timezone,
+        task: {
+          type: 'rest',
+          connection: {
+            host: `${CallbackBase}/callback-schedule-for-dataset-summary`,
+            headers: {
+              'Content-Type': 'application/json',
+              accept: '*/*'
+            }
+          },
+          data: {
+            domainId: domain.id,
+            dataSetId
+          },
+          history_check: true,
+          failed_policy: 'retry_dlq',
+          max_retry_count: 3,
+          retry_period: 60
+        }
+      })
+
+      return await repository.save({
+        ...dataSet,
+        summarySchedule: schedule,
+        summaryScheduleId: handle
+      })
+    } catch (err) {
+      console.error('startDataSummarySchedule', err)
+    }
+  }
+
+  @Directive('@transaction')
+  @Mutation(returns => DataSet, {
+    nullable: true,
+    description: 'To stop data summary schedule for the given dataset'
+  })
+  async stopDataSummarySchedule(
+    @Arg('dataSetId') dataSetId: string,
+    @Ctx() context: ResolverContext
+  ): Promise<DataSet | undefined> {
+    const { domain, tx } = context.state
+
+    var repository = tx.getRepository(DataSet)
+    var dataSet = await repository.findOne({
+      where: { domain: { id: domain.id }, id: dataSetId }
+    })
+
+    if (!dataSet) {
+      throw new Error(
+        context.t('error.data-set not found', {
+          dataSet: dataSetId
+        })
+      )
+    }
+
+    try {
+      await unregisterSchedule(dataSet.summaryScheduleId)
+
+      return await repository.save({
+        ...dataSet,
+        summarySchedule: null,
+        summaryScheduleId: null
+      })
+    } catch (err) {
+      console.error('stopDataSummarySchedule', err)
+    }
+  }
+
   @Directive('@privilege(category: "data-set", privilege: "mutation", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To import multiple data-sets' })

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

@@ -7,6 +7,7 @@ import { Board } from '@things-factory/board-service'
 import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 import { ApprovalLineItem } from '@things-factory/organization'
 import { AssigneeItem } from '@things-factory/worklist'
+import { Application, getSchedules } from '@things-factory/scheduler-client'
 
 import { DataKeySet } from '../data-key-set/data-key-set'
 import { DataSample } from '../data-sample/data-sample'
@@ -322,6 +323,33 @@ export class DataSetQuery {
     return interval.prev().toDate()
   }
 
+  @FieldResolver(type => Date, { nullable: true })
+  async nextSummarySchedule(@Root() dataSet: DataSet): Promise<Date> {
+    const { domainId, summarySchedule, timezone } = dataSet
+
+    if (!summarySchedule) {
+      return
+    }
+
+    var interval = parser.parseExpression(summarySchedule, {
+      tz: timezone || ((await getRepository(Domain).findOneBy({ id: domainId })) as Domain).timezone || 'UTC'
+    })
+
+    return interval.next().toDate()
+
+    // /* FIXME: getSchedules 의 파라미터를 수정해야한다. scheduler 가 없거나 커넥션이 끊겨있어서 오래걸리는 문제는 어떻게 ?? 비동기로 처리한다. 어떻게???
+    //   client: {
+    //     application: Application,
+    //     group: `${domain.id}`,
+    //     type: 'data-set',
+    //     key: dataSet.id,
+    //     operation: 'summary'
+    //   },
+    // */
+    // const schedule = getSchedules('name', 'group', false)
+    // return schedule.nextSchedule
+  }
+
   @FieldResolver(type => String)
   async reportTemplate(@Root() dataset: DataSet): Promise<string | undefined> {
     const attachment: Attachment = await getRepository(Attachment).findOne({

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

@@ -215,6 +215,10 @@ export class DataSet {
   @Field({ nullable: true })
   summaryPeriod?: DataSetSummaryPeriodType
 
+  @Column({ nullable: true })
+  @Field({ nullable: true })
+  summarySchedule?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   summaryScheduleId?: string

package/translations/en.json

@@ -69,6 +69,8 @@
   "field.work-date": "work date",
   "field.work-shift": "work shift",
   "label.acceptables": "acceptables",
+  "label.corrective action": "corrective action",
+  "label.corrective instruction": "corrective instruction",
   "label.critical-limits": "critical limits",
   "label.data-set-type": "type",
   "label.end-date": "end date",

package/translations/ja.json

@@ -69,6 +69,8 @@
   "field.work-date": "作業基準日",
   "field.work-shift": "交代勤務組",
   "label.acceptables": "許容値",
+  "label.corrective action": "是正措置",
+  "label.corrective instruction": "是正指示",
   "label.critical-limits": "許容限界範囲",
   "label.data-set-type": "タイプ",
   "label.end-date": "終了日",

package/translations/ko.json

@@ -69,6 +69,8 @@
   "field.work-date": "작업기준일",
   "field.work-shift": "교대근무조",
   "label.acceptables": "허용값",
+  "label.corrective action": "수정 조치",
+  "label.corrective instruction": "수정 지시",
   "label.critical-limits": "허용 한계범위",
   "label.data-set-type": "유형",
   "label.end-date": "종료일",

package/translations/ms.json

@@ -66,6 +66,8 @@
   "field.work-date": "work date",
   "field.work-shift": "work shift",
   "label.acceptables": "acceptables",
+  "label.corrective action": "tindakan pembetulan",
+  "label.corrective instruction": "arahan pembetulan",
   "label.critical-limits": "critical limits",
   "label.data-set-type": "type",
   "label.minimum value": "minimum value",

package/translations/zh.json

@@ -66,6 +66,8 @@
   "field.work-date": "work date",
   "field.work-shift": "work shift",
   "label.acceptables": "acceptables",
+  "label.corrective action": "纠正措施",
+  "label.corrective instruction": "纠正指示",
   "label.critical-limits": "critical limits",
   "label.data-set-type": "type",
   "label.minimum value": "minimum value",