@things-factory/dataset 8.0.59 → 8.0.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "8.0.59",
+  "version": "8.0.62",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -40,21 +40,21 @@
     "@operato/shell": "^8.0.0",
     "@operato/styles": "^8.0.0",
     "@operato/utils": "^8.0.0",
-    "@things-factory/auth-base": "^8.0.55",
-    "@things-factory/aws-base": "^8.0.55",
-    "@things-factory/board-service": "^8.0.55",
+    "@things-factory/auth-base": "^8.0.61",
+    "@things-factory/aws-base": "^8.0.61",
+    "@things-factory/board-service": "^8.0.61",
     "@things-factory/env": "^8.0.37",
-    "@things-factory/integration-base": "^8.0.55",
-    "@things-factory/organization": "^8.0.55",
-    "@things-factory/personalization": "^8.0.55",
-    "@things-factory/scheduler-client": "^8.0.55",
-    "@things-factory/shell": "^8.0.55",
-    "@things-factory/work-shift": "^8.0.55",
-    "@things-factory/worklist": "^8.0.59",
+    "@things-factory/integration-base": "^8.0.61",
+    "@things-factory/organization": "^8.0.61",
+    "@things-factory/personalization": "^8.0.61",
+    "@things-factory/scheduler-client": "^8.0.61",
+    "@things-factory/shell": "^8.0.61",
+    "@things-factory/work-shift": "^8.0.61",
+    "@things-factory/worklist": "^8.0.61",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.45",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "4d01243f9ea9e925cdbeb7d31d78f1830c727ba7"
+  "gitHead": "4a5db2d9f94987ce549734ad43b08d1765c265d5"
 }

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

@@ -282,6 +282,14 @@ export class DataSetMutation {
     }
 
     try {
+      // 스케줄 등록시는 transform없는 로우 데이터로
+      const rawSchedule = await repository
+        .createQueryBuilder('ds')
+        .select('ds.schedule', 'schedule')
+        .where('ds.id = :id', { id: dataSetId })
+        .andWhere('domain_id = :domainId', { domainId: domain.id })
+        .getRawOne()
+
       var handle = await registerSchedule({
         name: dataSet.name,
         client: {
@@ -292,7 +300,7 @@ export class DataSetMutation {
           operation: 'schedule'
         },
         type: 'cron',
-        schedule: dataSet.schedule,
+        schedule: rawSchedule?.schedule || dataSet.schedule,
         timezone: dataSet.timezone,
         task: {
           type: 'rest',

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

@@ -14,7 +14,7 @@ import {
 
 import { Role, User } from '@things-factory/auth-base'
 import { ApprovalLineItem } from '@things-factory/organization'
-import { Domain, ScalarObject } from '@things-factory/shell'
+import { Domain, ScalarObject, cronMonthZeroBasedTransformer } from '@things-factory/shell'
 import { AssigneeItem } from '@things-factory/worklist'
 import { Scenario } from '@things-factory/integration-base'
 
@@ -268,7 +268,7 @@ export class DataSet {
   @Field(type => [DataItem], { nullable: true, description: 'Data items for the dataset' })
   dataItems: DataItem[]
 
-  @Column({ nullable: true })
+  @Column({ nullable: true, transformer: cronMonthZeroBasedTransformer })
   @Field({ nullable: true, description: 'The schedule of the dataset' })
   schedule?: string
 

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

@@ -9,7 +9,7 @@ import {
 } from '@operato/typeorm-history'
 import { User } from '@things-factory/auth-base'
 import { ApprovalLineItem } from '@things-factory/organization'
-import { Domain, ScalarObject } from '@things-factory/shell'
+import { Domain, ScalarObject, cronMonthZeroBasedTransformer } from '@things-factory/shell'
 import { AssigneeItem } from '@things-factory/worklist'
 import { config } from '@things-factory/env'
 
@@ -144,7 +144,7 @@ export class DataSetHistory implements HistoryEntityInterface<DataSet> {
   @Field(type => [DataItem], { nullable: true })
   dataItems: DataItem[]
 
-  @Column({ nullable: true })
+  @Column({ nullable: true, transformer: cronMonthZeroBasedTransformer })
   @Field({ nullable: true })
   schedule?: string