@things-factory/kpi 9.0.31 → 9.0.32

package/server/service/kpi-value/kpi-value-mutation.ts

@@ -6,6 +6,7 @@ import { KpiValue } from './kpi-value'
 import { NewKpiValue, KpiValuePatch } from './kpi-value-type'
 import { Kpi } from '../kpi/kpi'
 import { KpiMetric } from '../kpi-metric/kpi-metric'
+import { KpiOrgScope } from '../kpi-org-scope/kpi-org-scope'
 import { KpiMetricValue } from '../kpi-metric-value/kpi-metric-value'
 import { KpiPeriodType } from '../kpi/kpi'
 import { getDefaultValueDate } from '../utils/value-date-util'
@@ -38,18 +39,50 @@ export class KpiValueMutation {
       }
     }
 
+    // KpiOrgScope 처리
+    let kpiOrgScope: KpiOrgScope | undefined
+    if (kpiValue.kpiOrgScopeId) {
+      kpiOrgScope = await getRepository(KpiOrgScope, context.state?.tx).findOne({
+        where: { id: kpiValue.kpiOrgScopeId, domain: { id: domain.id } }
+      })
+      if (!kpiOrgScope) {
+        throw new Error(`KpiOrgScope not found: ${kpiValue.kpiOrgScopeId}`)
+      }
+    } else if (kpiValue.org) {
+      // Legacy org 처리 - org 문자열로 KpiOrgScope 찾기 또는 생성
+      kpiOrgScope = await getRepository(KpiOrgScope, context.state?.tx).findOne({
+        where: { org: kpiValue.org, domain: { id: domain.id } }
+      })
+      if (!kpiOrgScope) {
+        // 새 KpiOrgScope 생성
+        kpiOrgScope = await getRepository(KpiOrgScope, context.state?.tx).save({
+          entityType: 'Manual',
+          entityId: `manual-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
+          entityName: kpiValue.org,
+          org: kpiValue.org,
+          domain,
+          creator: user,
+          updater: user
+        })
+      }
+    }
+
     const entity: Partial<KpiValue> = {
       kpi,
       kpiId: kpiValue.kpiId,
       version: kpiValue.version,
       valueDate: kpiValue.valueDate,
       value: kpiValue.value,
-      group: kpiValue.group,
       source: kpiValue.source,
       domain: domain,
       creator: user,
       updater: user
     }
+    
+    if (kpiOrgScope) {
+      entity.kpiOrgScope = kpiOrgScope
+      entity.kpiOrgScopeId = kpiOrgScope.id
+    }
     if (inputType) entity.inputType = inputType
 
     return await getRepository(KpiValue, tx).save(entity)
@@ -83,18 +116,50 @@ export class KpiValueMutation {
         }
       }
 
+      // KpiOrgScope 처리
+      let kpiOrgScope: KpiOrgScope | undefined
+      if (kpiValue.kpiOrgScopeId) {
+        kpiOrgScope = await getRepository(KpiOrgScope, context.state?.tx).findOne({
+          where: { id: kpiValue.kpiOrgScopeId, domain: { id: domain.id } }
+        })
+        if (!kpiOrgScope) {
+          throw new Error(`KpiOrgScope not found: ${kpiValue.kpiOrgScopeId}`)
+        }
+      } else if (kpiValue.org) {
+        // Legacy org 처리
+        kpiOrgScope = await getRepository(KpiOrgScope, context.state?.tx).findOne({
+          where: { org: kpiValue.org, domain: { id: domain.id } }
+        })
+        if (!kpiOrgScope) {
+          // 새 KpiOrgScope 생성
+          kpiOrgScope = await getRepository(KpiOrgScope, context.state?.tx).save({
+            entityType: 'Manual',
+            entityId: `manual-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
+            entityName: kpiValue.org,
+            org: kpiValue.org,
+            domain,
+            creator: user,
+            updater: user
+          })
+        }
+      }
+
       const entity: Partial<KpiValue> = {
         kpi,
         kpiId: kpiValue.kpiId,
         version: kpiValue.version || 1,
         valueDate: kpiValue.valueDate,
         value: kpiValue.value,
-        group: kpiValue.group || '',
         source: kpiValue.source || 'MANUAL',
         domain: domain,
         creator: user,
         updater: user
       }
