@things-factory/kpi 9.0.13 → 9.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/kpi",
-  "version": "9.0.13",
+  "version": "9.0.14",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -41,8 +41,8 @@
     "@operato/styles": "^9.0.0",
     "@operato/utils": "^9.0.0",
     "@things-factory/auth-base": "^9.0.0",
-    "@things-factory/dataset": "^9.0.13",
+    "@things-factory/dataset": "^9.0.14",
     "@things-factory/shell": "^9.0.0"
   },
-  "gitHead": "8629e384d819c0d232f76def3e04ed0c1030a3d0"
+  "gitHead": "b092ace8cad6c994b41ce6c06b929085d886b134"
 }

package/server/index.ts

@@ -1,4 +1,3 @@
 export * from './service/index.js'
-export * from './migrations/index.js'
 
 import './routes'

package/server/service/index.ts

@@ -3,8 +3,6 @@ export * from './kpi/kpi'
 export * from './kpi/kpi-type'
 export * from './kpi-category/kpi-category'
 export * from './kpi-category/kpi-category-type'
-export * from './kpi-grade/kpi-grade'
-export * from './kpi-grade/kpi-grade-type'
 export * from './kpi-value/kpi-value'
 export * from './kpi-value/kpi-value-type'
 export * from './kpi-metric/kpi-metric'
@@ -14,7 +12,6 @@ export * from './kpi-alert'
 /* IMPORT ENTITIES AND RESOLVERS */
 import { entities as KpiEntities, resolvers as KpiResolvers } from './kpi'
 import { entities as KpiCategoryEntities, resolvers as KpiCategoryResolvers } from './kpi-category'
-import { entities as KpiGradeEntities, resolvers as KpiGradeResolvers } from './kpi-grade'
 import { entities as KpiValueEntities, resolvers as KpiValueResolvers } from './kpi-value'
 import { entities as KpiMetricEntities, resolvers as KpiMetricResolvers } from './kpi-metric'
 import { resolvers as KpiAlertResolvers } from './kpi-alert'
@@ -23,7 +20,6 @@ export const entities = [
   /* ENTITIES */
   ...KpiEntities,
   ...KpiCategoryEntities,
-  ...KpiGradeEntities,
   ...KpiValueEntities,
   ...KpiMetricEntities
 ]
