@things-factory/kpi 9.0.31 → 9.0.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/kpi",
-  "version": "9.0.31",
+  "version": "9.0.32",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -18,9 +18,10 @@
   },
   "scripts": {
     "build": "npm run build:server && npm run build:client",
-    "copy:files": "copyfiles -e \"./client/**/*.{ts,js,json}\" -u 1 \"./client/**/*\" dist-client",
-    "build:client": "npm run copy:files && npx tsc --p ./client/tsconfig.json",
-    "build:server": "npx tsc --p ./server/tsconfig.json",
+    "copy:files:client": "copyfiles -e \"./client/**/*.{ts,js,json}\" -u 1 \"./client/**/*\" dist-client",
+    "copy:files:server": "copyfiles -e \"./server/**/*.{ts,js}\" -u 1 \"./server/**/*\" dist-server",
+    "build:client": "npm run copy:files:client && npx tsc --p ./client/tsconfig.json",
+    "build:server": "npm run copy:files:server && npx tsc --p ./server/tsconfig.json",
     "clean:client": "npx rimraf dist-client",
     "clean:server": "npx rimraf dist-server",
     "clean": "npm run clean:server && npm run clean:client",
@@ -41,8 +42,8 @@
     "@operato/styles": "^9.0.0",
     "@operato/utils": "^9.0.0",
     "@things-factory/auth-base": "^9.0.25",
-    "@things-factory/dataset": "^9.0.28",
+    "@things-factory/dataset": "^9.0.32",
     "@things-factory/shell": "^9.0.25"
   },
-  "gitHead": "3edffaba43578c71e33389fa27696de99a006049"
+  "gitHead": "a0418d09e6d7d514349d04d1725bd1d17e41f374"
 }

package/server/@types/index.d.ts

@@ -0,0 +1,11 @@
+// Things Factory Global Types
+// auth-base의 글로벌 타입들을 자동으로 사용할 수 있게 함
+
+/// <reference types="@things-factory/auth-base/server/types" />
+
+declare global {
+  // 추가적인 KPI 모듈만의 글로벌 타입이 필요하면 여기에 선언
+  // 예: KpiContext, KpiFormula 등
+}
+
+export {}

package/server/controllers/kpi-metric-value-provider.ts