+
+      if (kpiOrgScope) {
+        entity.kpiOrgScope = kpiOrgScope
+        entity.kpiOrgScopeId = kpiOrgScope.id
+      }
       if (inputType) entity.inputType = inputType
 
       const savedEntity = await repository.save(entity)
@@ -276,7 +341,7 @@ export class KpiValueMutation {
     // 1. 기존 KPI Value 인스턴스 조회
     const kpiValue = await kpiValueRepo.findOne({
       where: { id, domain: { id: domain.id } },
-      relations: ['kpi']
+      relations: ['kpi', 'kpiOrgScope']
     })
     if (!kpiValue) throw new Error('KPI Value not found')
     const kpi = kpiValue.kpi || (await kpiRepo.findOne({ where: { id: kpiValue.kpiId, domain: { id: domain.id } } }))
@@ -284,7 +349,8 @@ export class KpiValueMutation {
     if (!kpi.formula) throw new Error('KPI formula 없음')
     const periodType = kpi.periodType || KpiPeriodType.DAY
     const valueDate = kpiValue.valueDate
-    const group = kpiValue.group
+    const kpiOrgScope = kpiValue.kpiOrgScope
+    const org = kpiOrgScope?.entityName || kpiOrgScope?.org || 'unknown' // KpiOrgScope에서 org 정보 추출
     const version = kpiValue.version
 
     // 2. formula에서 metric code 추출
@@ -309,7 +375,7 @@ export class KpiValueMutation {
             metric: { id: metric.id },
             valueDate,
             periodType,
-            group: group ?? '',
+            org: org ?? '',
             domain: { id: domain.id }
           }
         })
@@ -324,7 +390,7 @@ export class KpiValueMutation {
               metric: { id: metric.id },
               valueDate: Between(startDate, endDate),
               periodType: metric.periodType,
-              group: group ?? '',
+              org: org ?? '',
               domain: { id: domain.id }
             }
           })
@@ -341,7 +407,7 @@ export class KpiValueMutation {
     const ast = parseFormula(kpi.formula)
     const provider = new KpiMetricValueProvider({
       valueDate,
-      group,
+      org,
       domainId: domain.id,
       tx
     })

package/server/service/kpi-value/kpi-value-type.ts

@@ -33,8 +33,11 @@ export class NewKpiValue {
   })
   meta?: any
 
