@things-factory/dataset 6.0.32 → 6.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.0.32",
+  "version": "6.0.34",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -35,17 +35,17 @@
     "@operato/shell": "^1.0.1",
     "@operato/styles": "^1.0.0",
     "@operato/utils": "^1.0.1",
-    "@things-factory/auth-base": "^6.0.32",
-    "@things-factory/aws-base": "^6.0.32",
-    "@things-factory/board-service": "^6.0.32",
-    "@things-factory/env": "^6.0.32",
-    "@things-factory/organization": "^6.0.32",
-    "@things-factory/scheduler-client": "^6.0.32",
-    "@things-factory/shell": "^6.0.32",
-    "@things-factory/work-shift": "^6.0.32",
-    "@things-factory/worklist": "^6.0.32",
+    "@things-factory/auth-base": "^6.0.34",
+    "@things-factory/aws-base": "^6.0.34",
+    "@things-factory/board-service": "^6.0.34",
+    "@things-factory/env": "^6.0.34",
+    "@things-factory/organization": "^6.0.34",
+    "@things-factory/scheduler-client": "^6.0.34",
+    "@things-factory/shell": "^6.0.34",
+    "@things-factory/work-shift": "^6.0.34",
+    "@things-factory/worklist": "^6.0.34",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "1b7b1eb2d2e1c0823ec69ee8160790c5da62072c"
+  "gitHead": "a460e5183f6e97e061be886d1efe9a114bd1316b"
 }

package/server/activities/activity-data-collect.ts

@@ -76,7 +76,7 @@ export const ActivityDataCollect = {
     }
   ],
   uiType: 'custom-element',
-  uiSource: 'activity-data-collect-view',
+  uiSource: 'activity-data-collect-edit',
   viewType: 'custom-element',
   viewSource: 'activity-data-collect-view',
   reportType: 'custom-element',

package/server/activities/activity-ooc-resolve.ts

@@ -106,9 +106,9 @@ export const ActivityOocResolve = {
     }
   ],
   uiType: 'custom-element',
-  uiSource: 'activity-ooc-resolve-view',
+  uiSource: 'activity-ooc-resolve-edit',
   viewType: 'custom-element',
-  viewSource: 'activity-data-collect-view',
+  viewSource: 'activity-ooc-resolve-view',
   reportType: 'custom-element',
   reportSource: 'data-ooc-report-page',
   thumbnail: '/assets/images/ooc.png',

package/server/activities/activity-ooc-review.ts

@@ -110,9 +110,9 @@ export const ActivityOocReview = {
     }
   ],
   uiType: 'custom-element',
-  uiSource: 'activity-ooc-review-view',
+  uiSource: 'activity-ooc-review-edit',
   viewType: 'custom-element',
-  viewSource: 'activity-data-collect-view',
+  viewSource: 'activity-ooc-review-view',
   reportType: 'custom-element',
   reportSource: 'data-ooc-report-page',
   thumbnail: '/assets/images/ooc.png',

package/server/routes.ts

@@ -1,7 +1,9 @@
+import { logger } from '@things-factory/env'
 import { Domain, getDataSource } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { Activity } from '@things-factory/worklist'
 import { post } from '@things-factory/worklist/dist-server/controllers/activity-instance/post'
+import { ScheduleRegisterRequest } from '@things-factory/scheduler-client'
 
 import { createDataSample } from './controllers/create-data-sample'
 import { renderJasperReport } from './controllers/jasper-report'
@@ -80,10 +82,25 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
 
   /* When a callback occurs from the scheduler when a scheduled dataset is on schedule, data collection task for the dataset should be issued. */
   globalPublicRouter.post('/callback-schedule-for-dataset', async (context, next) => {
-    const { domainId, dataSetId } = context.request.body
+    const { client } = context.request.body as ScheduleRegisterRequest
 
-    getDataSource().transaction(async tx => {
+    if (!client || typeof client !== 'object') {
+      throw new Error('client property should be a part of callback body.')
+    }
+
+    const { group: domainId, key: dataSetId } = client
+
+    if (!domainId || !dataSetId) {
+      throw new Error(`group(${domainId}) and key(${dataSetId}) properties should not be empty`)
+    }
+
+    await getDataSource().transaction(async tx => {
       const domain = await tx.getRepository(Domain).findOneBy({ id: domainId })
+
+      if (!domain) {
+        throw new Error(`domain(${domainId}) not found`)
+      }
+
       const dataSet = await tx.getRepository(DataSet).findOne({ where: { domain: { id: domainId }, id: dataSetId } })
 
       const activity = (await tx.getRepository(Activity).findOneBy({
@@ -116,12 +133,12 @@ process.on('bootstrap-module-global-public-route' as any, (app, globalPublicRout
 
           await post(activityInstance, context)
         } else {
-          console.error(
-            `Assignees not set. So Data Collec Activity for ${dataSet.name}($dataSet.id) could not be posted.`
+          throw new Error(
+            `Assignees not set. So Data Collect Activity for ${dataSet.name}($dataSet.id) could not be posted.`
           )
         }
       } else {
-        console.error(`Data Collec Activity is not installed.`)
+        throw new Error(`Data Collect Activity is not installed.`)
       }
     })
 

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

@@ -194,8 +194,8 @@ export class DataSetMutation {
             }
           },
           data: {
-            application: 'dataset',
-            id: dataSet.id
+            domainId: domain.id,
+            dataSetId
           },
           history_check: true,
           failed_policy: 'retry_dlq',
@@ -206,10 +206,10 @@ export class DataSetMutation {
 
       return await repository.save({
         ...dataSet,
-        schedulerHandle: handle
+        scheduleId: handle
       })
     } catch (err) {
-      console.error('stopDataCollectionSchedule', err)
+      console.error('startDataCollectionSchedule', err)
     }
   }
 
@@ -238,11 +238,11 @@ export class DataSetMutation {
     }
 
     try {
-      await unregisterSchedule(dataSet.schedulerHandle)
+      await unregisterSchedule(dataSet.scheduleId)
 
       return await repository.save({
         ...dataSet,
-        schedulerHandle: null
+        scheduleId: null
       })
     } catch (err) {
       console.error('stopDataCollectionSchedule', err)

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

@@ -127,7 +127,7 @@ export class DataSetQuery {
     // get information from scheduler service
     return {
       id: '',
-      schedulerHandle: '',
+      scheduleId: '',
       state: '',
       startedAt: new Date(),
       nextSchedule: new Date()

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

@@ -66,7 +66,7 @@ export class DataSetState {
   id: string
 
   @Field()
-  schedulerHandle: string
+  scheduleId: string
 
   @Field()
   state: string
@@ -197,7 +197,7 @@ export class DataSet {
 
   @Column({ nullable: true })
   @Field({ nullable: true })
-  schedulerHandle?: string
+  scheduleId?: string
 
   @CreateDateColumn()
   @Field({ nullable: true })