@things-factory/kpi 9.0.31 → 9.0.33

package/dist-server/service/kpi/aggregate-kpi.js

@@ -5,6 +5,7 @@ const shell_1 = require("@things-factory/shell");
 const kpi_1 = require("./kpi");
 const kpi_metric_1 = require("../kpi-metric/kpi-metric");
 const kpi_value_1 = require("../kpi-value/kpi-value");
+const kpi_org_scope_1 = require("../kpi-org-scope/kpi-org-scope");
 const kpi_formula_service_1 = require("./kpi-formula.service");
 const aggregate_kpi_metric_1 = require("../kpi-metric/aggregate-kpi-metric");
 const kpi_value_score_service_1 = require("../kpi-value/kpi-value-score.service");
@@ -37,20 +38,20 @@ async function aggregateKpiValue(kpiId, domainId, context) {
             throw new Error(`KPI formula metric '${code}' not found`);
         codeValueMap[code] = await (0, aggregate_kpi_metric_1.aggregateKpiMetricValue)(metric.id, domainId, context);
     }
-    // group/date/period별로 값 매핑(가장 최근 기준, group key 조합)
-    const groupKey = v => [v.date, v.period, v.group].join('|');
-    const groupMap = {};
+    // org/date/period별로 값 매핑(가장 최근 기준, org key 조합)
+    const orgKey = v => [v.date, v.period, v.org].join('|');
+    const orgMap = {};
     for (const code of metricCodes) {
         for (const v of codeValueMap[code]) {
-            const key = groupKey(v);
-            groupMap[key] = groupMap[key] || { ...v, _values: {} };
-            groupMap[key]._values[code] = v.value;
+            const key = orgKey(v);
+            orgMap[key] = orgMap[key] || { ...v, _values: {} };
+            orgMap[key]._values[code] = v.value;
         }
     }
     // formula 계산 (js eval)
     const savedValues = [];
