@things-factory/dataset 8.0.77 → 8.0.85

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "8.0.77",
+  "version": "8.0.85",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -50,11 +50,11 @@
     "@things-factory/scheduler-client": "^8.0.75",
     "@things-factory/shell": "^8.0.64",
     "@things-factory/work-shift": "^8.0.75",
-    "@things-factory/worklist": "^8.0.77",
+    "@things-factory/worklist": "^8.0.84",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.45",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "28afe4065a9d768a222760bf85165680a2e40a55"
+  "gitHead": "c4dd3885e20d29c6e5d25c8f495e151ff71e3433"
 }

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

@@ -19,10 +19,15 @@ async function callback(
   const { input, output, state } = activityInstance
 
   if (state == ActivityInstanceStatus.Ended) {
-    const activity = (await tx.getRepository(Activity).findOneBy({
-      domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
-      name: 'Collect Data'
-    })) as Activity
+    var activities = await tx.getRepository(Activity).find({
+      where: {
+        domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
+        name: 'Collect Data'
+      }
+    })
+
+    // Prioritize the activity in the current domain
+    const activity = activities.find(a => a.domainId === domain.id) || activities.find(a => a.domainId === domain.parentId)
 
     /* collect-data 액티비티는 한명의 assignee(thread)만 수행하는 multiple: false 액티비티이다. 따라서, output에는 assignee key가 없이, 순수한 data만 들어있다. */
     const data = output

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

@@ -35,7 +35,8 @@ async function callback(
 
     if (judgment == 'abnormal') {
       /* Review 결과가 Ooc 조치가 필요하다고 하면, DataOoc를 생성하고, DataOocResolve를 이슈한다. */
-      var ooc = await createDataOoc(dataSample, dataSample.dataSet, context)
+      const dataSet = dataSample.dataSet
+      var ooc = await createDataOoc(dataSample, dataSet, context)
 
       ooc = await tx.getRepository(DataOoc).save({
         ...ooc,
@@ -46,7 +47,10 @@ async function callback(
         state: DataOocStatus.REVIEWED
       })
 
-      await issueOocResolve(ooc, dataSample.dataSet, instruction, context)
+      // save() 후 dataSet relation이 손실되므로 다시 설정
+      ooc.dataSet = dataSet
+
+      await issueOocResolve(ooc, dataSet, instruction, context)
     }
   }
 }

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

@@ -35,6 +35,9 @@ async function callback(
       state: DataOocStatus.REVIEWED
     })
 
+    // save() 후 dataSet relation이 손실되므로 다시 설정
+    dataOoc.dataSet = dataSet
+
     await issueOocResolve(dataOoc, dataSet, correctiveInstruction, context)
   }
 }

package/server/controllers/create-data-ooc.ts