@@ -33,7 +29,6 @@ export const schema = {
     /* RESOLVER CLASSES */
     ...KpiResolvers,
     ...KpiCategoryResolvers,
-    ...KpiGradeResolvers,
     ...KpiValueResolvers,
     ...KpiMetricResolvers,
     ...KpiAlertResolvers

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

@@ -4,6 +4,7 @@ import { KpiMetric } from '../kpi-metric/kpi-metric'
 import { KpiValue, KpiValueInputType } from '../kpi-value/kpi-value'
 import { KpiFormulaService } from './kpi-formula.service'
 import { aggregateKpiMetricValue } from '../kpi-metric/aggregate-kpi-metric'
+import { KpiValueGradeService } from '../kpi-value/kpi-value-grade.service'
 
 /**
  * KPI 단위 집계/산식 자동화 함수
@@ -14,6 +15,7 @@ import { aggregateKpiMetricValue } from '../kpi-metric/aggregate-kpi-metric'
  */
 export async function aggregateKpiValue(kpiId: string, domainId: string, context: ResolverContext) {
   const tx = context.state?.tx || getRepository(Kpi).manager
+  const gradeService = new KpiValueGradeService()
 
   // 1. KPI 정보 조회
   const kpi = await getRepository(Kpi).findOne({ where: { id: kpiId, domain: { id: domainId } } })
@@ -75,6 +77,10 @@ export async function aggregateKpiValue(kpiId: string, domainId: string, context
     entity.domain = kpi.domain
     entity.creator = context.state?.user
     entity.updater = context.state?.user
+
+    // 등급 자동 계산 및 저장
+    await gradeService.calculateAndSaveGrade(entity, kpi)
+
     entity = await repo.save(entity)
     savedValues.push(entity)
   }

package/server/service/kpi/kpi-grade.types.ts

@@ -0,0 +1,27 @@
+/**
+ * KPI 등급 설정 타입 정의
+ */
+export interface KpiGrade {
+  /** 등급명 (예: A, B, C, 우수, 양호 등) */
+  name: string
+
+  /** 등급의 최소값 */
+  minValue: number
+
+  /** 등급의 최대값 */
+  maxValue: number
+
+  /** 등급 점수 (선택사항) */
+  score?: number
+
+  /** 등급 색상 (선택사항) */
+  color?: string
+
+  /** 등급 설명 (선택사항) */
+  description?: string
+}
+
+/**
+ * KPI 등급 배열 타입
+ */
+export type KpiGrades = KpiGrade[]

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

@@ -9,10 +9,11 @@ import {
 } from '@operato/typeorm-history'
 import { Role, User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
-import { Domain } from '@things-factory/shell'
+import { Domain, ScalarObject } from '@things-factory/shell'
 
 import { Kpi, KpiStatus } from './kpi'
 import { KpiCategory } from '../kpi-category/kpi-category'
+import { KpiGrades } from './kpi-grade.types'
 
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
@@ -69,6 +70,13 @@ export class KpiHistory implements HistoryEntityInterface<Kpi> {
   @Field(type => String, { nullable: true, description: 'Thumbnail image or file path for this KPI.' })
   thumbnail?: string
 
+  @Column({ type: 'simple-json', nullable: true })
+  @Field(type => ScalarObject, {
+    nullable: true,
+    description: 'Grade configuration for this KPI version'
+  })
+  grades?: KpiGrades
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   createdAt?: Date

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

@@ -4,7 +4,6 @@ import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from
 import { User } from '@things-factory/auth-base'
 import { Kpi } from './kpi'
 import { KpiList } from './kpi-type'
-import { KpiGrade } from '../kpi-grade/kpi-grade'
 import { KpiValue } from '../kpi-value/kpi-value'
 import { KpiHistory } from './kpi-history'
 import { Int } from 'type-graphql'
@@ -53,11 +52,6 @@ export class KpiQuery {
     return attachment?.fullpath
   }
 
-  @FieldResolver(type => [KpiGrade])
-  async grades(@Root() kpi: Kpi): Promise<KpiGrade[]> {
-    return await getRepository(KpiGrade).find({ where: { domain: { id: kpi.domainId }, kpi: { id: kpi.id } } })
-  }
-
   @FieldResolver(type => Domain)
   async domain(@Root() kpi: Kpi): Promise<Domain> {
     return kpi.domainId && (await getRepository(Domain).findOneBy({ id: kpi.domainId }))

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

@@ -5,6 +5,7 @@ import { ObjectType, Field, InputType, Int, ID, registerEnumType } from 'type-gr
 import { ObjectRef, ScalarObject } from '@things-factory/shell'
 
 import { Kpi, KpiStatus } from './kpi'
+import { KpiGrades } from './kpi-grade.types'
 
 @InputType({ description: 'Input type for creating a new KPI. Used in mutations to provide KPI details.' })
 export class NewKpi {
@@ -50,6 +51,12 @@ export class NewKpi {
 
   @Field({ nullable: true, description: 'Timezone for the KPI schedule.' })
   timezone?: string
+
+  @Field(type => ScalarObject, {
+    nullable: true,
+    description: 'Grade configuration for this KPI version'
+  })
+  grades?: KpiGrades
 }
 
 @InputType({ description: 'Input type for updating an existing KPI. Used in mutations to patch KPI details.' })
@@ -102,6 +109,12 @@ export class KpiPatch {
 
   @Field({ nullable: true, description: 'Timezone for the KPI schedule.' })
   timezone?: string
+
+  @Field(type => ScalarObject, {
+    nullable: true,
+    description: 'Grade configuration for this KPI version'
+  })
+  grades?: KpiGrades
 }
 
 @ObjectType()

package/server/service/kpi/kpi.ts

@@ -16,10 +16,11 @@ import { ObjectType, Field, Int, ID, registerEnumType } from 'type-graphql'
 import { Domain } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { KpiCategory } from '../kpi-category/kpi-category'
-import { KpiGrade } from '../kpi-grade/kpi-grade'
 import { config } from '@things-factory/env'
 import { ScalarObject } from '@things-factory/shell'
 
+import { KpiGrades } from './kpi-grade.types'
+
 const ORMCONFIG = config.get('ormconfig', {})
 const DATABASE_TYPE = ORMCONFIG.type
 
@@ -168,7 +169,10 @@ export class Kpi {
   @Field(type => String, { nullable: true, description: 'Thumbnail image or file path for this KPI.' })
   thumbnail?: string
 
-  @OneToMany(type => KpiGrade, kpiGrade => kpiGrade.kpi)
-  @Field(type => [KpiGrade], { nullable: true, description: 'List of grades for this KPI.' })
-  grades?: KpiGrade[]
+  @Column({ type: 'simple-json', nullable: true })
+  @Field(type => ScalarObject, {
+    nullable: true,
+    description: 'Grade configuration for this KPI version'
+  })
+  grades?: KpiGrades
 }

package/server/service/kpi-alert/kpi-alert-query.ts

@@ -2,7 +2,6 @@ import { Resolver, Query, Ctx } from 'type-graphql'
 import { getRepository } from '@things-factory/shell'
 import { Kpi } from '../kpi/kpi'
 import { KpiValue } from '../kpi-value/kpi-value'
-import { KpiGrade } from '../kpi-grade/kpi-grade'
 import { KpiAlert } from './kpi-alert-type'
 
 @Resolver()
@@ -11,7 +10,7 @@ export class KpiAlertQuery {
   async kpiAlerts(@Ctx() context): Promise<KpiAlert[]> {
     const { domain } = context.state
     // 1. KPI 전체 조회
-    const kpis = await getRepository(Kpi).find({ where: { domain: { id: domain.id } }, relations: ['grades'] })
+    const kpis = await getRepository(Kpi).find({ where: { domain: { id: domain.id } } })
     // 2. KPI별 최신 실적값 조회
     const alerts: KpiAlert[] = []
     for (const kpi of kpis) {
@@ -41,18 +40,18 @@ export class KpiAlertQuery {
         })
       }
       // 등급 기준 경고(예: 최하위 등급)
-      if (kpi.grades?.length) {
-        const grade = kpi.grades.find(g => value.value >= g.minValue && value.value <= g.maxValue)
-        if (grade && grade.score !== undefined && grade.score <= 2) {
-          alerts.push({
-            id: `${kpi.id}-grade-low`,
-            kpi,
-            message: `${kpi.name} 등급(${grade.name})(${grade.score}점)`,
-            level: 'critical',
-            createdAt: new Date()
-          })
-        }
-      }
+      // if (kpi.grades?.length) {
+      //   const grade = kpi.grades.find(g => value.value >= g.minValue && value.value <= g.maxValue)
+      //   if (grade && grade.score !== undefined && grade.score <= 2) {
+      //     alerts.push({
+      //       id: `${kpi.id}-grade-low`,
+      //       kpi,
+      //       message: `${kpi.name} 등급(${grade.name})(${grade.score}점)`,
+      //       level: 'critical',
+      //       createdAt: new Date()
+      //     })
+      //   }
+      // }
     }
     return alerts
   }

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

@@ -0,0 +1,127 @@
+import { getRepository } from '@things-factory/shell'
+import { ObjectType, Field } from 'type-graphql'
+import { Kpi } from '../kpi/kpi'
+import { KpiValue } from './kpi-value'
+import { KpiGrades } from '../kpi/kpi-grade.types'
+
+export interface GradeResult {
+  name: string
+  score?: number
+  color?: string
+  description?: string
+  minValue: number
+  maxValue: number
+}
+
+@ObjectType({ description: 'Grade information for KPI value' })
+export class GradeInfo {
+  @Field({ description: 'Grade name (e.g., A, B, C, 우수, 양호)' })
+  name: string
+
+  @Field({ nullable: true, description: 'Grade score or performance value' })
+  score?: number
+
+  @Field({ nullable: true, description: 'Color code for visualization' })
+  color?: string
+
+  @Field({ nullable: true, description: 'Grade description' })
+  description?: string
+}
+
+export class KpiValueGradeService {
+  /**
+   * KPI의 grades 정보를 이용하여 KpiValue의 등급 계산
+   */
+  calculateGradeFromKpiGrades(kpi: Kpi, value: number): GradeResult | null {
+    if (!kpi.grades || kpi.grades.length === 0) {
+      return null
+    }
+
+    // grades 배열에서 해당 값의 범위에 맞는 등급 찾기
+    const grade = kpi.grades.find(g => value >= g.minValue && value <= g.maxValue)
+
+    if (!grade) {
+      return null
+    }
+
+    return {
+      name: grade.name,
+      score: grade.score,
+      color: grade.color,
+      description: grade.description,
+      minValue: grade.minValue,
+      maxValue: grade.maxValue
+    }
+  }
+
+  /**
+   * KpiValue 생성/수정 시 등급 자동 계산 및 저장
+   */
+  async calculateAndSaveGrade(kpiValue: KpiValue, kpi: Kpi): Promise<void> {
+    const gradeResult = this.calculateGradeFromKpiGrades(kpi, kpiValue.value)
+
+    if (gradeResult) {
+      // KpiValue의 meta 필드에 등급 정보 저장
+      kpiValue.meta = {
+        ...kpiValue.meta,
+        grade: {
+          name: gradeResult.name,
+          score: gradeResult.score,
+          color: gradeResult.color,
+          description: gradeResult.description,
+          calculatedAt: new Date().toISOString()
+        }
+      }
+    }
+  }
+
+  /**
+   * 기존 KpiValue들의 등급 재계산 (배치 처리)
+   */
+  async recalculateGradesForKpi(kpiId: string, context: ResolverContext): Promise<void> {
+    const kpi = await getRepository(Kpi).findOne({ where: { id: kpiId } })
+    if (!kpi) return
+
+    const kpiValues = await getRepository(KpiValue).find({
+      where: { kpiId, version: kpi.version }
+    })
+
+    for (const kpiValue of kpiValues) {
+      await this.calculateAndSaveGrade(kpiValue, kpi)
+    }
+
+    await getRepository(KpiValue).save(kpiValues)
+  }
+
+  /**
+   * 특정 KpiValue의 등급 정보 조회
+   */
+  async getGradeForKpiValue(kpiValue: KpiValue): Promise<GradeInfo | null> {
+    // meta 필드에서 등급 정보 조회
+    if (kpiValue.meta?.grade) {
+      return {
+        name: kpiValue.meta.grade.name,
+        score: kpiValue.meta.grade.score,
+        color: kpiValue.meta.grade.color,
+        description: kpiValue.meta.grade.description
+      }
+    }
+
+    // 실시간 계산 (필요시)
+    const kpi = await getRepository(Kpi).findOne({ where: { id: kpiValue.kpiId } })
+    if (kpi) {
+      const gradeResult = this.calculateGradeFromKpiGrades(kpi, kpiValue.value)
+
+      if (gradeResult) {
+        return {
+          name: gradeResult.name,
+          score: gradeResult.score,
+          color: gradeResult.color,
+          description: gradeResult.description
+        }
+      }
+    }
+
+    return null
+  }
+}

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 { KpiValueInputType } from './kpi-value'
+import { KpiValueGradeService } from './kpi-value-grade.service'
 
 @Resolver(KpiValue)
 export class KpiValueMutation {
@@ -172,4 +173,12 @@ export class KpiValueMutation {
 
     return true
   }
+
+  @Directive('@transaction')
+  @Mutation(returns => Boolean, { description: 'Recalculate grades for all KpiValues of a specific KPI' })
+  async recalculateGradesForKpi(@Arg('kpiId') kpiId: string, @Ctx() context: ResolverContext): Promise<boolean> {
+    const gradeService = new KpiValueGradeService()
+    await gradeService.recalculateGradesForKpi(kpiId, context)
+    return true
+  }
 }

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

@@ -4,6 +4,7 @@ import { User } from '@things-factory/auth-base'
 import { KpiValue } from './kpi-value'
 import { KpiValueList } from './kpi-value-type'
 import { Kpi } from '../kpi/kpi'
+import { KpiValueGradeService, GradeInfo } from './kpi-value-grade.service'
 
 @Resolver(KpiValue)
 export class KpiValueQuery {
@@ -55,4 +56,10 @@ export class KpiValueQuery {
     if (!kpiValue.kpiId) return null
     return await getRepository(Kpi).findOneBy({ id: kpiValue.kpiId })
   }
+
+  @FieldResolver(type => GradeInfo, { nullable: true })
+  async grade(@Root() kpiValue: KpiValue): Promise<GradeInfo | null> {
+    const gradeService = new KpiValueGradeService()
+    return await gradeService.getGradeForKpiValue(kpiValue)
+  }
 }

package/things-factory.config.js

@@ -11,7 +11,6 @@ export default {
     { tagname: 'kpi-metric-list-page', page: 'kpi-metric-list' },
     { tagname: 'kpi-value-list-page', page: 'kpi-value-list' },
     { tagname: 'kpi-value-manual-entry-page', page: 'kpi-value-manual-entry' },
-    { tagname: 'kpi-grade-list-page', page: 'kpi-grade-list' },
     { tagname: 'kpi-history-list-page', page: 'kpi-history-list' }
   ]
   // bootstrap

package/client/pages/kpi-grade/kpi-grade-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 KpiGradeImporter extends LitElement {
-  static styles = [
-    ButtonContainerStyles,
-    css`
-      :host {
-        display: flex;
-        flex-direction: column;
-
-        background-color: #fff;
-      }
-
-      ox-grist {
-        flex: 1;
-      }
-    `
-  ]
-
-  @property({ type: Array }) kpiGrades: 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.kpiGrades 
-          }
-        }
-      ></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 importKpiGrades($kpiGrades: [KpiGradePatch!]!) {
-          importKpiGrades(kpiGrades: $kpiGrades)
-        }
-      `,
-      variables: { kpiGrades: this.kpiGrades }
-    })
-
-    if (response.errors?.length) return
-
-    this.dispatchEvent(new CustomEvent('imported'))
-  }
-}
-