@@ -8,7 +8,7 @@ export class KpiMetricValueProvider implements ValueProvider {
   constructor(
     private options: {
       valueDate: string
-      group?: string
+      org?: string
       domainId: string
       tx?: any
     }
@@ -25,13 +25,13 @@ export class KpiMetricValueProvider implements ValueProvider {
       const value = await valueRepo.findOne({
         where: {
           metric: { id: metric.id },
-          group: this.options.group ?? '',
+          org: this.options.org ?? '',
           domain: { id: this.options.domainId }
         },
         order: { createdAt: 'DESC' }
       })
       if (!value) {
-        throw new Error(`Metric value not found: metric='${name}', group='${this.options.group ?? ''}' (ALLTIME type)`)
+        throw new Error(`Metric value not found: metric='${name}', org='${this.options.org ?? ''}' (ALLTIME type)`)
       }
       return value.value
     }
@@ -52,13 +52,13 @@ export class KpiMetricValueProvider implements ValueProvider {
       where: {
         metric: { id: metric.id },
         valueDate,
-        group: this.options.group ?? '',
+        org: this.options.org ?? '',
         domain: { id: this.options.domainId }
       }
     })
     if (!value) {
       throw new Error(
-        `Metric value not found: metric='${name}', group='${this.options.group ?? ''}', valueDate='${valueDate}', periodType='${metric.periodType}'`
+        `Metric value not found: metric='${name}', org='${this.options.org ?? ''}', valueDate='${valueDate}', periodType='${metric.periodType}'`
       )
     }
     return value.value

package/server/controllers/kpi-value-provider.ts

@@ -7,7 +7,7 @@ export class KpiValueProvider implements ValueProvider {
   constructor(
     private options: {
       valueDate: string
-      group?: string
+      org?: string
       domainId: string
       tx?: any
     }
@@ -22,7 +22,7 @@ export class KpiValueProvider implements ValueProvider {
     // SINGLE 타입인 경우 valueDate 무시하고 최신 값 조회
     const whereCondition: any = {
       kpi: { id: kpi.id },
-      group: this.options.group ?? '',
+      org: this.options.org ?? '',
       domain: { id: this.options.domainId }
     }
 
@@ -33,7 +33,7 @@ export class KpiValueProvider implements ValueProvider {
         order: { createdAt: 'DESC' }
       })
       if (!value) {
-        throw new Error(`KPI value not found: kpi='${name}', group='${this.options.group ?? ''}' (ALLTIME type)`)
+        throw new Error(`KPI value not found: kpi='${name}', org='${this.options.org ?? ''}' (ALLTIME type)`)
       }
       return value.value
     } else {
@@ -42,7 +42,7 @@ export class KpiValueProvider implements ValueProvider {
       const value = await valueRepo.findOne({ where: whereCondition })
       if (!value) {
         throw new Error(
-          `KPI value not found: kpi='${name}', group='${this.options.group ?? ''}', valueDate='${this.options.valueDate}'`
+          `KPI value not found: kpi='${name}', org='${this.options.org ?? ''}', valueDate='${this.options.valueDate}'`
         )
       }
       return value.value

package/server/migrations/1752190849680-seed-kpi-metrics.ts

@@ -0,0 +1,124 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+import { Domain, getRepository } from '@things-factory/shell'
+import { KpiPeriodType } from '../service/kpi/kpi'
+import { KpiMetric, KpiMetricCollectType } from '../service/kpi-metric/kpi-metric'
+import * as fs from 'fs'
+import * as path from 'path'
+
+interface KpiMetricSeedData {
+  name: string
+  description: string
+  unit?: string | null
+  source?: string | null
+  field_name?: string | null
+  active: boolean
+  schedule_id?: string | null
+  timezone: string
+  data_set_id?: string | null
+  period_type: string
+  collect_type: string
+  schedule?: string | null
+  created_at?: string
+  updated_at?: string
+}
+
+export class SeedKpiMetrics1752190849680 implements MigrationInterface {
+  name = 'SeedKpiMetrics1752190849680'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    try {
+      const repository = getRepository(KpiMetric)
+      const domainRepository = getRepository(Domain)
+
+      // SYSTEM 도메인 확인
+      const domain: Domain = await domainRepository.findOneBy({ name: 'SYSTEM' })
+      if (!domain) {
+        console.log('❌ SYSTEM domain not found')
+        return
+      }
+
+      // JSON 파일 읽기
+      const seedFilePath = path.join(__dirname, 'seed-data', 'kpi-metrics-seed.json')
+      const seedData: KpiMetricSeedData[] = JSON.parse(fs.readFileSync(seedFilePath, 'utf8'))
+
+      console.log(`📊 Processing ${seedData.length} KPI metrics from JSON seed`)
+
+      for (const metricData of seedData) {
+        try {
+          const existingMetric = await repository.findOne({
+            where: { name: metricData.name, domain: { id: domain.id } }
+          })
+
+          if (existingMetric) {
+            console.log(`⚠️  KPI Metric already exists: ${metricData.name}`)
+            continue
+          }
+
+          const metric = await repository.save({
+            name: metricData.name,
+            description: metricData.description,
+            unit: metricData.unit,
+            source: metricData.source,
+            fieldName: metricData.field_name,
+            active: metricData.active,
+            scheduleId: metricData.schedule_id,
+            timezone: metricData.timezone,
+            dataSetId: metricData.data_set_id,
+            periodType: KpiPeriodType[metricData.period_type as keyof typeof KpiPeriodType],
+            collectType: KpiMetricCollectType[metricData.collect_type as keyof typeof KpiMetricCollectType],
+            schedule: metricData.schedule,
+            domain
+          })
+
+          console.log(`✅ Created KPI Metric: ${metric.name}`)
+        } catch (error) {
+          console.error(`❌ Error creating KPI Metric "${metricData.name}":`, error)
+        }
+      }
+
+      console.log(`🎉 Successfully processed KPI metrics from JSON seed`)
+    } catch (error) {
+      console.error('❌ Error seeding KPI metrics from JSON:', error)
+      throw error
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    try {
+      const repository = getRepository(KpiMetric)
+      const domainRepository = getRepository(Domain)
+
+      const domain: Domain = await domainRepository.findOneBy({ name: 'SYSTEM' })
+      if (!domain) {
+        console.log('⚠️  SYSTEM domain not found. Nothing to delete.')
+        return
+      }
+
+      // JSON 파일 읽기
+      const seedFilePath = path.join(__dirname, 'seed-data', 'kpi-metrics-seed.json')
+      const seedData: KpiMetricSeedData[] = JSON.parse(fs.readFileSync(seedFilePath, 'utf8'))
+
+      console.log(`🗑️  Cleaning up ${seedData.length} KPI metrics`)
+
+      for (const metricData of seedData.reverse()) {
+        try {
+          const metric = await repository.findOne({
+            where: { name: metricData.name, domain: { id: domain.id } }
+          })
+
+          if (metric) {
+            await repository.delete(metric.id)
+            console.log(`✅ Deleted KPI Metric: ${metricData.name}`)
+          }
+        } catch (error) {
+          console.error(`❌ Error deleting KPI Metric "${metricData.name}":`, error)
+        }
+      }
+
+      console.log(`🎉 Successfully cleaned up KPI metrics`)
+    } catch (error) {
+      console.error('❌ Error cleaning up KPI metrics:', error)
+      throw error
+    }
+  }
+}

package/server/migrations/1752190849681-seed-kpi.ts

@@ -0,0 +1,356 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+import { Domain, getRepository } from '@things-factory/shell'
+import { Kpi, KpiStatus, KpiPeriodType, KpiVizType } from '../service/kpi/kpi'
+import * as fs from 'fs'
+import * as path from 'path'
+
+const SEED = [
+  // 일정성과 (Y1) - Schedule Performance
+  {
+    name: '연면적 대비 공사기간',
+    description: '연면적 대비 공사기간 평가',
+    categoryName: '일정성과',
+    formula: 'Eq. 활용',
+    scoreType: 'equation',
+    dataType: 'ratio'
+  },
+  {
+    name: '설계변경에 따른 공기 증감률',
+    description: '설계변경에 따른 공기 증감률 평가',
+    categoryName: '일정성과',
+    formula: 'Eq. 활용',
+    scoreType: 'equation',
+    dataType: 'ratio'
+  },
+  {
+    name: '일정 이탈 수준',
+    description: '프로젝트 일정 이탈 수준 평가',
+    categoryName: '일정성과',
+    formula: 'Table(DART 등) 활용(1~5점)',
+    scoreType: 'table',
+    dataType: 'score'
+  },
+  {
+    name: '일정성과 수준 평가',
+    description: '일정성과 종합 평가',
+    categoryName: '일정성과',
+    formula: '감리자 1~5점 척도',
+    scoreType: 'inspector',
+    dataType: 'score'
+  },
+
+  // 비용성과 (Y2) - Cost Performance
+  {
+    name: '연면적 대비 공사비',
+    description: '연면적 대비 공사비 평가',
+    categoryName: '비용성과',
+    formula: 'Eq. 활용',
+    scoreType: 'equation',
+    dataType: 'ratio'
+  },
+  {
+    name: '설계변경에 따른 공사비 증감률',
+    description: '설계변경에 따른 공사비 증감률 평가',
+    categoryName: '비용성과',
+    formula: 'Eq. 활용',
+    scoreType: 'equation',
+    dataType: 'ratio'
+  },
+  {
+    name: '비용성과 수준 평가',
+    description: '비용성과 종합 평가',
+    categoryName: '비용성과',
+    formula: '감리자 1~5점 척도',
+    scoreType: 'inspector',
+    dataType: 'score'
+  },
+
+  // 품질성과 (Y3) - Quality Performance
+  {
+    name: '품질시험 불합격률',
+    description: '품질시험 불합격률 평가',
+    categoryName: '품질성과',
+    formula: 'Eq. 활용',
+    scoreType: 'equation',
+    dataType: 'ratio'
+  },
+  {
+    name: '검수자재 불합격률',
+    description: '검수자재 불합격률 평가',
+    categoryName: '품질성과',
+    formula: 'Eq. 활용',
+    scoreType: 'equation',
+    dataType: 'ratio'
+  },
+  {
+    name: '검측 불합격률',
+    description: '검측 불합격률 평가',
+    categoryName: '품질성과',
+    formula: 'Table 활용',
+    scoreType: 'table',
+    dataType: 'score'
+  },
+  {
+    name: '품질 SL-PA 결과값',
+    description: '품질 SL-PA 결과',
+    categoryName: '품질성과',
+    formula: 'Python 활용(1~5점)',
+    scoreType: 'python',
+    dataType: 'score'
+  },
+  {
+    name: '품질성과 수준 평가',
+    description: '품질성과 종합 평가',
+    categoryName: '품질성과',
+    formula: '감리자 1~5점 척도',
+    scoreType: 'inspector',
+    dataType: 'score'
+  },
+
+  // 안전성과 (Y4) - Safety Performance
+  {
+    name: '재해율',
+    description: '재해율 평가',
+    categoryName: '안전성과',
+    formula: 'Eq. 활용',
+    scoreType: 'equation',
+    dataType: 'ratio'
+  },
+  {
+    name: '재해강도율',
+    description: '재해강도율 평가',
+    categoryName: '안전성과',
+    formula: 'Table 활용',
+    scoreType: 'table',
+    dataType: 'score'
+  },
+  {
+    name: '안전 SL-PA 결과값',
+    description: '안전 SL-PA 결과',
+    categoryName: '안전성과',
+    formula: 'Python 활용(1~5점)',
+    scoreType: 'python',
+    dataType: 'score'
+  },
+  {
+    name: '안전성과 수준 평가',
+    description: '안전성과 종합 평가',
+    categoryName: '안전성과',
+    formula: '감리자 1~5점 척도',
+    scoreType: 'inspector',
+    dataType: 'score'
+  },
+
+  // 환경성과 (Y5) - Environmental Performance
+  {
+    name: '건설폐기물 발생량',
+    description: '건설폐기물 발생량 평가',
+    categoryName: '환경성과',
+    formula: 'Table 활용',
+    scoreType: 'table',
+    dataType: 'score'
+  },
+  {
+    name: '환경성과 수준 평가',
+    description: '환경성과 종합 평가',
+    categoryName: '환경성과',
+    formula: '감리자 1~5점 척도',
+    scoreType: 'inspector',
+    dataType: 'score'
+  },
+
+  // 생산성성과 (Y6) - Productivity Performance
+  {
+    name: '투입인력 생산성',
+    description: '투입인력 생산성 평가',
+    categoryName: '생산성과',
+    formula: 'Eq. 활용',
+    scoreType: 'equation',
+    dataType: 'ratio'
+  },
+  {
+    name: '생산성성과 수준 평가',
+    description: '생산성과 종합 평가',
+    categoryName: '생산성과',
+    formula: '감리자 1~5점 척도',
+    scoreType: 'inspector',
+    dataType: 'score'
+  }
+]
+
+interface KpiSeedData {
+  name: string
+  description: string
+  formula?: string | null
+  active: boolean
+  state?: string | null
+  viz_type?: string | null
+  viz_meta?: any | null
+  schedule?: string | null
+  schedule_id?: string | null
+  timezone?: string | null
+  grades?: any | null
+  period_type: string
+  weight: number
+  score_formula?: string | null
+  is_leaf: boolean
+  parent_name?: string | null
+}
+
+export class SeedKpi1752190849681 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<any> {
+    try {
+      const repository = getRepository(Kpi)
+      const domainRepository = getRepository(Domain)
+
+      // SYSTEM 도메인 확인
+      const domain: Domain = await domainRepository.findOneBy({ name: 'SYSTEM' })
+      if (!domain) {
+        console.log('❌ SYSTEM domain not found')
+        return
+      }
+
+      // JSON 파일 읽기
+      const seedFilePath = path.join(__dirname, 'seed-data', 'kpis-seed.json')
+      const seedData: KpiSeedData[] = JSON.parse(fs.readFileSync(seedFilePath, 'utf8'))
+
+      // 이름으로 KPI를 찾을 수 있는 맵 생성
+      const kpiNameMap = new Map<string, Kpi>()
+
+      // 1단계: parent_name이 null인 루트 KPI들 먼저 생성
+      const rootKpis = seedData.filter(kpi => kpi.parent_name === null)
+
+      for (const kpiData of rootKpis) {
+        const existingKpi = await repository.findOne({
+          where: { name: kpiData.name, domain: { id: domain.id } }
+        })
+
+        if (existingKpi) {
+          console.log(`⚠️  KPI already exists: ${kpiData.name}`)
+          kpiNameMap.set(kpiData.name, existingKpi)
+          continue
+        }
+
+        const kpi = await repository.save({
+          name: kpiData.name,
+          description: kpiData.description,
+          formula: kpiData.formula,
+          active: kpiData.active,
+          state: kpiData.state ? KpiStatus[kpiData.state as keyof typeof KpiStatus] : KpiStatus.DRAFT,
+          vizType: kpiData.viz_type ? KpiVizType[kpiData.viz_type as keyof typeof KpiVizType] : null,
+          vizMeta: kpiData.viz_meta,
+          schedule: kpiData.schedule,
+          scheduleId: kpiData.schedule_id,
+          timezone: kpiData.timezone,
+          grades: kpiData.grades ? JSON.parse(kpiData.grades) : null,
+          periodType: KpiPeriodType[kpiData.period_type as keyof typeof KpiPeriodType],
+          weight: kpiData.weight,
+          scoreFormula: kpiData.score_formula,
+          isLeaf: kpiData.is_leaf,
+          parent: null,
+          domain
+        })
+
+        kpiNameMap.set(kpi.name, kpi)
+        console.log(`✅ Created root KPI: ${kpi.name}`)
+      }
+
+      // 2단계: 자식 KPI들 생성 (parent_name이 있는 KPI들)
+      const childKpis = seedData.filter(kpi => kpi.parent_name !== null)
+
+      for (const kpiData of childKpis) {
+        const existingKpi = await repository.findOne({
+          where: { name: kpiData.name, domain: { id: domain.id } }
+        })
+
+        if (existingKpi) {
+          console.log(`⚠️  KPI already exists: ${kpiData.name}`)
+          continue
+        }
+
+        // 부모 KPI 찾기
+        const parentKpi = kpiNameMap.get(kpiData.parent_name!)
+        if (!parentKpi) {
+          console.log(`❌ Parent KPI not found: ${kpiData.parent_name} for ${kpiData.name}`)
+          continue
+        }
+
+        const kpi = await repository.save({
+          name: kpiData.name,
+          description: kpiData.description,
+          formula: kpiData.formula,
+          active: kpiData.active,
+          state: kpiData.state ? KpiStatus[kpiData.state as keyof typeof KpiStatus] : KpiStatus.DRAFT,
+          vizType: kpiData.viz_type ? KpiVizType[kpiData.viz_type as keyof typeof KpiVizType] : null,
+          vizMeta: kpiData.viz_meta,
+          schedule: kpiData.schedule,
+          scheduleId: kpiData.schedule_id,
+          timezone: kpiData.timezone,
+          grades: kpiData.grades ? JSON.parse(kpiData.grades) : null,
+          periodType: KpiPeriodType[kpiData.period_type as keyof typeof KpiPeriodType],
+          weight: kpiData.weight,
+          scoreFormula: kpiData.score_formula,
+          isLeaf: kpiData.is_leaf,
+          parent: parentKpi,
+          domain
+        })
+
+        kpiNameMap.set(kpi.name, kpi)
+        console.log(`✅ Created child KPI: ${kpi.name} (parent: ${parentKpi.name})`)
+      }
+
+      console.log(`🎉 Successfully processed ${seedData.length} KPIs from JSON seed`)
+    } catch (error) {
+      console.error('❌ Error seeding KPIs from JSON:', error)
+      throw error
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<any> {
+    try {
+      const repository = getRepository(Kpi)
+      const domainRepository = getRepository(Domain)
+
+      const domain: Domain = await domainRepository.findOneBy({ name: 'SYSTEM' })
+      if (!domain) {
+        console.log('⚠️  SYSTEM domain not found. Nothing to delete.')
+        return
+      }
+
+      // JSON 파일 읽기
+      const seedFilePath = path.join(__dirname, 'seed-data', 'kpis-seed.json')
+      const seedData: KpiSeedData[] = JSON.parse(fs.readFileSync(seedFilePath, 'utf8'))
+
+      // 자식부터 삭제 (역순으로)
+      const childKpis = seedData.filter(kpi => kpi.parent_name !== null).reverse()
+      const rootKpis = seedData.filter(kpi => kpi.parent_name === null).reverse()
+
+      // 자식 KPI들 먼저 삭제
+      for (const kpiData of childKpis) {
+        const kpi = await repository.findOne({
+          where: { name: kpiData.name, domain: { id: domain.id } }
+        })
+        if (kpi) {
+          await repository.delete(kpi.id)
+          console.log(`✅ Deleted child KPI: ${kpiData.name}`)
+        }
+      }
+
+      // 루트 KPI들 삭제
+      for (const kpiData of rootKpis) {
+        const kpi = await repository.findOne({
+          where: { name: kpiData.name, domain: { id: domain.id } }
+        })
+        if (kpi) {
+          await repository.delete(kpi.id)
+          console.log(`✅ Deleted root KPI: ${kpiData.name}`)
+        }
+      }
+
+      console.log(`🎉 Successfully cleaned up KPIs from JSON seed`)
+    } catch (error) {
+      console.error('❌ Error cleaning up KPIs:', error)
+      throw error
+    }
+  }
+}

package/server/migrations/1752192090123-add-grades-to-kpi.ts

@@ -0,0 +1,67 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+import { getRepository } from '@things-factory/shell'
+import { Kpi } from '../service/kpi/kpi'
+
+import * as fs from 'fs'
+import * as path from 'path'
+
+interface GradeData {
+  kpiName: string
+  version: number
+  description: string
+  grades: Array<{
+    name: string
+    minValue: number
+    maxValue: number
+    score?: number
+    color?: string
+    description?: string
+  }>
+}
+
+export class AddGradesToKpi1752192090123 implements MigrationInterface {
+  name = 'AddGradesToKpi1752192090123'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // grade-data 폴더의 JSON 파일들을 읽어서 해당 KPI의 grades 컬럼에 넣기
+    await this.loadGradeDataToKpi()
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {}
+
+  private async loadGradeDataToKpi(): Promise<void> {
+    const gradeDataPath = path.join(__dirname, 'grade-data')
+    const kpiRepository = getRepository(Kpi)
+
+    try {
+      // grade-data 폴더의 모든 JSON 파일 읽기
+      const files = fs.readdirSync(gradeDataPath).filter(file => file.endsWith('.json'))
+
+      for (const file of files) {
+        const filePath = path.join(gradeDataPath, file)
+        const fileContent = fs.readFileSync(filePath, 'utf8')
+        const gradeData: GradeData = JSON.parse(fileContent)
+
+        // KPI 이름으로 해당 KPI 찾기
+        const kpi = await kpiRepository.findOne({
+          where: { name: gradeData.kpiName, domain: { name: 'SYSTEM' } }
+        })
+
+        if (kpi) {
+          // grades 데이터를 업데이트
+          kpi.grades = gradeData.grades
+          await kpiRepository.save(kpi)
+
+          console.log(`✅ Loaded grades for KPI: ${gradeData.kpiName} (${gradeData.grades.length} grades)`)
+        } else {
+          console.log(`⚠️  KPI not found: ${gradeData.kpiName}`)
+        }
+      }
+
+      console.log(`🎉 Successfully loaded grades data for ${files.length} files`)
+    } catch (error) {
+      console.error('❌ Error loading grade data:', error)
+      throw error
+    }
+  }
+}