@things-factory/dataset 8.0.5 → 8.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "8.0.5",
+  "version": "8.0.8",
   "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.5",
-    "@things-factory/aws-base": "^8.0.5",
-    "@things-factory/board-service": "^8.0.5",
-    "@things-factory/env": "^8.0.2",
-    "@things-factory/integration-base": "^8.0.5",
-    "@things-factory/organization": "^8.0.5",
-    "@things-factory/personalization": "^8.0.5",
-    "@things-factory/scheduler-client": "^8.0.5",
-    "@things-factory/shell": "^8.0.2",
-    "@things-factory/work-shift": "^8.0.5",
-    "@things-factory/worklist": "^8.0.5",
+    "@things-factory/auth-base": "^8.0.8",
+    "@things-factory/aws-base": "^8.0.8",
+    "@things-factory/board-service": "^8.0.8",
+    "@things-factory/env": "^8.0.8",
+    "@things-factory/integration-base": "^8.0.8",
+    "@things-factory/organization": "^8.0.8",
+    "@things-factory/personalization": "^8.0.8",
+    "@things-factory/scheduler-client": "^8.0.8",
+    "@things-factory/shell": "^8.0.8",
+    "@things-factory/work-shift": "^8.0.8",
+    "@things-factory/worklist": "^8.0.8",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.45",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "9ab6fca18eeb58b9d2f3411661508a39d0ab6aee"
+  "gitHead": "2f53ec5833616a278c1f5fc057a5ce50f309cebd"
 }

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

@@ -7,8 +7,8 @@ import {
   ActivityInstanceStatus,
   UpdateActivityInstanceStateAddendum
 } from '@things-factory/worklist'