@@ -33,7 +33,7 @@ export async function createDataOoc(
   })
 
   if (dataSet.outlierScenarioId) {
-    const scenario = await tx.getRepository(Scenario).findOne({
+    var scenarios = await tx.getRepository(Scenario).find({
       where: {
         domain: domain.parentId ? { id: In([domain.id, domain.parentId]) } : { id: domain.id },
         id: dataSet.outlierScenarioId
@@ -41,6 +41,8 @@ export async function createDataOoc(
       relations: ['domain', 'steps', 'updater']
     })
 
+    const scenario = scenarios.find(s => s.domain.id === domain.id) || scenarios.find(s => s.domain.id === domain.parentId)
+
     if (scenario) {
       scenario.start({
         instanceName: scenario.name + ':' + dataSet.name + ':' + dataSample.id,

package/server/controllers/create-data-sample.ts

@@ -291,8 +291,8 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
             approvalLine: dataSet.reviewApprovalLine
           }
 
-          dataSample.reviewActivityInstance = await issue(activityInstance as any, context)
-          await getRepository(DataSample, tx).save(dataSample)
+          const reviewActivityInstance = await issue(activityInstance as any, context)
+          await getRepository(DataSample, tx).update({ id: dataSample.id }, { reviewActivityInstance })
 
           try {
             pubsub.publish('notification', {

package/server/controllers/finalize-data-collection.ts

@@ -205,11 +205,13 @@ export async function finalizeLatestDataCollection(dataSetId: string, context: R
   const { domain, user, tx } = context.state
 
   try {
-    const dataSet = await tx.getRepository(DataSet).findOne({
+    var dataSets = await tx.getRepository(DataSet).find({
       where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSetId },
       relations: ['dataKeySet']
     })
 
+    const dataSet = dataSets.find(ds => ds.domainId === domain.id) || dataSets.find(ds => ds.domainId === domain.parentId)
+
     const dataKeyItems = dataSet.dataKeySet?.dataKeyItems || []
     const dataItems = dataSet.dataItems.filter(item => item.stat)
     const initialSummary = dataItems.reduce((sum, item) => {
@@ -314,14 +316,16 @@ export async function finalizeDataCollection(
   const { domain, user, tx } = context.state
 
   try {
-    const dataSet =
+    var dataSets =
       dataSetId &&
-      (await tx.getRepository(DataSet).findOne({
+      (await tx.getRepository(DataSet).find({
         where: { domain: In([domain.id, domain.parentId].filter(Boolean)), id: dataSetId },
         relations: ['dataKeySet']
       }))
 
-    const dataKeyItems = dataSet.dataKeySet?.dataKeyItems || []
+    const dataSet = dataSets?.find(ds => ds.domainId === domain.id) || dataSets?.find(ds => ds.domainId === domain.parentId)
+
+    const dataKeyItems = dataSet?.dataKeySet?.dataKeyItems || []
     const dataItems = dataSet.dataItems.filter(item => item.stat)
     const initialSummary = dataItems.reduce((sum, item) => {
       sum[item.tag] = []

package/server/controllers/issue-data-collection-task.ts

@@ -17,7 +17,7 @@ export async function issueDataCollectionTask(
       throw new Error(`domain(${domainId}) not found`)
     }
 
-    const dataSet = await tx.getRepository(DataSet).findOne({
+    var dataSets = await tx.getRepository(DataSet).find({
       where: {
         domain: {
           id: In([domain.id, domain.parentId].filter(Boolean))
@@ -27,10 +27,16 @@ export async function issueDataCollectionTask(
       relations: ['entryRole']
     })
 
-    const activity = (await tx.getRepository(Activity).findOneBy({
-      domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
-      name: 'Collect Data'
-    })) as Activity
+    const dataSet = dataSets.find(ds => ds.domainId === domain.id) || dataSets.find(ds => ds.domainId === domain.parentId)
+
+    var activities = await tx.getRepository(Activity).find({
+      where: {
+        domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
+        name: 'Collect Data'
+      }
+    })
+
+    const activity = activities.find(a => a.domainId === domain.id) || activities.find(a => a.domainId === domain.parentId)
 
     if (activity) {
       const { entryRole, timeLimit } = dataSet

package/server/controllers/issue-ooc-resolve.ts

@@ -15,10 +15,16 @@ export async function issueOocResolve(
   const { domain, user, tx } = context.state
   const { resolverRoleId, outlierApprovalLine } = dataSet
 
-  const activity = (await tx.getRepository(Activity).findOneBy({
-    domain: domain.parentId ? In([domain.id, domain.parentId]) : { id: domain.id },
-    name: 'OOC Resolve'
-  })) as Activity
+  var activities = await tx.getRepository(Activity).find({
+    where: {
+      domain: domain.parentId ? In([domain.id, domain.parentId]) : { id: domain.id },
+      name: 'OOC Resolve'
+    }
+  })
+
+  // Prioritize the activity in the current domain
+  // Assumes that if both exist, the one in my domain is the intended customization or override
+  var activity = activities.find(a => a.domainId === domain.id) || activities.find(a => a.domainId === domain.parentId)
 
   if (activity) {
     const assigneeRole =
@@ -45,8 +51,8 @@ export async function issueOocResolve(
         approvalLine: outlierApprovalLine
       }
 
-      dataOoc.resolveActivityInstance = await issue(activityInstance, context)
-      await tx.getRepository(DataOoc).save(dataOoc)
+      const resolveActivityInstance = await issue(activityInstance, context)
+      await tx.getRepository(DataOoc).update({ id: dataOoc.id }, { resolveActivityInstance })
     } else {
       console.error(
         `Assignees are not set. So, Data OOC Resolve task for ${dataOoc.name}(${dataOoc.id}) could not be issued.`

package/server/controllers/issue-ooc-review.ts

@@ -11,10 +11,14 @@ export async function issueOocReview(dataOoc: DataOoc, dataSet: DataSet, context
   const { domain, tx } = context.state
   const { collectedAt } = dataOoc
 
-  const activity = (await tx.getRepository(Activity).findOneBy({
-    domain: domain.parentId ? { id: In([domain.id, domain.parentId]) } : { id: domain.id },
-    name: 'OOC Review'
-  })) as Activity
+  var activities = await tx.getRepository(Activity).find({
+    where: {
+      domain: domain.parentId ? In([domain.id, domain.parentId]) : { id: domain.id },
+      name: 'OOC Review'
+    }
+  })
+
+  var activity = activities.find(a => a.domainId === domain.id) || activities.find(a => a.domainId === domain.parentId)
 
   if (activity) {
     const assigneeRole =
@@ -39,8 +43,8 @@ export async function issueOocReview(dataOoc: DataOoc, dataSet: DataSet, context
         approvalLine: []
       }
 
-      dataOoc.reviewActivityInstance = await issue(activityInstance as any, context)
-      await tx.getRepository(DataOoc).save(dataOoc)
+      const reviewActivityInstance = await issue(activityInstance as any, context)
+      await tx.getRepository(DataOoc).update({ id: dataOoc.id }, { reviewActivityInstance })
     } else {
       console.error(
         `Assignees are not set. So Data OOC Review task for ${dataOoc.name}(${dataOoc.id}) could not be issued.`

package/server/controllers/query-data-summary-by-period.ts

@@ -27,11 +27,14 @@ export async function queryDataSummaryByPeriod(
   const { domain, user, tx } = context.state
   const { t } = context
 
-  const dataSet = await getRepository(DataSet).findOne({
+  var dataSets = await getRepository(DataSet).find({
     where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, name: dataSetName },
     relations: ['dataKeySet']
   })
 
+  // Prioritize the dataset in the current domain
+  const dataSet = dataSets.find(ds => ds.domainId === domain.id) || dataSets.find(ds => ds.domainId === domain.parentId)
+
   if (!dataSet) {
     throw new Error(t('error.dataset not found', { dataSetName }))
   }

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

@@ -42,6 +42,9 @@ const DATABASE_TYPE = ORMCONFIG.type
   (dataSample: DataSample) => [dataSample.domain, dataSample.dataSet, dataSample.collectedAt],
   { unique: false }
 )
+@Index('ix_data_sample_2', (dataSample: DataSample) => [dataSample.domain, dataSample.name, dataSample.workDate], {
+  unique: false
+})
 @ObjectType({ description: 'Entity for DataSample' })
 export class DataSample {
   @PrimaryGeneratedColumn('uuid')