-  @Field({ nullable: true, description: 'Group key for this value (organization, line, user, etc.)' })
-  group?: string
+  @Field(type => ID, { nullable: true, description: 'ID of the KPI organization scope for this value.' })
+  kpiOrgScopeId?: string
+
+  @Field({ nullable: true, description: 'Legacy organizational unit identifier (for backward compatibility)' })
+  org?: string
 
   @Field(type => KpiValueInputType, {
     nullable: true,
@@ -84,8 +87,11 @@ export class KpiValuePatch {
   })
   meta?: any
 
-  @Field({ nullable: true, description: 'Group key for this value (organization, line, user, etc.)' })
-  group?: string
+  @Field(type => ID, { nullable: true, description: 'ID of the KPI organization scope for this value.' })
+  kpiOrgScopeId?: string
+
+  @Field({ nullable: true, description: 'Legacy organizational unit identifier (for backward compatibility)' })
+  org?: string
 
   @Field(type => KpiValueInputType, {
     nullable: true,

package/server/service/kpi-value/kpi-value.ts

@@ -14,6 +14,7 @@ import { User } from '@things-factory/auth-base'
 import { Domain, ScalarObject, json5Transformer } from '@things-factory/shell'
 import { config } from '@things-factory/env'
 import { Kpi, KpiPeriodType } from '../kpi/kpi'
+import { KpiOrgScope } from '../kpi-org-scope/kpi-org-scope'
 
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
@@ -29,8 +30,8 @@ registerEnumType(KpiValueInputType, {
 })
 
 @Entity()
-@Index('ix_kpi_value_latest', ['domain', 'kpi', 'valueDate', 'group', 'version'], { unique: true })
-@Index('ix_kpi_value_latest_for_query', ['domain', 'kpi', 'valueDate', 'group'], { unique: false })
+@Index('ix_kpi_value_latest', ['domain', 'kpi', 'valueDate', 'kpiOrgScope', 'version'], { unique: true })
+@Index('ix_kpi_value_latest_for_query', ['domain', 'kpi', 'valueDate', 'kpiOrgScope'], { unique: false })
 @ObjectType({ description: 'Entity for KpiValue' })
 export class KpiValue {
   @PrimaryGeneratedColumn('uuid')
@@ -78,9 +79,13 @@ export class KpiValue {
   })
   score?: number
 
-  @Column({ default: '' })
-  @Field({ nullable: true, description: 'Group key for this value (organization, line, user, etc.)' })
-  group?: string
+  @ManyToOne(() => KpiOrgScope, { nullable: true })
+  @Field(type => KpiOrgScope, { nullable: true, description: 'Reference to the organization scope mapping for this KPI value.' })
+  kpiOrgScope?: KpiOrgScope
+
+  @RelationId((kpiValue: KpiValue) => kpiValue.kpiOrgScope)
+  @Field({ nullable: true, description: 'ID of the referenced KPI organization scope.' })
+  kpiOrgScopeId?: string
 
   @Column({ nullable: true })
   @Field({

package/server/service/utils/value-date-util.ts

@@ -9,6 +9,53 @@ export function getISOWeek(date: Date): number {
   return weekNo
 }
 
+function getMonday(year: number, week: number): Date {
+  const simple = new Date(year, 0, 1 + (week - 1) * 7)
+  const dow = simple.getDay()
+  const ISOweekStart = simple
+  if (dow <= 4) ISOweekStart.setDate(simple.getDate() - simple.getDay() + 1)
+  else ISOweekStart.setDate(simple.getDate() + 8 - simple.getDay())
+  return ISOweekStart
+}
+
+export function normalizePeriodDate(valueDate: string, periodType: KpiPeriodType): Date {
+  switch (periodType) {
+    case KpiPeriodType.DAY:
+      return new Date(valueDate + 'T00:00:00.000Z')
+    
+    case KpiPeriodType.WEEK: {
+      // "2024-W03" → 해당 주의 월요일
+      const [year, week] = valueDate.split('-W')
+      return getMonday(parseInt(year), parseInt(week))
+    }
+    
+    case KpiPeriodType.MONTH:
+      return new Date(valueDate + '-01T00:00:00.000Z')
+    
+    case KpiPeriodType.QUARTER: {
+      // "2024-Q1" → 해당 분기 시작일
+      const [year, quarter] = valueDate.split('-Q')
+      const month = (parseInt(quarter) - 1) * 3 + 1
+      return new Date(`${year}-${month.toString().padStart(2, '0')}-01T00:00:00.000Z`)
+    }
+    
+    case KpiPeriodType.YEAR:
+      return new Date(valueDate + '-01-01T00:00:00.000Z')
+    
+    case KpiPeriodType.RANGE: {
+      // "2024-01-01~2024-01-31" → 시작일 사용
+      const startDate = valueDate.split('~')[0]
+      return new Date(startDate + 'T00:00:00.000Z')
+    }
+    
+    case KpiPeriodType.ALLTIME:
+      return new Date('1900-01-01T00:00:00.000Z') // 고정 기준점
+      
+    default:
+      return new Date(valueDate + 'T00:00:00.000Z')
+  }
+}
+
 export function getDefaultValueDate(periodType: KpiPeriodType, mode: 'current' | 'last' = 'current'): string {
   const now = new Date()
   if (mode === 'last') {

package/server/types/global.d.ts

@@ -0,0 +1,8 @@
+/// <reference types="@things-factory/auth-base/server/types" />
+
+// auth-base의 global 타입들을 여기서도 사용할 수 있도록 재선언
+declare global {
+  // ResolverContext는 이미 auth-base에서 global로 선언되어 있음
+}
+
+export {}

package/things-factory.config.js

@@ -7,6 +7,7 @@ export default {
     { tagname: 'kpi-overview', page: 'kpi-overview' },
     { tagname: 'kpi-dashboard', page: 'kpi-dashboard' },
     { tagname: 'kpi-list-page', page: 'kpi-list' },
+    { tagname: 'kpi-tree-page', page: 'kpi-tree' },
     { tagname: 'kpi-category-list-page', page: 'kpi-category-list' },
     { tagname: 'kpi-category-value-list-page', page: 'kpi-category-value-list' },
     { tagname: 'kpi-metric-list-page', page: 'kpi-metric-list' },

package/translations/en.json

@@ -4,8 +4,7 @@
   "label.operators": "operators",
   "label.functions": "functions",
   "title.kpi list": "KPI List",
-  "title.kpi category list": "KPI Catogory List",
-  "title.kpi category value list": "KPI Category Value List",
+  "title.kpi tree": "KPI Tree",
   "title.kpi dashboard": "KPI Dashboard",
   "title.kpi value editor": "KPI Value Editor",
   "title.kpi grade list": "KPI Grade List",
@@ -41,5 +40,18 @@
   "field.percentile75": "75th Percentile",
   "field.iqr": "IQR",
   "field.lower_fence": "Lower Fence",
-  "field.upper_fence": "Upper Fence"
+  "field.upper_fence": "Upper Fence",
+  "label.basic_information": "Basic Information",
+  "label.is_leaf_node": "Is Leaf Node",
+  "label.formula_calculation": "Formula & Calculation",
+  "label.kpi_formula": "KPI Formula",
+  "label.score_formula": "Score Formula",
+  "placeholder.enter_formula": "Enter formula using metric codes (e.g., defect_count / total_count * 100)",
+  "placeholder.enter_score_formula": "Enter score calculation formula (e.g., if(value >= 90, 100, value * 0.8))",
+  "placeholder.cron_schedule": "0 0 * * * (daily at midnight)",
+  "placeholder.timezone": "Asia/Seoul",
+  "message.kpi_not_selected": "KPI not selected",
+  "message.select_kpi_first": "Please select KPI first.",
+  "message.kpis_with_children_cannot_be_deleted": "KPIs with children cannot be deleted.",
+  "message.kpi_having_children_cannot_be_deleted": "KPI having children cannot be deleted."
 }

package/translations/ja.json

@@ -4,8 +4,7 @@
   "label.operators": "演算子",
   "label.functions": "関数",
   "title.kpi list": "KPIリスト",
-  "title.kpi category list": "KPIカテゴリリスト",
-  "title.kpi category value list": "KPIカテゴリ値リスト",
+  "title.kpi tree": "KPIツリー",
   "title.kpi dashboard": "KPIダッシュボード",
   "title.kpi value editor": "KPI値エディタ",
   "title.kpi grade list": "KPIグレードリスト",
@@ -41,5 +40,16 @@
   "field.percentile75": "75パーセンタイル",
   "field.iqr": "四分位範囲",
   "field.lower_fence": "下限フェンス",
-  "field.upper_fence": "上限フェンス"
+  "field.upper_fence": "上限フェンス",
+  "label.basic_information": "基本情報",
+  "label.is_leaf_node": "リーフノード",
+  "label.formula_calculation": "数式と計算",
+  "label.kpi_formula": "KPI数式",
+  "label.score_formula": "スコア数式",
+  "placeholder.enter_formula": "メトリックコードを使用して数式を入力してください（例：defect_count / total_count * 100）",
+  "placeholder.enter_score_formula": "スコア計算数式を入力してください（例：if(value >= 90, 100, value * 0.8)）",
+  "placeholder.cron_schedule": "0 0 * * *（毎日午前0時）",
+  "placeholder.timezone": "Asia/Tokyo",
+  "message.kpis_with_children_cannot_be_deleted": "子KPIを持つKPIは削除できません。",
+  "message.kpi_having_children_cannot_be_deleted": "子KPIを持つKPIは削除できません。"
 }

package/translations/ko.json

@@ -4,8 +4,7 @@
   "label.operators": "연산자",
   "label.functions": "함수",
   "title.kpi list": "KPI 목록",
-  "title.kpi category list": "KPI 카테고리 목록",
-  "title.kpi category value list": "KPI 카테고리 값 목록",
+  "title.kpi tree": "KPI 트리",
   "title.kpi dashboard": "KPI 대시보드",
   "title.kpi value editor": "KPI 값 편집기",
   "title.kpi grade list": "KPI 등급 목록",
@@ -41,5 +40,18 @@
   "field.percentile75": "75분위수",
   "field.iqr": "사분위수 범위",
   "field.lower_fence": "하위 울타리",
-  "field.upper_fence": "상위 울타리"
+  "field.upper_fence": "상위 울타리",
+  "label.basic_information": "기본 정보",
+  "label.is_leaf_node": "리프 노드",
+  "label.formula_calculation": "수식 및 계산",
+  "label.kpi_formula": "KPI 수식",
+  "label.score_formula": "점수 수식",
+  "placeholder.enter_formula": "지표 코드를 사용하여 수식을 입력하세요 (예: defect_count / total_count * 100)",
+  "placeholder.enter_score_formula": "점수 계산 수식을 입력하세요 (예: if(value >= 90, 100, value * 0.8))",
+  "placeholder.cron_schedule": "0 0 * * * (매일 자정)",
+  "placeholder.timezone": "Asia/Seoul",
+  "message.kpi_not_selected": "KPI가 선택되지 않음",
+  "message.select_kpi_first": "먼저 KPI를 선택하세요.",
+  "message.kpis_with_children_cannot_be_deleted": "하위 KPI가 있는 KPI는 삭제할 수 없습니다.",
+  "message.kpi_having_children_cannot_be_deleted": "하위 KPI가 있는 KPI는 삭제할 수 없습니다."
 }

package/translations/ms.json

@@ -4,8 +4,7 @@
   "label.operators": "operator",
   "label.functions": "fungsi",
   "title.kpi list": "Senarai KPI",
-  "title.kpi category list": "Senarai Kategori KPI",
-  "title.kpi category value list": "Senarai Nilai Kategori KPI",
+  "title.kpi tree": "Pokok KPI",
   "title.kpi dashboard": "Papan Dasbor KPI",
   "title.kpi value editor": "Editor Nilai KPI",
   "title.kpi grade list": "Senarai Gred KPI",
@@ -41,5 +40,16 @@
   "field.percentile75": "Persentil ke-75",
   "field.iqr": "Julat Antara Kuartil",
   "field.lower_fence": "Pagar Bawah",
-  "field.upper_fence": "Pagar Atas"
+  "field.upper_fence": "Pagar Atas",
+  "label.basic_information": "Maklumat Asas",
+  "label.is_leaf_node": "Nod Daun",
+  "label.formula_calculation": "Formula dan Pengiraan",
+  "label.kpi_formula": "Formula KPI",
+  "label.score_formula": "Formula Skor",
+  "placeholder.enter_formula": "Masukkan formula menggunakan kod metrik (contoh: defect_count / total_count * 100)",
+  "placeholder.enter_score_formula": "Masukkan formula pengiraan skor (contoh: if(value >= 90, 100, value * 0.8))",
+  "placeholder.cron_schedule": "0 0 * * * (harian pada tengah malam)",
+  "placeholder.timezone": "Asia/Kuala_Lumpur",
+  "message.kpis_with_children_cannot_be_deleted": "KPI yang mempunyai anak tidak boleh dihapuskan.",
+  "message.kpi_having_children_cannot_be_deleted": "KPI yang mempunyai anak tidak boleh dihapuskan."
 }

package/translations/zh.json

@@ -4,8 +4,7 @@
   "label.operators": "运算符",
   "label.functions": "函数",
   "title.kpi list": "KPI列表",
-  "title.kpi category list": "KPI类别列表",
-  "title.kpi category value list": "KPI类别值列表",
+  "title.kpi tree": "KPI树",
   "title.kpi dashboard": "KPI仪表盘",
   "title.kpi value editor": "KPI值编辑器",
   "title.kpi grade list": "KPI等级列表",
@@ -41,5 +40,16 @@
   "field.percentile75": "75分位数",
   "field.iqr": "四分位距",
   "field.lower_fence": "下围栏",
-  "field.upper_fence": "上围栏"
+  "field.upper_fence": "上围栏",
+  "label.basic_information": "基本信息",
+  "label.is_leaf_node": "叶节点",
+  "label.formula_calculation": "公式和计算",
+  "label.kpi_formula": "KPI公式",
+  "label.score_formula": "评分公式",
+  "placeholder.enter_formula": "使用指标代码输入公式（例：defect_count / total_count * 100）",
+  "placeholder.enter_score_formula": "输入评分计算公式（例：if(value >= 90, 100, value * 0.8)）",
+  "placeholder.cron_schedule": "0 0 * * *（每日午夜）",
+  "placeholder.timezone": "Asia/Shanghai",
+  "message.kpis_with_children_cannot_be_deleted": "有子KPI的KPI不能被删除。",
+  "message.kpi_having_children_cannot_be_deleted": "有子KPI的KPI不能被删除。"
 }

package/client/pages/kpi-category/kpi-category-importer.ts

@@ -1,90 +0,0 @@
-import '@material/web/icon/icon.js'
-import '@operato/data-grist'
-
-import gql from 'graphql-tag'
-import { css, html, LitElement } from 'lit'
-import { property } from 'lit/decorators.js'
-
-import { client } from '@operato/graphql'
-import { i18next } from '@operato/i18n'
-import { isMobileDevice } from '@operato/utils'
-import { ButtonContainerStyles } from '@operato/styles'
-
-export class KpiCategoryImporter extends LitElement {
-  static styles = [
-    ButtonContainerStyles,
-    css`
-      :host {
-        display: flex;
-        flex-direction: column;
-
-        background-color: #fff;
-      }
-
-      ox-grist {
-        flex: 1;
-      }
-    `
-  ]
-
-  @property({ type: Array }) kpiCategories: any[] = []
-  @property({ type: Object }) columns = {
-    list: { fields: ['name', 'description'] },
-    pagination: { infinite: true },
-    columns: [
-      {
-        type: 'string',
-        name: 'name',
-        header: i18next.t('field.name'),
-        width: 150
-      },
-      {
-        type: 'string',
-        name: 'description',
-        header: i18next.t('field.description'),
-        width: 200
-      },
-      {
-        type: 'checkbox',
-        name: 'active',
-        header: i18next.t('field.active'),
-        width: 60
-      }
-    ]
-  }
-
-
-  render() {
-    return html`
-      <ox-grist
-        .mode=${isMobileDevice() ? 'LIST' : 'GRID'}
-        .config=${this.columns}
-        .data=${
-          { 
-            records: this.kpiCategories 
-          }
-        }
-      ></ox-grist>
-
-      <div class="button-container">
-        <button @click="${this.save.bind(this)}"><md-icon>save</md-icon>${i18next.t('button.save')}</button>
-      </div>
-    `
-  }
-
-  async save() {
-    const response = await client.mutate({
-      mutation: gql`
-        mutation importKpiCategories($kpiCategories: [KpiCategoryPatch!]!) {
-          importKpiCategories(kpiCategories: $kpiCategories)
-        }
-      `,
-      variables: { kpiCategories: this.kpiCategories }
-    })
-
-    if (response.errors?.length) return
-
-    this.dispatchEvent(new CustomEvent('imported'))
-  }
-}
-