-import { NewDataSample } from 'service/data-sample/data-sample-type'
-import { createDataSample } from '../controllers/create-data-sample'
+import { NewDataSample } from '../service/data-sample/data-sample-type.js'
+import { createDataSample } from '../controllers/create-data-sample.js'
 
 async function callback(
   activityInstance: ActivityInstance,

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

@@ -4,7 +4,7 @@ import { In } from 'typeorm'
 import { Attachment, createAttachment } from '@things-factory/attachment-base'
 import { Role } from '@things-factory/auth-base'
 import { logger } from '@things-factory/env'
-import { getRedirectSubdomainPath, pubsub } from '@things-factory/shell'
+import { getRepository, getRedirectSubdomainPath, pubsub } from '@things-factory/shell'
 import { getWorkDateAndShift } from '@things-factory/work-shift'
 import { Scenario, publishData } from '@things-factory/integration-base'
 import { Activity } from '@things-factory/worklist'
@@ -59,7 +59,7 @@ const formatDate = (keys, _moment) => {
 export async function createDataSample(newDataSample: NewDataSample, context: ResolverContext): Promise<DataSample> {
   const { domain, user, tx } = context.state
 
-  const dataSet = await tx.getRepository(DataSet).findOne({
+  const dataSet = await getRepository(DataSet, tx).findOne({
     where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: newDataSample.dataSet.id },
     relations: ['dataKeySet']
   })
@@ -96,7 +96,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
 
   const { ooc, oos, judgment } = DataUseCase.evaluate(dataSet, dataItems, newDataSample.data) || {}
 
-  const old = await tx.getRepository(DataSample).findOne({
+  const old = await getRepository(DataSample, tx).findOne({
     where: {
       domain: { id: domain.id },
       dataSet: { id: dataSet.id },
@@ -139,7 +139,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
                   context
                 )
 
-                const fetched = await tx.getRepository(Attachment).findOneBy({ id: attachment.id })
+                const fetched = await getRepository(Attachment, tx).findOneBy({ id: attachment.id })
                 if (fetched) {
                   attachments.push(fetched)
                   paths.push({
@@ -165,7 +165,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
     }
   }
 
-  const dataSample = await tx.getRepository(DataSample).save({
+  const dataSample = await getRepository(DataSample, tx).save({
     ...old,
     name: dataSet.name,
     description: dataSet.description,
@@ -193,7 +193,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
   /* post-process for for file attachment. */
   if (attachments.length > 0) {
     attachments.forEach(attachment => (attachment.refId = dataSample.id))
-    tx.getRepository(Attachment).save(attachments)
+    getRepository(Attachment, tx).save(attachments)
   }
 
   if (ooc || oos) {
@@ -207,7 +207,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
           type: 'error',
           title: `[OOC] ${dataSet.name}`,
           body: `Data OOC occurred on '${dataSet.name}'`,
-          url: getRedirectSubdomainPath(context, domain.subdomain, `/data-ooc/${dataOoc.id}`),
+          url: getRedirectSubdomainPath(context, domain, `/data-ooc/${dataOoc.id}`),
           timestamp: collectedAt
         }
       })
@@ -216,7 +216,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
     }
   } else {
     if (normalScenarioId) {
-      const scenario = await tx.getRepository(Scenario).findOne({
+      const scenario = await getRepository(Scenario, tx).findOne({
         where: {
           domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
           id: normalScenarioId
@@ -257,7 +257,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
     }
 
     if (dataSet.requiresReview) {
-      const activity = (await tx.getRepository(Activity).findOneBy({
+      const activity = (await getRepository(Activity, tx).findOneBy({
         domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
         name: 'Data Review'
       })) as Activity
@@ -265,7 +265,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
       if (activity) {
         const assigneeRole =
           dataSet.supervisoryRoleId &&
-          (await tx.getRepository(Role).findOneBy({
+          (await getRepository(Role, tx).findOneBy({
             domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },
             id: dataSet.supervisoryRoleId
           }))
@@ -292,7 +292,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
           }
 
           dataSample.reviewActivityInstance = await issue(activityInstance as any, context)
-          await tx.getRepository(DataSample).save(dataSample)
+          await getRepository(DataSample, tx).save(dataSample)
 
           try {
             pubsub.publish('notification', {
@@ -301,7 +301,7 @@ export async function createDataSample(newDataSample: NewDataSample, context: Re
                 type: 'info',
                 title: `[Data Review] ${dataSet.name}`,
                 body: `Data Review occurred on '${dataSet.name}'`,
-                url: getRedirectSubdomainPath(context, domain.subdomain, `/data-sample/${dataSample.id}`),
+                url: getRedirectSubdomainPath(context, domain, `/data-sample/${dataSample.id}`),
                 timestamp: collectedAt
               }
             })

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

@@ -20,7 +20,7 @@ import { DataSet, DataSetSummaryPeriodType } from '../service/data-set/data-set'
 import { DataSummary } from '../service/data-summary/data-summary'
 import { DataKeyItem } from '../service/data-key-set/data-key-item-type'
 
-import { DataItem } from 'service'
+import { DataItem } from '../service/data-set/data-item-type.js'
 
 const STAT_FUNCTION_MAP = {
   sum: 'sum',
@@ -90,7 +90,11 @@ const calculateSummary = (dataItems: DataItem[], base: { [tag: string]: any[] })
   }, {})
 }
 
-const fillSummaryResult = (dataSummary: Partial<DataSummary>, dataItems: DataItem[], base: { [tag: string]: any[] }): void => {
+const fillSummaryResult = (
+  dataSummary: Partial<DataSummary>,
+  dataItems: DataItem[],
+  base: { [tag: string]: any[] }
+): void => {
   const summary = calculateSummary(dataItems, base)
 
   dataSummary.summary = summary
@@ -100,7 +104,10 @@ const fillSummaryResult = (dataSummary: Partial<DataSummary>, dataItems: DataIte
   })
 }
 
-async function getLatestTimesForPeriod(periodType: DataSetSummaryPeriodType, context: ResolverContext): Promise<{ date?: string; period?: string; range: Date[] }> {
+async function getLatestTimesForPeriod(
+  periodType: DataSetSummaryPeriodType,
+  context: ResolverContext
+): Promise<{ date?: string; period?: string; range: Date[] }> {
   const { domain } = context.state
   const now = moment()
 
@@ -278,7 +285,17 @@ export async function finalizeLatestDataCollection(dataSetId: string, context: R
       page++
     } while (true)
 
-    tx.getRepository(DataSummary).upsert(summaries, ['domain', 'dataSet', 'key01', 'key02', 'key03', 'key04', 'key05', 'date', 'period'])
+    tx.getRepository(DataSummary).upsert(summaries, [
+      'domain',
+      'dataSet',
+      'key01',
+      'key02',
+      'key03',
+      'key04',
+      'key05',
+      'date',
+      'period'
+    ])
 
     return true
   } catch (e) {
@@ -288,7 +305,12 @@ export async function finalizeLatestDataCollection(dataSetId: string, context: R
   return false
 }
 
-export async function finalizeDataCollection(dataSetId: string, date: string, period: string, context: ResolverContext): Promise<boolean> {
+export async function finalizeDataCollection(
+  dataSetId: string,
+  date: string,
+  period: string,
+  context: ResolverContext
+): Promise<boolean> {
   const { domain, user, tx } = context.state
 
   try {
@@ -377,7 +399,17 @@ export async function finalizeDataCollection(dataSetId: string, date: string, pe
       page++
     } while (true)
 
-    tx.getRepository(DataSummary).upsert(summaries, ['domain', 'dataSet', 'key01', 'key02', 'key03', 'key04', 'key05', 'date', 'period'])
+    tx.getRepository(DataSummary).upsert(summaries, [
+      'domain',
+      'dataSet',
+      'key01',
+      'key02',
+      'key03',
+      'key04',
+      'key05',
+      'date',
+      'period'
+    ])
 
     return true
   } catch (e) {

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

@@ -3,8 +3,8 @@ import { Activity } from '@things-factory/worklist'
 import { issue } from '@things-factory/worklist/dist-server/controllers/activity-instance/issue'
 import { Role } from '@things-factory/auth-base'
 
-import { DataOoc } from '../service/data-ooc/data-ooc'
-import { DataSet } from 'service'
+import { DataOoc } from '../service/data-ooc/data-ooc.js'
+import { DataSet } from '../service/data-set/data-set.js'
 
 export async function issueOocResolve(
   dataOoc: DataOoc,

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

@@ -10,7 +10,7 @@ import {
   UpdateDateColumn
 } from 'typeorm'
 
-import { Domain } from '@things-factory/shell'
+import { Domain, roundTransformer } from '@things-factory/shell'
 import { Appliance, User } from '@things-factory/auth-base'
 import { Scenario } from '@things-factory/integration-base'
 
@@ -74,6 +74,14 @@ export class DataSensor {
   @Field({ nullable: true })
   tag?: string
 
+  @Column({ type: 'float', nullable: true, comment: '용량', transformer: roundTransformer })
+  @Field({ nullable: true })
+  capacity?: number
+
+  @Column({ nullable: true, comment: '용량 단위' })
+  @Field({ nullable: true })
+  unit?: string
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   refBy?: string