-    for (const key in groupMap) {
-        const ctx = groupMap[key]._values;
+    for (const key in orgMap) {
+        const ctx = orgMap[key]._values;
         let value = null;
         try {
             value = Function(...Object.keys(ctx), `return (${kpi.formula})`)(...Object.values(ctx));
@@ -58,15 +59,30 @@ async function aggregateKpiValue(kpiId, domainId, context) {
         catch (e) {
             value = null;
         }
-        const valueDate = groupMap[key].date;
-        const group = groupMap[key].group;
+        const valueDate = orgMap[key].date;
+        const org = orgMap[key].org;
         const version = kpi.version || 1;
         if (value == null || isNaN(value))
             continue;
-        // upsert(동일 KPI, valueDate, group, version) 기준으로 저장
+        // KpiOrgScope 처리 (org 문자열로 찾기 또는 생성)
+        const kpiOrgScopeRepo = (0, shell_1.getRepository)(kpi_org_scope_1.KpiOrgScope, context.state?.tx);
+        let kpiOrgScope = await kpiOrgScopeRepo.findOne({
+            where: { org: org, domain: { id: domainId } }
+        });
+        if (!kpiOrgScope) {
+            // 새 KpiOrgScope 생성
+            kpiOrgScope = await kpiOrgScopeRepo.save({
+                entityType: 'AutoAggregate',
+                entityId: `auto-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
+                entityName: org,
+                org: org,
+                domain: kpi.domain
+            });
+        }
+        // upsert(동일 KPI, valueDate, kpiOrgScope, version) 기준으로 저장
         const repo = (0, shell_1.getRepository)(kpi_value_1.KpiValue, context.state?.tx);
         const existing = await repo.findOne({
-            where: { kpi: { id: kpi.id }, valueDate, group, version, domain: { id: domainId } }
+            where: { kpi: { id: kpi.id }, valueDate, kpiOrgScope: { id: kpiOrgScope.id }, version, domain: { id: domainId } }
         });
         let entity = existing || repo.create();
         entity.kpi = kpi;
@@ -74,7 +90,8 @@ async function aggregateKpiValue(kpiId, domainId, context) {
         entity.version = version;
         entity.valueDate = valueDate;
         entity.value = value;
-        entity.group = group;
+        entity.kpiOrgScope = kpiOrgScope;
+        entity.kpiOrgScopeId = kpiOrgScope.id;
         entity.inputType = kpi_value_1.KpiValueInputType.AUTO;
         entity.source = 'AUTO';
         entity.domain = kpi.domain;

package/dist-server/service/kpi/aggregate-kpi.js.map

@@ -1 +1 @@
-{"version":3,"file":"aggregate-kpi.js","sourceRoot":"","sources":["../../../server/service/kpi/aggregate-kpi.ts"],"names":[],"mappings":"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","sourcesContent":["import { getRepository } from '@things-factory/shell'\nimport { Kpi } from './kpi'\nimport { KpiMetric } from '../kpi-metric/kpi-metric'\nimport { KpiValue, KpiValueInputType } from '../kpi-value/kpi-value'\nimport { KpiFormulaService } from './kpi-formula.service'\nimport { aggregateKpiMetricValue } from '../kpi-metric/aggregate-kpi-metric'\nimport { KpiValueScoreService } from '../kpi-value/kpi-value-score.service'\n\n/**\n * KPI 단위 집계/산식 자동화 함수\n * @param kpiId KPI ID\n * @param domainId 도메인 ID\n * @param context ResolverContext\n * @returns 저장된 KPI Value 배열\n */\nexport async function aggregateKpiValue(kpiId: string, domainId: string, context: ResolverContext) {\n  const tx = context.state?.tx || getRepository(Kpi).manager\n  const scoreService = new KpiValueScoreService()\n\n  // 1. KPI 정보 조회\n  const kpi = await getRepository(Kpi).findOne({ where: { id: kpiId, domain: { id: domainId } } })\n  if (!kpi) throw new Error('KPI 정보 없음')\n  if (!kpi.active) throw new Error('비활성화된 KPI')\n  if (!kpi.formula) throw new Error('KPI formula 없음')\n\n  // 2. formula 파싱 및 metric code별 값 집계\n  const formulaService = new KpiFormulaService()\n  const metricCodes = formulaService.extractMetricCodes(kpi.formula)\n  const codeValueMap: Record<string, any[]> = {}\n  for (const code of metricCodes) {\n    // code로 metric 찾기\n    const metric = await getRepository(KpiMetric).findOne({ where: { name: code, domain: { id: domainId } } })\n    if (!metric) throw new Error(`KPI formula metric '${code}' not found`)\n    codeValueMap[code] = await aggregateKpiMetricValue(metric.id, domainId, context)\n  }\n  // group/date/period별로 값 매핑(가장 최근 기준, group key 조합)\n  const groupKey = v => [v.date, v.period, v.group].join('|')\n  const groupMap: Record<string, any> = {}\n  for (const code of metricCodes) {\n    for (const v of codeValueMap[code]) {\n      const key = groupKey(v)\n      groupMap[key] = groupMap[key] || { ...v, _values: {} }\n      groupMap[key]._values[code] = v.value\n    }\n  }\n  // formula 계산 (js eval)\n  const savedValues = []\n  for (const key in groupMap) {\n    const ctx = groupMap[key]._values\n    let value = null\n    try {\n      value = Function(...Object.keys(ctx), `return (${kpi.formula})`)(...Object.values(ctx))\n    } catch (e) {\n      value = null\n    }\n    const valueDate = groupMap[key].date\n    const group = groupMap[key].group\n    const version = kpi.version || 1\n    if (value == null || isNaN(value)) continue\n    // upsert(동일 KPI, valueDate, group, version) 기준으로 저장\n    const repo = getRepository(KpiValue, context.state?.tx)\n    const existing = await repo.findOne({\n      where: { kpi: { id: kpi.id }, valueDate, group, version, domain: { id: domainId } }\n    })\n    let entity = existing || repo.create()\n    entity.kpi = kpi\n    entity.kpiId = kpi.id\n    entity.version = version\n    entity.valueDate = valueDate\n    entity.value = value\n    entity.group = group\n    entity.inputType = KpiValueInputType.AUTO\n    entity.source = 'AUTO'\n    entity.domain = kpi.domain\n    entity.creator = context.state?.user\n    entity.updater = context.state?.user\n\n    // 성과 점수 자동 계산 및 저장\n    await scoreService.calculateAndSaveScore(entity, kpi)\n\n    entity = await repo.save(entity)\n    savedValues.push(entity)\n  }\n  return savedValues\n}\n"]}
+{"version":3,"file":"aggregate-kpi.js","sourceRoot":"","sources":["../../../server/service/kpi/aggregate-kpi.ts"],"names":[],"mappings":"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","sourcesContent":["import { getRepository } from '@things-factory/shell'\nimport { Kpi } from './kpi'\nimport { KpiMetric } from '../kpi-metric/kpi-metric'\nimport { KpiValue, KpiValueInputType } from '../kpi-value/kpi-value'\nimport { KpiOrgScope } from '../kpi-org-scope/kpi-org-scope'\nimport { KpiFormulaService } from './kpi-formula.service'\nimport { aggregateKpiMetricValue } from '../kpi-metric/aggregate-kpi-metric'\nimport { KpiValueScoreService } from '../kpi-value/kpi-value-score.service'\n\n/**\n * KPI 단위 집계/산식 자동화 함수\n * @param kpiId KPI ID\n * @param domainId 도메인 ID\n * @param context ResolverContext\n * @returns 저장된 KPI Value 배열\n */\nexport async function aggregateKpiValue(kpiId: string, domainId: string, context: ResolverContext) {\n  const tx = context.state?.tx || getRepository(Kpi).manager\n  const scoreService = new KpiValueScoreService()\n\n  // 1. KPI 정보 조회\n  const kpi = await getRepository(Kpi).findOne({ where: { id: kpiId, domain: { id: domainId } } })\n  if (!kpi) throw new Error('KPI 정보 없음')\n  if (!kpi.active) throw new Error('비활성화된 KPI')\n  if (!kpi.formula) throw new Error('KPI formula 없음')\n\n  // 2. formula 파싱 및 metric code별 값 집계\n  const formulaService = new KpiFormulaService()\n  const metricCodes = formulaService.extractMetricCodes(kpi.formula)\n  const codeValueMap: Record<string, any[]> = {}\n  for (const code of metricCodes) {\n    // code로 metric 찾기\n    const metric = await getRepository(KpiMetric).findOne({ where: { name: code, domain: { id: domainId } } })\n    if (!metric) throw new Error(`KPI formula metric '${code}' not found`)\n    codeValueMap[code] = await aggregateKpiMetricValue(metric.id, domainId, context)\n  }\n  // org/date/period별로 값 매핑(가장 최근 기준, org key 조합)\n  const orgKey = v => [v.date, v.period, v.org].join('|')\n  const orgMap: Record<string, any> = {}\n  for (const code of metricCodes) {\n    for (const v of codeValueMap[code]) {\n      const key = orgKey(v)\n      orgMap[key] = orgMap[key] || { ...v, _values: {} }\n      orgMap[key]._values[code] = v.value\n    }\n  }\n  // formula 계산 (js eval)\n  const savedValues = []\n  for (const key in orgMap) {\n    const ctx = orgMap[key]._values\n    let value = null\n    try {\n      value = Function(...Object.keys(ctx), `return (${kpi.formula})`)(...Object.values(ctx))\n    } catch (e) {\n      value = null\n    }\n    const valueDate = orgMap[key].date\n    const org = orgMap[key].org\n    const version = kpi.version || 1\n    if (value == null || isNaN(value)) continue\n    // KpiOrgScope 처리 (org 문자열로 찾기 또는 생성)\n    const kpiOrgScopeRepo = getRepository(KpiOrgScope, context.state?.tx)\n    let kpiOrgScope = await kpiOrgScopeRepo.findOne({\n      where: { org: org, domain: { id: domainId } }\n    })\n    if (!kpiOrgScope) {\n      // 새 KpiOrgScope 생성\n      kpiOrgScope = await kpiOrgScopeRepo.save({\n        entityType: 'AutoAggregate',\n        entityId: `auto-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,\n        entityName: org,\n        org: org,\n        domain: kpi.domain\n      })\n    }\n\n    // upsert(동일 KPI, valueDate, kpiOrgScope, version) 기준으로 저장\n    const repo = getRepository(KpiValue, context.state?.tx)\n    const existing = await repo.findOne({\n      where: { kpi: { id: kpi.id }, valueDate, kpiOrgScope: { id: kpiOrgScope.id }, version, domain: { id: domainId } }\n    })\n    let entity = existing || repo.create()\n    entity.kpi = kpi\n    entity.kpiId = kpi.id\n    entity.version = version\n    entity.valueDate = valueDate\n    entity.value = value\n    entity.kpiOrgScope = kpiOrgScope\n    entity.kpiOrgScopeId = kpiOrgScope.id\n    entity.inputType = KpiValueInputType.AUTO\n    entity.source = 'AUTO'\n    entity.domain = kpi.domain\n    entity.creator = context.state?.user\n    entity.updater = context.state?.user\n\n    // 성과 점수 자동 계산 및 저장\n    await scoreService.calculateAndSaveScore(entity, kpi)\n\n    entity = await repo.save(entity)\n    savedValues.push(entity)\n  }\n  return savedValues\n}\n"]}

package/dist-server/service/kpi/kpi-formula.service.d.ts

@@ -21,4 +21,19 @@ export declare class KpiFormulaService {
         valid: boolean;
         errors: string[];
     }>;
+    /**
+     * 계층 구조 KPI의 값을 자식 KPI들로부터 집계 계산
+     * @param kpiId 부모 KPI ID
+     * @param valueDate 계산 대상 날짜
+     * @param org 조직 단위
+     * @returns Promise<number | null> 집계된 값
+     */
+    calculateHierarchicalValue(kpiId: string, valueDate: string, org?: string): Promise<number | null>;
+    /**
+     * KPI가 순환 참조를 생성하는지 확인
+     * @param kpiId KPI ID
+     * @param parentId 설정하려는 부모 KPI ID
+     * @returns Promise<boolean> 순환 참조 여부
+     */
+    hasCircularReference(kpiId: string, parentId: string): Promise<boolean>;
 }

package/dist-server/service/kpi/kpi-formula.service.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.KpiFormulaService = void 0;
 const shell_1 = require("@things-factory/shell");
 const kpi_metric_1 = require("../kpi-metric/kpi-metric");
+const kpi_1 = require("./kpi");
+const kpi_value_1 = require("../kpi-value/kpi-value");
+const kpi_org_scope_1 = require("../kpi-org-scope/kpi-org-scope");
 /**
  * KPI formula 파싱/검증/매핑 유효성 검사 서비스
  * - formula에서 Metric 코드(변수명) 추출
@@ -59,6 +62,93 @@ class KpiFormulaService {
         // ...
         return { valid: errors.length === 0, errors };
     }
+    /**
+     * 계층 구조 KPI의 값을 자식 KPI들로부터 집계 계산
+     * @param kpiId 부모 KPI ID
+     * @param valueDate 계산 대상 날짜
+     * @param org 조직 단위
+     * @returns Promise<number | null> 집계된 값
+     */
+    async calculateHierarchicalValue(kpiId, valueDate, org) {
+        const kpiRepo = (0, shell_1.getRepository)(kpi_1.Kpi);
+        const kpi = await kpiRepo.findOne({
+            where: { id: kpiId },
+            relations: ['children']
+        });
+        if (!kpi || !kpi.children || kpi.children.length === 0) {
+            return null;
+        }
+        const childValues = [];
+        const childWeights = [];
+        for (const child of kpi.children) {
+            let childValue = null;
+            if (child.isLeaf) {
+                // Leaf KPI인 경우 KpiValue에서 실제 값을 가져옴
+                const kpiValueRepo = (0, shell_1.getRepository)(kpi_value_1.KpiValue);
+                let kpiValue = null;
+                if (org) {
+                    const kpiOrgScope = await (0, shell_1.getRepository)(kpi_org_scope_1.KpiOrgScope).findOne({
+                        where: { org: org, domain: { id: child.domain?.id } }
+                    });
+                    if (kpiOrgScope) {
+                        kpiValue = await kpiValueRepo.findOne({
+                            where: {
+                                kpi: { id: child.id },
+                                valueDate,
+                                kpiOrgScope: { id: kpiOrgScope.id }
+                            }
+                        });
+                    }
+                }
+                else {
+                    // org가 없는 경우 kpiOrgScope 없이 조회 
+                    kpiValue = await kpiValueRepo.findOne({
+                        where: {
+                            kpi: { id: child.id },
+                            valueDate,
+                            kpiOrgScope: null
+                        }
+                    });
+                }
+                childValue = kpiValue?.value || null;
+            }
+            else {
+                // 중간 노드인 경우 재귀적으로 계산
+                childValue = await this.calculateHierarchicalValue(child.id, valueDate, org);
+            }
+            if (childValue !== null) {
+                childValues.push(childValue);
+                childWeights.push(child.weight || 1);
+            }
+        }
+        if (childValues.length === 0) {
+            return null;
+        }
+        // 가중 평균 계산
+        const totalWeight = childWeights.reduce((sum, weight) => sum + weight, 0);
+        const weightedSum = childValues.reduce((sum, value, index) => sum + value * childWeights[index], 0);
+        return totalWeight > 0 ? weightedSum / totalWeight : null;
+    }
+    /**
+     * KPI가 순환 참조를 생성하는지 확인
+     * @param kpiId KPI ID
+     * @param parentId 설정하려는 부모 KPI ID
+     * @returns Promise<boolean> 순환 참조 여부
+     */
+    async hasCircularReference(kpiId, parentId) {
+        if (kpiId === parentId) {
+            return true;
+        }
+        const kpiRepo = (0, shell_1.getRepository)(kpi_1.Kpi);
+        const parent = await kpiRepo.findOne({
+            where: { id: parentId },
+            relations: ['parent']
+        });
+        if (!parent || !parent.parent) {
+            return false;
+        }
+        return await this.hasCircularReference(kpiId, parent.parent.id);
+    }
 }
 exports.KpiFormulaService = KpiFormulaService;
 //# sourceMappingURL=kpi-formula.service.js.map

package/dist-server/service/kpi/kpi-formula.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"kpi-formula.service.js","sourceRoot":"","sources":["../../../server/service/kpi/kpi-formula.service.ts"],"names":[],"mappings":";;;AAAA,iDAAqD;AACrD,yDAAoD;AAEpD;;;;;GAKG;AACH,MAAa,iBAAiB;IAC5B;;;;OAIG;IACH,kBAAkB,CAAC,OAAe;QAChC,sCAAsC;QACtC,MAAM,KAAK,GAAG,yBAAyB,CAAA;QACvC,wBAAwB;QACxB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;QACnE,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;IACrH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,eAAe,CACnB,OAAe,EACf,UAAuB,IAAI,GAAG,EAAE;QAEhC,MAAM,MAAM,GAAa,EAAE,CAAA;QAC3B,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAA;QACpD,MAAM,UAAU,GAAG,IAAA,qBAAa,EAAC,sBAAS,CAAC,CAAA;QAC3C,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE,CAAC;YAC/B,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBACtB,MAAM,CAAC,IAAI,CAAC,YAAY,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;gBACpE,SAAQ;YACV,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YACjB,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;YAClE,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,mBAAmB,CAAC,CAAA;gBAC/C,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;gBACpB,SAAQ;YACV,CAAC;YACD,IAAI,CAAC,MAAM,CAAC,SAAS,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;gBAC3C,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,qCAAqC,CAAC,CAAA;YACnE,CAAC;YACD,yCAAyC;YACzC,IAAK,MAAc,CAAC,OAAO,EAAE,CAAC;gBAC5B,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAE,MAAc,CAAC,OAAO,EAAE,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAA;gBACvF,IAAI,CAAC,SAAS,CAAC,KAAK;oBAAE,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;YACxD,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACtB,CAAC;QACD,wCAAwC;QACxC,MAAM;QACN,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAC/C,CAAC;CACF;AArDD,8CAqDC","sourcesContent":["import { getRepository } from '@things-factory/shell'\nimport { KpiMetric } from '../kpi-metric/kpi-metric'\n\n/**\n * KPI formula 파싱/검증/매핑 유효성 검사 서비스\n * - formula에서 Metric 코드(변수명) 추출\n * - 각 Metric의 존재/매핑 유효성 검사\n * - 구문 오류, 미정의 Metric, 매핑 오류 등 에러 리포팅\n */\nexport class KpiFormulaService {\n  /**\n   * formula 문자열에서 Metric 코드(변수명) 추출\n   * @param formula KPI formula (예: 'defect_count / total_count * 100')\n   * @returns string[] 추출된 Metric 코드 리스트\n   */\n  extractMetricCodes(formula: string): string[] {\n    // 변수명: 알파벳/언더스코어로 시작, 숫자/알파벳/언더스코어 포함\n    const regex = /[a-zA-Z_][a-zA-Z0-9_]*/g\n    // 숫자/예약어/연산자 제외(후처리 필요)\n    const reserved = new Set(['if', 'else', 'return', 'true', 'false'])\n    return Array.from(new Set((formula.match(regex) || []).filter(code => isNaN(Number(code)) && !reserved.has(code))))\n  }\n\n  /**\n   * formula 내 Metric 코드의 존재/매핑 유효성 검사 + 순환참조 검출\n   * @param formula KPI formula\n   * @param visited 순환참조 검출용 Set (재귀 호출 시 사용)\n   * @returns { valid: boolean, errors: string[] }\n   */\n  async validateFormula(\n    formula: string,\n    visited: Set<string> = new Set()\n  ): Promise<{ valid: boolean; errors: string[] }> {\n    const errors: string[] = []\n    const metricCodes = this.extractMetricCodes(formula)\n    const metricRepo = getRepository(KpiMetric)\n    for (const code of metricCodes) {\n      if (visited.has(code)) {\n        errors.push(`순환참조 감지: ${Array.from(visited).join(' → ')} → ${code}`)\n        continue\n      }\n      visited.add(code)\n      const metric = await metricRepo.findOne({ where: { name: code } })\n      if (!metric) {\n        errors.push(`Metric '${code}' is not defined.`)\n        visited.delete(code)\n        continue\n      }\n      if (!metric.dataSetId || !metric.fieldName) {\n        errors.push(`Metric '${code}' is not mapped to a dataset field.`)\n      }\n      // metric이 formula를 가지고 있다면 재귀적으로 순환참조 검증\n      if ((metric as any).formula) {\n        const subResult = await this.validateFormula((metric as any).formula, new Set(visited))\n        if (!subResult.valid) errors.push(...subResult.errors)\n      }\n      visited.delete(code)\n    }\n    // (선택) formula 구문 오류, 괄호 불일치 등 추가 검사 가능\n    // ...\n    return { valid: errors.length === 0, errors }\n  }\n}\n"]}
+{"version":3,"file":"kpi-formula.service.js","sourceRoot":"","sources":["../../../server/service/kpi/kpi-formula.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { getRepository } from '@things-factory/shell'\nimport { KpiMetric } from '../kpi-metric/kpi-metric'\nimport { Kpi } from './kpi'\nimport { KpiValue } from '../kpi-value/kpi-value'\nimport { KpiOrgScope } from '../kpi-org-scope/kpi-org-scope'\n\n/**\n * KPI formula 파싱/검증/매핑 유효성 검사 서비스\n * - formula에서 Metric 코드(변수명) 추출\n * - 각 Metric의 존재/매핑 유효성 검사\n * - 구문 오류, 미정의 Metric, 매핑 오류 등 에러 리포팅\n */\nexport class KpiFormulaService {\n  /**\n   * formula 문자열에서 Metric 코드(변수명) 추출\n   * @param formula KPI formula (예: 'defect_count / total_count * 100')\n   * @returns string[] 추출된 Metric 코드 리스트\n   */\n  extractMetricCodes(formula: string): string[] {\n    // 변수명: 알파벳/언더스코어로 시작, 숫자/알파벳/언더스코어 포함\n    const regex = /[a-zA-Z_][a-zA-Z0-9_]*/g\n    // 숫자/예약어/연산자 제외(후처리 필요)\n    const reserved = new Set(['if', 'else', 'return', 'true', 'false'])\n    return Array.from(new Set((formula.match(regex) || []).filter(code => isNaN(Number(code)) && !reserved.has(code))))\n  }\n\n  /**\n   * formula 내 Metric 코드의 존재/매핑 유효성 검사 + 순환참조 검출\n   * @param formula KPI formula\n   * @param visited 순환참조 검출용 Set (재귀 호출 시 사용)\n   * @returns { valid: boolean, errors: string[] }\n   */\n  async validateFormula(\n    formula: string,\n    visited: Set<string> = new Set()\n  ): Promise<{ valid: boolean; errors: string[] }> {\n    const errors: string[] = []\n    const metricCodes = this.extractMetricCodes(formula)\n    const metricRepo = getRepository(KpiMetric)\n    for (const code of metricCodes) {\n      if (visited.has(code)) {\n        errors.push(`순환참조 감지: ${Array.from(visited).join(' → ')} → ${code}`)\n        continue\n      }\n      visited.add(code)\n      const metric = await metricRepo.findOne({ where: { name: code } })\n      if (!metric) {\n        errors.push(`Metric '${code}' is not defined.`)\n        visited.delete(code)\n        continue\n      }\n      if (!metric.dataSetId || !metric.fieldName) {\n        errors.push(`Metric '${code}' is not mapped to a dataset field.`)\n      }\n      // metric이 formula를 가지고 있다면 재귀적으로 순환참조 검증\n      if ((metric as any).formula) {\n        const subResult = await this.validateFormula((metric as any).formula, new Set(visited))\n        if (!subResult.valid) errors.push(...subResult.errors)\n      }\n      visited.delete(code)\n    }\n    // (선택) formula 구문 오류, 괄호 불일치 등 추가 검사 가능\n    // ...\n    return { valid: errors.length === 0, errors }\n  }\n\n  /**\n   * 계층 구조 KPI의 값을 자식 KPI들로부터 집계 계산\n   * @param kpiId 부모 KPI ID\n   * @param valueDate 계산 대상 날짜\n   * @param org 조직 단위\n   * @returns Promise<number | null> 집계된 값\n   */\n  async calculateHierarchicalValue(kpiId: string, valueDate: string, org?: string): Promise<number | null> {\n    const kpiRepo = getRepository(Kpi)\n    const kpi = await kpiRepo.findOne({\n      where: { id: kpiId },\n      relations: ['children']\n    })\n\n    if (!kpi || !kpi.children || kpi.children.length === 0) {\n      return null\n    }\n\n    const childValues: number[] = []\n    const childWeights: number[] = []\n\n    for (const child of kpi.children) {\n      let childValue: number | null = null\n      \n      if (child.isLeaf) {\n        // Leaf KPI인 경우 KpiValue에서 실제 값을 가져옴\n        const kpiValueRepo = getRepository(KpiValue)\n        let kpiValue: KpiValue | null = null\n        if (org) {\n          const kpiOrgScope = await getRepository(KpiOrgScope).findOne({\n            where: { org: org, domain: { id: child.domain?.id } }\n          })\n          if (kpiOrgScope) {\n            kpiValue = await kpiValueRepo.findOne({ \n              where: { \n                kpi: { id: child.id }, \n                valueDate,\n                kpiOrgScope: { id: kpiOrgScope.id }\n              }\n            })\n          }\n        } else {\n          // org가 없는 경우 kpiOrgScope 없이 조회 \n          kpiValue = await kpiValueRepo.findOne({ \n            where: { \n              kpi: { id: child.id }, \n              valueDate,\n              kpiOrgScope: null\n            }\n          })\n        }\n        childValue = kpiValue?.value || null\n      } else {\n        // 중간 노드인 경우 재귀적으로 계산\n        childValue = await this.calculateHierarchicalValue(child.id, valueDate, org)\n      }\n\n      if (childValue !== null) {\n        childValues.push(childValue)\n        childWeights.push(child.weight || 1)\n      }\n    }\n\n    if (childValues.length === 0) {\n      return null\n    }\n\n    // 가중 평균 계산\n    const totalWeight = childWeights.reduce((sum, weight) => sum + weight, 0)\n    const weightedSum = childValues.reduce((sum, value, index) => sum + value * childWeights[index], 0)\n    \n    return totalWeight > 0 ? weightedSum / totalWeight : null\n  }\n\n  /**\n   * KPI가 순환 참조를 생성하는지 확인\n   * @param kpiId KPI ID\n   * @param parentId 설정하려는 부모 KPI ID\n   * @returns Promise<boolean> 순환 참조 여부\n   */\n  async hasCircularReference(kpiId: string, parentId: string): Promise<boolean> {\n    if (kpiId === parentId) {\n      return true\n    }\n\n    const kpiRepo = getRepository(Kpi)\n    const parent = await kpiRepo.findOne({\n      where: { id: parentId },\n      relations: ['parent']\n    })\n\n    if (!parent || !parent.parent) {\n      return false\n    }\n\n    return await this.hasCircularReference(kpiId, parent.parent.id)\n  }\n}\n"]}

package/dist-server/service/kpi/kpi-history.d.ts

@@ -2,7 +2,6 @@ import { HistoryActionType, HistoryEntityInterface } from '@operato/typeorm-hist
 import { User } from '@things-factory/auth-base';
 import { Domain } from '@things-factory/shell';
 import { Kpi, KpiStatus, KpiPeriodType } from './kpi';
-import { KpiCategory } from '../kpi-category/kpi-category';
 import { KpiScores } from './kpi-grade.types';
 export declare class KpiHistory implements HistoryEntityInterface<Kpi> {
     readonly id: string;
@@ -11,8 +10,6 @@ export declare class KpiHistory implements HistoryEntityInterface<Kpi> {
     domainId?: string;
     name: string;
     description?: string;
-    category?: KpiCategory;
-    categoryId?: string;
     formula?: string;
     active?: boolean;
     state?: KpiStatus;

package/dist-server/service/kpi/kpi-history.js

@@ -9,7 +9,6 @@ const auth_base_1 = require("@things-factory/auth-base");
 const env_1 = require("@things-factory/env");
 const shell_1 = require("@things-factory/shell");
 const kpi_1 = require("./kpi");
-const kpi_category_1 = require("../kpi-category/kpi-category");
 const ORMCONFIG = env_1.config.get('ormconfig', {});
 const DATABASE_TYPE = ORMCONFIG.type;
 let KpiHistory = class KpiHistory {
@@ -47,15 +46,6 @@ tslib_1.__decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     tslib_1.__metadata("design:type", String)
 ], KpiHistory.prototype, "description", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.ManyToOne)(() => kpi_category_1.KpiCategory, { nullable: true }),
-    (0, type_graphql_1.Field)(type => kpi_category_1.KpiCategory, { nullable: true, description: 'Category to which this KPI belongs.' }),
-    tslib_1.__metadata("design:type", kpi_category_1.KpiCategory)
-], KpiHistory.prototype, "category", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.RelationId)((kpi) => kpi.category),
-    tslib_1.__metadata("design:type", String)
-], KpiHistory.prototype, "categoryId", void 0);
 tslib_1.__decorate([
     (0, typeorm_1.Column)({ nullable: true }),
     (0, type_graphql_1.Field)({ nullable: true, description: 'Calculation formula for the KPI.' }),

package/dist-server/service/kpi/kpi-history.js.map

@@ -1 +1 @@
-{"version":3,"file":"kpi-history.js","sourceRoot":"","sources":["../../../server/service/kpi/kpi-history.ts"],"names":[],"mappings":"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","sourcesContent":["import { Field, ID, ObjectType } from 'type-graphql'\nimport { Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, JoinColumn } from 'typeorm'\n\nimport {\n  HistoryActionColumn,\n  HistoryActionType,\n  HistoryEntityInterface,\n  HistoryOriginalIdColumn\n} from '@operato/typeorm-history'\nimport { Role, User } from '@things-factory/auth-base'\nimport { config } from '@things-factory/env'\nimport { Domain, ScalarObject } from '@things-factory/shell'\n\nimport { Kpi, KpiStatus, KpiPeriodType } from './kpi'\nimport { KpiCategory } from '../kpi-category/kpi-category'\nimport { KpiScores } from './kpi-grade.types'\n\nconst ORMCONFIG = config.get('ormconfig', {})\nconst DATABASE_TYPE = ORMCONFIG.type\n\n@Entity()\n@Index('ix_kpi_history_0', (kpiHistory: KpiHistory) => [kpiHistory.originalId, kpiHistory.version], { unique: true })\n@Index('ix_kpi_history_1', (kpiHistory: KpiHistory) => [kpiHistory.domain, kpiHistory.originalId, kpiHistory.version], {\n  unique: true\n})\n@ObjectType({ description: 'History Entity of Kpi' })\nexport class KpiHistory implements HistoryEntityInterface<Kpi> {\n  @PrimaryGeneratedColumn('uuid')\n  @Field(type => ID)\n  readonly id: string\n\n  @Column({ nullable: true, default: 1 })\n  @Field({ nullable: true })\n  version?: number = 1\n\n  @ManyToOne(type => Domain)\n  @Field({ nullable: true })\n  domain?: Domain\n\n  @RelationId((kpi: Kpi) => kpi.domain)\n  domainId?: string\n\n  @Column()\n  @Field()\n  name: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  description?: string\n\n  @ManyToOne(() => KpiCategory, { nullable: true })\n  @Field(type => KpiCategory, { nullable: true, description: 'Category to which this KPI belongs.' })\n  category?: KpiCategory\n\n  @RelationId((kpi: KpiHistory) => kpi.category)\n  categoryId?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true, description: 'Calculation formula for the KPI.' })\n  formula?: string\n\n  @Column({ nullable: false, default: false })\n  @Field({ nullable: true, description: 'Whether this KPI is active (usable) or not.' })\n  active?: boolean\n\n  @Column({ nullable: true })\n  @Field({ nullable: true, description: 'Current state of the KPI (DRAFT, RELEASED, ARCHIVED).' })\n  state?: KpiStatus\n\n  @Field(type => String, { nullable: true, description: 'Thumbnail image or file path for this KPI.' })\n  thumbnail?: string\n\n  @Column({ type: 'simple-json', nullable: true })\n  @Field(type => ScalarObject, {\n    nullable: true,\n    description: 'Grade configuration for this KPI version'\n  })\n  grades?: KpiScores\n\n  @Column({ type: 'float', nullable: true, default: 1 })\n  @Field({ nullable: true, description: 'Weight for aggregation in parent category.' })\n  weight?: number\n\n  @Column({ default: 'DAY' })\n  @Field(type => KpiPeriodType, { nullable: true })\n  periodType: KpiPeriodType\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  createdAt?: Date\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  updatedAt?: Date\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  deletedAt?: Date\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field(type => User, { nullable: true })\n  creator?: User\n\n  @RelationId((kpi: Kpi) => kpi.creator)\n  creatorId?: string\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field(type => User, { nullable: true })\n  updater?: User\n\n  @RelationId((kpi: Kpi) => kpi.updater)\n  updaterId?: string\n\n  @HistoryOriginalIdColumn()\n  public originalId!: string\n\n  @HistoryActionColumn({\n    nullable: false,\n    type:\n      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'\n        ? 'enum'\n        : DATABASE_TYPE == 'oracle'\n          ? 'varchar2'\n          : DATABASE_TYPE == 'mssql'\n            ? 'nvarchar'\n            : 'varchar',\n    enum:\n      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'\n        ? HistoryActionType\n        : undefined,\n    length: DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? undefined : 32\n  })\n  public action!: HistoryActionType\n}\n"]}
+{"version":3,"file":"kpi-history.js","sourceRoot":"","sources":["../../../server/service/kpi/kpi-history.ts"],"names":[],"mappings":"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","sourcesContent":["import { Field, ID, ObjectType } from 'type-graphql'\nimport { Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn, RelationId, JoinColumn } from 'typeorm'\n\nimport {\n  HistoryActionColumn,\n  HistoryActionType,\n  HistoryEntityInterface,\n  HistoryOriginalIdColumn\n} from '@operato/typeorm-history'\nimport { Role, User } from '@things-factory/auth-base'\nimport { config } from '@things-factory/env'\nimport { Domain, ScalarObject } from '@things-factory/shell'\n\nimport { Kpi, KpiStatus, KpiPeriodType } from './kpi'\nimport { KpiScores } from './kpi-grade.types'\n\nconst ORMCONFIG = config.get('ormconfig', {})\nconst DATABASE_TYPE = ORMCONFIG.type\n\n@Entity()\n@Index('ix_kpi_history_0', (kpiHistory: KpiHistory) => [kpiHistory.originalId, kpiHistory.version], { unique: true })\n@Index('ix_kpi_history_1', (kpiHistory: KpiHistory) => [kpiHistory.domain, kpiHistory.originalId, kpiHistory.version], {\n  unique: true\n})\n@ObjectType({ description: 'History Entity of Kpi' })\nexport class KpiHistory implements HistoryEntityInterface<Kpi> {\n  @PrimaryGeneratedColumn('uuid')\n  @Field(type => ID)\n  readonly id: string\n\n  @Column({ nullable: true, default: 1 })\n  @Field({ nullable: true })\n  version?: number = 1\n\n  @ManyToOne(type => Domain)\n  @Field({ nullable: true })\n  domain?: Domain\n\n  @RelationId((kpi: Kpi) => kpi.domain)\n  domainId?: string\n\n  @Column()\n  @Field()\n  name: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  description?: string\n\n  @Column({ nullable: true })\n  @Field({ nullable: true, description: 'Calculation formula for the KPI.' })\n  formula?: string\n\n  @Column({ nullable: false, default: false })\n  @Field({ nullable: true, description: 'Whether this KPI is active (usable) or not.' })\n  active?: boolean\n\n  @Column({ nullable: true })\n  @Field({ nullable: true, description: 'Current state of the KPI (DRAFT, RELEASED, ARCHIVED).' })\n  state?: KpiStatus\n\n  @Field(type => String, { nullable: true, description: 'Thumbnail image or file path for this KPI.' })\n  thumbnail?: string\n\n  @Column({ type: 'simple-json', nullable: true })\n  @Field(type => ScalarObject, {\n    nullable: true,\n    description: 'Grade configuration for this KPI version'\n  })\n  grades?: KpiScores\n\n  @Column({ type: 'float', nullable: true, default: 1 })\n  @Field({ nullable: true, description: 'Weight for aggregation in parent category.' })\n  weight?: number\n\n  @Column({ default: 'DAY' })\n  @Field(type => KpiPeriodType, { nullable: true })\n  periodType: KpiPeriodType\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  createdAt?: Date\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  updatedAt?: Date\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  deletedAt?: Date\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field(type => User, { nullable: true })\n  creator?: User\n\n  @RelationId((kpi: Kpi) => kpi.creator)\n  creatorId?: string\n\n  @ManyToOne(type => User, { nullable: true })\n  @Field(type => User, { nullable: true })\n  updater?: User\n\n  @RelationId((kpi: Kpi) => kpi.updater)\n  updaterId?: string\n\n  @HistoryOriginalIdColumn()\n  public originalId!: string\n\n  @HistoryActionColumn({\n    nullable: false,\n    type:\n      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'\n        ? 'enum'\n        : DATABASE_TYPE == 'oracle'\n          ? 'varchar2'\n          : DATABASE_TYPE == 'mssql'\n            ? 'nvarchar'\n            : 'varchar',\n    enum:\n      DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'\n        ? HistoryActionType\n        : undefined,\n    length: DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb' ? undefined : 32\n  })\n  public action!: HistoryActionType\n}\n"]}

package/dist-server/service/kpi/kpi-mutation.d.ts

@@ -10,5 +10,5 @@ export declare class KpiMutation {
     importKpis(kpis: KpiPatch[], context: ResolverContext): Promise<boolean>;
     releaseKpi(id: string, context: ResolverContext): Promise<Kpi>;
     revertKpiVersion(id: string, version: number, context: ResolverContext): Promise<Kpi>;
-    calculateKpiValue(kpiId: string, valueDate: string, group: string, context: ResolverContext): Promise<KpiValue>;
+    calculateKpiValue(kpiId: string, valueDate: string, org: string, context: ResolverContext): Promise<KpiValue>;
 }

package/dist-server/service/kpi/kpi-mutation.js

@@ -8,11 +8,11 @@ const shell_1 = require("@things-factory/shell");
 const attachment_base_1 = require("@things-factory/attachment-base");
 const kpi_1 = require("./kpi");
 const kpi_type_1 = require("./kpi-type");
-const kpi_category_1 = require("../kpi-category/kpi-category");
 const kpi_history_1 = require("./kpi-history");
 const kpi_formula_service_1 = require("./kpi-formula.service");
 const scheduler_client_1 = require("@things-factory/scheduler-client");
 const kpi_value_1 = require("../kpi-value/kpi-value");
+const kpi_org_scope_1 = require("../kpi-org-scope/kpi-org-scope");
 const typeorm_2 = require("typeorm");
 const parser_1 = require("../../calculator/parser");
 const evaluator_1 = require("../../calculator/evaluator");
@@ -21,12 +21,20 @@ const kpi_metric_value_provider_1 = require("../../controllers/kpi-metric-value-
 let KpiMutation = class KpiMutation {
     async createKpi(kpi, context) {
         const { domain, user, tx } = context.state;
-        let category = kpi.category
-            ? await (0, shell_1.getRepository)(kpi_category_1.KpiCategory).findOne({ where: { id: kpi.category.id } })
+        let parent = kpi.parent
+            ? await (0, shell_1.getRepository)(kpi_1.Kpi).findOne({ where: { id: kpi.parent.id, domain: { id: domain.id } } })
             : undefined;
+        // 순환 참조 검사
+        if (parent) {
+            const formulaService = new kpi_formula_service_1.KpiFormulaService();
+            const hasCircular = await formulaService.hasCircularReference(parent.id, parent.id);
+            if (hasCircular) {
+                throw new Error('Circular reference detected in KPI hierarchy');
+            }
+        }
         const result = await (0, shell_1.getRepository)(kpi_1.Kpi, tx).save({
             ...kpi,
-            category,
+            parent,
             domain,
             creator: user,
             updater: user
@@ -91,13 +99,21 @@ let KpiMutation = class KpiMutation {
         const kpi = await repository.findOne({
             where: { domain: { id: domain.id }, id }
         });
-        let category = patch.category
-            ? await (0, shell_1.getRepository)(kpi_category_1.KpiCategory).findOne({ where: { id: patch.category.id } })
-            : kpi.category;
+        let parent = patch.parent
+            ? await (0, shell_1.getRepository)(kpi_1.Kpi).findOne({ where: { id: patch.parent.id, domain: { id: domain.id } } })
+            : patch.parent === null ? null : kpi.parent;
+        // 순환 참조 검사 (parent가 변경되는 경우)
+        if (parent && parent.id !== kpi.parentId) {
+            const formulaService = new kpi_formula_service_1.KpiFormulaService();
+            const hasCircular = await formulaService.hasCircularReference(kpi.id, parent.id);
+            if (hasCircular) {
+                throw new Error('Circular reference detected in KPI hierarchy');
+            }
+        }
         const result = await repository.save({
             ...kpi,
             ...patch,
-            category,
+            parent,
             updater: user
         });
         if (patch.thumbnail) {
@@ -288,8 +304,6 @@ let KpiMutation = class KpiMutation {
             ...kpi,
             name: kpiHistory.name,
             description: kpiHistory.description,
-            category: kpiHistory.category,
-            categoryId: kpiHistory.categoryId,
             formula: kpiHistory.formula,
             active: kpiHistory.active,
             state: 'DRAFT',
@@ -298,7 +312,7 @@ let KpiMutation = class KpiMutation {
         });
         return updated;
     }
-    async calculateKpiValue(kpiId, valueDate, group, context) {
+    async calculateKpiValue(kpiId, valueDate, org, context) {
         const { domain, user, tx } = context.state;
         const kpiRepo = (0, shell_1.getRepository)(kpi_1.Kpi, tx);
         const metricRepo = (0, shell_1.getRepository)(require('../kpi-metric/kpi-metric').KpiMetric, tx);
@@ -334,7 +348,7 @@ let KpiMutation = class KpiMutation {
                         metric: { id: metric.id },
                         valueDate: valueDateToUse,
                         periodType,
-                        group: group ?? '',
+                        org: org ?? '',
                         domain: { id: domain.id }
                     }
                 });
@@ -350,7 +364,7 @@ let KpiMutation = class KpiMutation {
                             metric: { id: metric.id },
                             valueDate: (0, typeorm_2.Between)(startDate, endDate),
                             periodType: metric.periodType,
-                            group: group ?? '',
+                            org: org ?? '',
                             domain: { id: domain.id }
                         }
                     });
@@ -368,18 +382,37 @@ let KpiMutation = class KpiMutation {
         const ast = (0, parser_1.parseFormula)(kpi.formula);
         const provider = new kpi_metric_value_provider_1.KpiMetricValueProvider({
             valueDate: valueDateToUse,
-            group,
+            org,
             domainId: domain.id,
             tx
         });
         const evalContext = { functions: functions_1.builtinFunctions, provider };
         const kpiValueResult = await (0, evaluator_1.evaluateFormula)(ast, evalContext);
-        // 5. KPI Value upsert
+        // 5. KpiOrgScope 처리
+        let kpiOrgScope = null;
+        if (org) {
+            kpiOrgScope = await (0, shell_1.getRepository)(kpi_org_scope_1.KpiOrgScope, tx).findOne({
+                where: { org: org, domain: { id: domain.id } }
+            });
+            if (!kpiOrgScope) {
+                // 새 KpiOrgScope 생성
+                kpiOrgScope = await (0, shell_1.getRepository)(kpi_org_scope_1.KpiOrgScope, tx).save({
+                    entityType: 'KpiCalculation',
+                    entityId: `calc-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`,
+                    entityName: org,
+                    org: org,
+                    domain,
+                    creator: user,
+                    updater: user
+                });
+            }
+        }
+        // 6. KPI Value upsert
         let kpiValue = await kpiValueRepo.findOne({
             where: {
                 kpi: { id: kpi.id },
                 valueDate: valueDateToUse,
-                group: group ?? '',
+                kpiOrgScope: kpiOrgScope ? { id: kpiOrgScope.id } : null,
                 version: kpi.version,
                 domain: { id: domain.id }
             }
@@ -389,17 +422,21 @@ let KpiMutation = class KpiMutation {
             kpiValue.updater = user;
         }
         else {
-            kpiValue = kpiValueRepo.create({
+            const createData = {
                 kpi,
                 kpiId: kpi.id,
                 version: kpi.version,
                 valueDate: valueDateToUse,
                 value: kpiValueResult,
-                group: group ?? '',
                 domain,
                 creator: user,
                 updater: user
-            });
+            };
+            if (kpiOrgScope) {
+                createData.kpiOrgScope = kpiOrgScope;
+                createData.kpiOrgScopeId = kpiOrgScope.id;
+            }
+            kpiValue = Object.assign(new kpi_value_1.KpiValue(), createData);
         }
         return await kpiValueRepo.save(kpiValue);
     }
@@ -493,7 +530,7 @@ tslib_1.__decorate([
     (0, type_graphql_1.Mutation)(returns => kpi_value_1.KpiValue, { description: 'KPI 기준으로 formula 계산 및 KPI Value upsert' }),
     tslib_1.__param(0, (0, type_graphql_1.Arg)('kpiId')),
     tslib_1.__param(1, (0, type_graphql_1.Arg)('valueDate', { nullable: true })),
-    tslib_1.__param(2, (0, type_graphql_1.Arg)('group', { nullable: true })),
+    tslib_1.__param(2, (0, type_graphql_1.Arg)('org', { nullable: true })),
     tslib_1.__param(3, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String, String, String, Object]),