@things-factory/kpi 9.1.8 → 9.1.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/kpi",
-  "version": "9.1.8",
+  "version": "9.1.13",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -41,9 +41,9 @@
     "@operato/shell": "^9.0.0",
     "@operato/styles": "^9.0.0",
     "@operato/utils": "^9.0.0",
-    "@things-factory/auth-base": "^9.1.0",
-    "@things-factory/dataset": "^9.1.8",
-    "@things-factory/shell": "^9.1.0"
+    "@things-factory/auth-base": "^9.1.13",
+    "@things-factory/dataset": "^9.1.13",
+    "@things-factory/shell": "^9.1.13"
   },
-  "gitHead": "f57b6d95e097f5ba9d2dc653390f869a10243a89"
+  "gitHead": "a65dd907befaf3a422aa0250d6096b86d151d46e"
 }

package/server/calculator/parser.ts

@@ -21,7 +21,8 @@ function tokenize(formula: string): Token[] {
   let lastIndex = 0
   while ((m = TOKEN_REGEX.exec(formula))) {
     lastIndex = TOKEN_REGEX.lastIndex
-    const [raw] = m
+    // m[0]은 공백 포함, m[1]은 capturing group (공백 제외)
+    const raw = m[1]
     if (/^\d/.test(raw)) {
       tokens.push({ type: 'number', value: raw })
     } else if (/^\[.*\]$/.test(raw)) {
@@ -71,21 +72,29 @@ export function parseFormula(formula: string): FormulaNode {
       return { type: 'variable', name: t.value }
     }
     if (t.type === 'function') {
-      // 함수 호출: func(expr, ...)
+      // function 타입 토큰을 만났을 때, 다음 토큰이 '('인지 확인
       const name = t.value
       next()
-      expect('paren', '(')
-      const args: FormulaNode[] = []
-      if ((peek() && peek().type !== 'paren') || (peek() && peek().value !== ')')) {
-        while (true) {
-          args.push(parseExpr())
-          if (peek() && peek().type === 'comma') {
-            next()
-          } else break
+
+      // 다음 토큰이 '('이면 함수 호출, 아니면 변수로 처리
+      if (peek() && peek().type === 'paren' && peek().value === '(') {
+        // 함수 호출: func(expr, ...)
+        expect('paren', '(')
+        const args: FormulaNode[] = []
+        if ((peek() && peek().type !== 'paren') || (peek() && peek().value !== ')')) {
+          while (true) {
+            args.push(parseExpr())
+            if (peek() && peek().type === 'comma') {
+              next()
+            } else break
+          }
         }
+        expect('paren', ')')
+        return { type: 'function', name, args }
+      } else {
+        // 변수로 처리
+        return { type: 'variable', name }
       }
-      expect('paren', ')')
-      return { type: 'function', name, args }
     }
     if (t.type === 'operator' && t.value === '-') {
       next()

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

@@ -344,14 +344,17 @@ export class KpiValueMutation {
       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 } } }))
+    // 항상 최신 버전의 KPI를 조회하여 사용
+    const kpi = await kpiRepo.findOne({
+      where: { id: kpiValue.kpiId, domain: { id: domain.id } },
+      order: { version: 'DESC' }
+    })
     if (!kpi) throw new Error('KPI 정보 없음')
     if (!kpi.formula) throw new Error('KPI formula 없음')
     const periodType = kpi.periodType || KpiPeriodType.DAY
     const valueDate = kpiValue.valueDate
     const kpiOrgScope = kpiValue.kpiOrgScope
     const org = kpiOrgScope?.entityName || kpiOrgScope?.org || 'unknown' // KpiOrgScope에서 org 정보 추출
-    const version = kpiValue.version
 
     // 2. formula에서 metric code 추출
     const metricCodes = (kpi.formula.match(/[a-zA-Z_][a-zA-Z0-9_]*/g) || []).filter(
@@ -415,8 +418,9 @@ export class KpiValueMutation {
     const kpiValueResult = await evaluateFormula(ast, evalContext)
     if (kpiValueResult == null || isNaN(kpiValueResult)) throw new Error('KPI formula 결과값 없음')
 
-    // 5. KPI Value 업데이트
+    // 5. KPI Value 업데이트 (최신 버전으로)
     kpiValue.value = kpiValueResult
+    kpiValue.version = kpi.version || 1
     kpiValue.updater = user
 
     // 6. 성과 점수 자동 계산 및 저장

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

@@ -33,11 +33,8 @@ export class KpiValueScoreService {
       if (result !== null && result !== undefined && !isNaN(result)) {
         const performanceScore = Number(result)
 
-        // score를 0~1 범위로 제한
-        const clampedScore = Math.max(0, Math.min(1, performanceScore))
-
         return {
-          score: clampedScore,
+          score: performanceScore,
           calculationMethod: 'formula'
         }
       }
@@ -65,11 +62,8 @@ export class KpiValueScoreService {
       return null
     }
 
-    // score를 0~1 범위로 제한
-    const clampedScore = Math.max(0, Math.min(1, grade.score))
-
     return {
-      score: clampedScore,
+      score: grade.score,
       calculationMethod: 'lookup'
     }
   }

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

@@ -77,7 +77,7 @@ export class KpiValue {
   @Column('float', { nullable: true })
   @Field(type => Float, {
     nullable: true,
-    description: 'Performance score calculated from KPI value using scoreFormula or grades lookup table. Range: 0-1.'
+    description: 'Performance score calculated from KPI value using scoreFormula or grades lookup table.'
   })
   score?: number