@things-factory/kpi 9.0.17 → 9.0.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/kpi",
-  "version": "9.0.17",
+  "version": "9.0.19",
   "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.15",
+    "@things-factory/dataset": "^9.0.19",
     "@things-factory/shell": "^9.0.0"
   },
-  "gitHead": "125c0077d357017ce01c73bba49d805274ce6295"
+  "gitHead": "8a547ab7c7dd693d849121201dfeeeeefbc2f020"
 }

package/server/service/index.ts

@@ -7,6 +7,8 @@ export * from './kpi-value/kpi-value'
 export * from './kpi-value/kpi-value-type'
 export * from './kpi-metric/kpi-metric'
 export * from './kpi-metric/kpi-metric-type'
+export * from './kpi-metric-value/kpi-metric-value'
+export * from './kpi-metric-value/kpi-metric-value-type'
 export * from './kpi-alert'
 
 /* IMPORT ENTITIES AND RESOLVERS */
@@ -14,6 +16,7 @@ import { entities as KpiEntities, resolvers as KpiResolvers } from './kpi'
 import { entities as KpiCategoryEntities, resolvers as KpiCategoryResolvers } from './kpi-category'
 import { entities as KpiValueEntities, resolvers as KpiValueResolvers } from './kpi-value'
 import { entities as KpiMetricEntities, resolvers as KpiMetricResolvers } from './kpi-metric'
+import { entities as KpiMetricValueEntities, resolvers as KpiMetricValueResolvers } from './kpi-metric-value'
 import { resolvers as KpiAlertResolvers } from './kpi-alert'
 
 export const entities = [
@@ -21,7 +24,8 @@ export const entities = [
   ...KpiEntities,
   ...KpiCategoryEntities,
   ...KpiValueEntities,
-  ...KpiMetricEntities
+  ...KpiMetricEntities,
+  ...KpiMetricValueEntities
 ]
 
 export const schema = {
@@ -31,6 +35,7 @@ export const schema = {
     ...KpiCategoryResolvers,
     ...KpiValueResolvers,
     ...KpiMetricResolvers,
+    ...KpiMetricValueResolvers,
     ...KpiAlertResolvers
   ]
 }

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

@@ -34,8 +34,7 @@ export async function aggregateKpiValue(kpiId: string, domainId: string, context
     codeValueMap[code] = await aggregateKpiMetricValue(metric.id, domainId, context)
   }
   // group/date/period별로 값 매핑(가장 최근 기준, group key 조합)
-  const groupKey = v =>
-    [v.date, v.period, v.group?.key01, v.group?.key02, v.group?.key03, v.group?.key04, v.group?.key05].join('|')
+  const groupKey = v => [v.date, v.period, v.group].join('|')
   const groupMap: Record<string, any> = {}
   for (const code of metricCodes) {
     for (const v of codeValueMap[code]) {
@@ -55,14 +54,13 @@ export async function aggregateKpiValue(kpiId: string, domainId: string, context
       value = null
     }
     const valueDate = groupMap[key].date
-    const groupId = groupMap[key].group?.key01
-    const groupType = groupMap[key].group?.key02
+    const group = groupMap[key].group
     const version = kpi.version || 1
     if (value == null || isNaN(value)) continue
-    // upsert(동일 KPI, valueDate, groupId, groupType, version) 기준으로 저장
+    // upsert(동일 KPI, valueDate, group, version) 기준으로 저장
     const repo = getRepository(KpiValue, context.state?.tx)
     const existing = await repo.findOne({
-      where: { kpi: { id: kpi.id }, valueDate, groupId, groupType, version, domain: { id: domainId } }
+      where: { kpi: { id: kpi.id }, valueDate, group, version, domain: { id: domainId } }
     })
     let entity = existing || repo.create()
     entity.kpi = kpi
@@ -70,8 +68,7 @@ export async function aggregateKpiValue(kpiId: string, domainId: string, context
     entity.version = version
     entity.valueDate = valueDate
     entity.value = value
-    entity.groupId = groupId
-    entity.groupType = groupType
+    entity.group = group
     entity.inputType = KpiValueInputType.AUTO
     entity.source = 'AUTO'
     entity.domain = kpi.domain

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

@@ -11,7 +11,7 @@ import { Role, User } from '@things-factory/auth-base'
 import { config } from '@things-factory/env'
 import { Domain, ScalarObject } from '@things-factory/shell'
 
-import { Kpi, KpiStatus } from './kpi'
+import { Kpi, KpiStatus, KpiPeriodType } from './kpi'
 import { KpiCategory } from '../kpi-category/kpi-category'
 import { KpiGrades } from './kpi-grade.types'
 
@@ -77,6 +77,14 @@ export class KpiHistory implements HistoryEntityInterface<Kpi> {
   })
   grades?: KpiGrades
 
+  @Column({ type: 'float', nullable: true, default: 1 })
+  @Field({ nullable: true, description: 'Weight for aggregation in parent category.' })
+  weight?: number
+
+  @Column({ default: 'DAY' })
+  @Field(type => KpiPeriodType, { nullable: true })
+  periodType: KpiPeriodType
+
   @Column({ nullable: true })
   @Field({ nullable: true })
   createdAt?: Date

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

@@ -189,7 +189,7 @@ export class KpiMutation {
   }
 
   @Directive('@transaction')
-  @Mutation(returns => Boolean, { description: "To modify multiple Kpis' information" })
+  @Mutation(returns => [Kpi], { description: "To modify multiple Kpis' information" })
   async updateMultipleKpi(
     @Arg('patches', type => [KpiPatch]) patches: KpiPatch[],
     @Ctx() context: ResolverContext

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

@@ -52,6 +52,9 @@ export class NewKpi {
   @Field({ nullable: true, description: 'Timezone for the KPI schedule.' })
   timezone?: string
 
+  @Field({ nullable: true, description: 'Weight for aggregation in parent category.' })
+  weight?: number
+
   @Field(type => ScalarObject, {
     nullable: true,
     description: 'Grade configuration for this KPI version'
@@ -110,6 +113,9 @@ export class KpiPatch {
   @Field({ nullable: true, description: 'Timezone for the KPI schedule.' })
   timezone?: string
 
+  @Field({ nullable: true, description: 'Weight for aggregation in parent category.' })
+  weight?: number
+
   @Field(type => ScalarObject, {
     nullable: true,
     description: 'Grade configuration for this KPI version'

package/server/service/kpi/kpi.ts

@@ -48,6 +48,14 @@ export enum KpiVizType {
   TABLE = 'TABLE'
 }
 
+export enum KpiPeriodType {
+  DAY = 'DAY',
+  WEEK = 'WEEK',
+  MONTH = 'MONTH',
+  QUARTER = 'QUARTER',
+  RANGE = 'RANGE'
+}
+
 registerEnumType(KpiStatus, {
   name: 'KpiStatus',
   description: 'State enumeration of a KPI (DRAFT, RELEASED, ARCHIVED)'
@@ -58,6 +66,11 @@ registerEnumType(KpiVizType, {
   description: 'Visualization type for KPI display (CARD, GAUGE, PROGRESS, etc.)'
 })
 
+registerEnumType(KpiPeriodType, {
+  name: 'KpiPeriodType',
+  description: 'Aggregation period type for KPI (DAY, WEEK, MONTH, QUARTER, RANGE)'
+})
+
 @Entity()
 @Index('ix_kpi_0', (kpi: Kpi) => [kpi.domain, kpi.name], {
   where: '"deleted_at" IS NULL',
@@ -161,6 +174,14 @@ export class Kpi {
   @Field({ nullable: true, description: 'Timezone for the KPI schedule.' })
   timezone?: string
 
+  @Column({ default: 'DAY' })
+  @Field(type => KpiPeriodType, { description: 'Aggregation period type for this KPI.' })
+  periodType: KpiPeriodType
+
+  @Column({ type: 'float', nullable: true, default: 1 })
+  @Field({ nullable: true, description: 'Weight for aggregation in parent category.' })
+  weight?: number
+
   @CreateDateColumn()
   @Field({ nullable: true, description: 'Timestamp when this KPI was created.' })
   createdAt?: Date

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

@@ -16,13 +16,8 @@ export class KpiCategoryMutation {
   ): Promise<KpiCategory> {
     const { domain, user, tx } = context.state
 
-    let parent = category.parentId
-      ? await getRepository(KpiCategory).findOne({ where: { id: category.parentId } })
-      : undefined
-
     const result = await getRepository(KpiCategory, tx).save({
       ...category,
-      parent,
       domain,
       creator: user,
       updater: user
@@ -45,14 +40,9 @@ export class KpiCategoryMutation {
       where: { domain: { id: domain.id }, id }
     })
 
-    let parent = patch.parentId
-      ? await getRepository(KpiCategory).findOne({ where: { id: patch.parentId } })
-      : kpiCategory.parent
-
     const result = await repository.save({
       ...kpiCategory,
       ...patch,
-      parent,
       updater: user
     })
 

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

@@ -16,11 +16,14 @@ export class NewKpiCategory {
   @Field({ nullable: true, description: 'Detailed description of this KPI category.' })
   description?: string
 
-  @Field(type => ID, { nullable: true, description: 'ID of the parent category, if any.' })
-  parentId?: string
-
   @Field({ nullable: true, description: 'Whether this category is active (usable) or not.' })
   active?: boolean
+
+  @Field({ nullable: true, description: 'Aggregation formula using child KPI codes.' })
+  formula?: string
+
+  @Field({ nullable: true, description: 'Weight for aggregation in higher-level summary.' })
+  weight?: number
 }
 
 @InputType({
@@ -36,12 +39,15 @@ export class KpiCategoryPatch {
   @Field({ nullable: true, description: 'Detailed description of this KPI category.' })
   description?: string
 
-  @Field(type => ID, { nullable: true, description: 'ID of the parent category, if any.' })
-  parentId?: string
-
   @Field({ nullable: true, description: 'Whether this category is active (usable) or not.' })
   active?: boolean
 
+  @Field({ nullable: true, description: 'Aggregation formula using child KPI codes.' })
+  formula?: string
+
+  @Field({ nullable: true, description: 'Weight for aggregation in higher-level summary.' })
+  weight?: number
+
   @Field({ nullable: true, description: 'Custom flag for update operations (internal use).' })
   cuFlag?: string
 }

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

@@ -48,13 +48,13 @@ export class KpiCategory {
   @Field({ nullable: true, description: 'Whether this category is active (usable) or not.' })
   active?: boolean
 
-  @ManyToOne(type => KpiCategory, { nullable: true })
-  @Field(type => KpiCategory, { nullable: true, description: 'Parent category for hierarchical category structure.' })
-  parent?: KpiCategory
+  @Column({ nullable: true })
+  @Field({ nullable: true, description: 'Aggregation formula using child KPI codes.' })
+  formula?: string
 
-  @RelationId((category: KpiCategory) => category.parent)
-  @Field({ nullable: true, description: 'ID of the parent category, if any.' })
-  parentId?: string
+  @Column({ type: 'float', nullable: true, default: 1 })
+  @Field({ nullable: true, description: 'Weight for aggregation in higher-level summary.' })
+  weight?: number
 
   @ManyToOne(type => User, { nullable: true })
   @Field(type => User, { nullable: true, description: 'User who created this KPI category.' })

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

@@ -23,90 +23,51 @@ export async function aggregateKpiMetricValue(metricId: string, domainId: string
   if (!metric) throw new Error('Metric 정보 없음')
   if (!metric.active) throw new Error('비활성화된 Metric')
 
-  // 2. formula가 있으면 산식 계산, 없으면 dataset 집계
+  // formula 분기 제거: metric은 항상 dataset 집계만 수행
   let values: any[] = []
-  if (metric.formula) {
-    // formula 파싱 및 metric code별 값 계산
-    const formulaService = new KpiFormulaService()
-    const metricCodes = formulaService.extractMetricCodes(metric.formula)
-    // code별 값 집계 (동일 기간/그룹 기준)
-    const codeValueMap: Record<string, any[]> = {}
-    for (const code of metricCodes) {
-      const subMetric = await getRepository(KpiMetric).findOne({ where: { name: code, domain: { id: domainId } } })
-      if (!subMetric) throw new Error(`Formula metric '${code}' not found`)
-      codeValueMap[code] = await aggregateKpiMetricValue(subMetric.id, domainId, context)
-    }
-    // group/date/period별로 값 매핑
-    // (여기서는 가장 최근 기간 기준, group key 조합으로 매핑)
-    const groupKey = v =>
-      [v.date, v.period, v.group?.key01, v.group?.key02, v.group?.key03, v.group?.key04, v.group?.key05].join('|')
-    const groupMap: Record<string, any> = {}
-    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
-      }
-    }
-    // formula 계산 (js eval, 보안상 제한적 사용)
-    for (const key in groupMap) {
-      const ctx = groupMap[key]._values
-      let value = null
-      try {
-        value = Function(...Object.keys(ctx), `return (${metric.formula})`)(...Object.values(ctx))
-      } catch (e) {
-        value = null
-      }
-      values.push({ ...groupMap[key], value })
-    }
-  } else {
-    // 3. dataset 집계/마감 실행 (최신 기간 기준)
-    if (!metric.dataSetId || !metric.fieldName) throw new Error('Metric 매핑 정보 누락')
-    await finalizeLatestDataCollection(metric.dataSetId, context)
-    // 4. 집계 결과(summary)에서 metric.fieldName 값 추출
-    const summaries = await getRepository(DataSummary).find({
-      where: { dataSet: { id: metric.dataSetId }, domain: { id: domainId } },
-      order: { date: 'DESC', period: 'DESC' }
-    })
-    values = summaries
-      .map(summary => {
-        if (summary.summary && metric.fieldName in summary.summary) {
-          return {
-            date: summary.date,
-            period: summary.period,
-            value: summary.summary[metric.fieldName],
-            group: {
-              key01: summary.key01,
-              key02: summary.key02,
-              key03: summary.key03,
-              key04: summary.key04,
-              key05: summary.key05
-            }
+  if (!metric.dataSetId || !metric.fieldName) throw new Error('Metric 매핑 정보 누락')
+  await finalizeLatestDataCollection(metric.dataSetId, context)
+  const summaries = await getRepository(DataSummary).find({
+    where: { dataSet: { id: metric.dataSetId }, domain: { id: domainId } },
+    order: { date: 'DESC', period: 'DESC' }
+  })
+  values = summaries
+    .map(summary => {
+      if (summary.summary && metric.fieldName in summary.summary) {
+        return {
+          date: summary.date,
+          period: summary.period,
+          value: summary.summary[metric.fieldName],
+          group: {
+            key01: summary.key01,
+            key02: summary.key02,
+            key03: summary.key03,
+            key04: summary.key04,
+            key05: summary.key05
           }
         }
-        return null
-      })
-      .filter(Boolean)
-  }
+      }
+      return null
+    })
+    .filter(Boolean)
 
   // 5. KPI Value로 저장 (metric 단위, KPI 단위 formula는 후속)
   // metric이 속한 KPI 정보 조회 (여기서는 metric.name == kpi.name인 KPI를 임시로 매핑, 실제 연동 구조에 맞게 보완 필요)
   const kpi = await getRepository(Kpi).findOne({ where: { name: metric.name, domain: { id: domainId } } })
   if (!kpi) throw new Error('KPI 정보 없음 (metric.name과 동일한 KPI name 기준, 실제 연동 구조에 맞게 보완 필요)')
 
-  // KPI Value version, valueDate, groupId, groupType 등 매핑
+  // KPI Value version, valueDate, group 등 매핑
   const savedValues = []
   for (const v of values) {
     const valueDate = v.date
-    const groupId = v.group?.key01
-    const groupType = v.group?.key02
+    const group = v.group
     const version = kpi.version || 1
     const value = v.value
     if (value == null || isNaN(value)) continue
-    // upsert(동일 KPI, valueDate, groupId, groupType, version) 기준으로 저장
+    // upsert(동일 KPI, valueDate, group, version) 기준으로 저장
     const repo = getRepository(KpiValue, context.state?.tx)
     const existing = await repo.findOne({
-      where: { kpi: { id: kpi.id }, valueDate, groupId, groupType, version, domain: { id: domainId } }
+      where: { kpi: { id: kpi.id }, valueDate, group, version, domain: { id: domainId } }
     })
     let entity = existing || repo.create()
     entity.kpi = kpi
@@ -114,8 +75,7 @@ export async function aggregateKpiMetricValue(metricId: string, domainId: string
     entity.version = version
     entity.valueDate = valueDate
     entity.value = value
-    entity.groupId = groupId
-    entity.groupType = groupType
+    entity.group = group
     entity.inputType = KpiValueInputType.AUTO
     entity.source = 'AUTO'
     entity.domain = kpi.domain

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

@@ -14,25 +14,20 @@ export class KpiMetricMutation {
   @Directive('@transaction')
   @Mutation(returns => KpiMetric, { description: 'Create a new KPI metric with the provided details.' })
   async createKpiMetric(
-    @Arg('metric', { description: 'Input object containing details for the new KPI metric.' }) metric: NewKpiMetric,
+    @Arg('kpiMetric', { description: 'Input object containing details for the new KPI metric.' })
+    kpiMetric: NewKpiMetric,
     @Ctx() context: ResolverContext
   ): Promise<KpiMetric> {
     const { domain, user, tx } = context.state
 
-    let dataSet = metric.dataSetId
-      ? await getRepository(DataSet).findOne({ where: { id: metric.dataSetId } })
+    let dataSet = kpiMetric.dataSetId
+      ? await getRepository(DataSet).findOne({ where: { id: kpiMetric.dataSetId } })
       : undefined
 
-    if (metric.formula) {
-      const formulaService = new KpiFormulaService()
-      const result = await formulaService.validateFormula(metric.formula)
-      if (!result.valid) {
-        throw new Error(result.errors.join('\n'))
-      }
-    }
+    // formula 관련 로직 완전 제거
 
     const result = await getRepository(KpiMetric, tx).save({
-      ...metric,
+      ...kpiMetric,
       dataSet,
       domain,
       creator: user,
@@ -40,9 +35,9 @@ export class KpiMetricMutation {
     })
 
     // 스케줄러 등록
-    if (metric.schedule) {
+    if (kpiMetric.schedule) {
       const handle = await registerSchedule({
-        name: metric.name,
+        name: kpiMetric.name,
         client: {
           application: Application,
           group: `${domain.id}`,
@@ -51,8 +46,8 @@ export class KpiMetricMutation {
           operation: 'aggregate'
         },
         type: 'cron',
-        schedule: metric.schedule,
-        timezone: metric.timezone,
+        schedule: kpiMetric.schedule,
+        timezone: kpiMetric.timezone,
         task: {
           type: 'rest',
           connection: {
@@ -73,16 +68,16 @@ export class KpiMetricMutation {
         }
       })
       result.scheduleId = handle
-      result.timezone = metric.timezone
+      result.timezone = kpiMetric.timezone
       await getRepository(KpiMetric, tx).save(result)
     }
 
-    if (metric.thumbnail) {
+    if (kpiMetric.thumbnail) {
       await createAttachment(
         null,
         {
           attachment: {
-            file: metric.thumbnail,
+            file: kpiMetric.thumbnail,
             refType: KpiMetric.name,
             refBy: result.id
           }
@@ -112,13 +107,7 @@ export class KpiMetricMutation {
       ? await getRepository(DataSet).findOne({ where: { id: patch.dataSetId } })
       : kpiMetric.dataSet
 
-    if (patch.formula) {
-      const formulaService = new KpiFormulaService()
-      const result = await formulaService.validateFormula(patch.formula)
-      if (!result.valid) {
-        throw new Error(result.errors.join('\n'))
-      }
-    }
+    // formula 관련 로직 완전 제거
 
     const result = await repository.save({
       ...kpiMetric,
@@ -128,7 +117,7 @@ export class KpiMetricMutation {
     })
 
     // 스케줄러 해제/등록 (변경 시)
-    if (kpiMetric.scheduleId && (patch.schedule !== kpiMetric.schedule || !patch.schedule)) {
+    if (kpiMetric.scheduleId && (patch.scheduleId !== kpiMetric.scheduleId || !patch.scheduleId)) {
       await unregisterSchedule(kpiMetric.scheduleId)
       result.scheduleId = null
     }

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

@@ -2,9 +2,7 @@ import type { FileUpload } from 'graphql-upload/GraphQLUpload.js'
 import GraphQLUpload from 'graphql-upload/GraphQLUpload.js'
 import { ObjectType, Field, InputType, Int, ID, registerEnumType } from 'type-graphql'
 
-import { ObjectRef, ScalarObject } from '@things-factory/shell'
-
-import { KpiMetric } from './kpi-metric'
+import { KpiMetric, KpiMetricPeriodType, KpiMetricCollectType } from './kpi-metric'
 
 @InputType({ description: 'Input type for creating a new KPI metric. Used in mutations to provide metric details.' })
 export class NewKpiMetric {
@@ -29,9 +27,6 @@ export class NewKpiMetric {
   @Field({ nullable: true, description: 'Indicates whether this metric is active and usable.' })
   active?: boolean
 
-  @Field({ nullable: true, description: 'Calculation formula for the metric, using other metric codes and operators.' })
-  formula?: string
-
   @Field({
     nullable: true,
     description: 'Cron schedule string for periodic KPI value aggregation (e.g., "0 0 * * *" for daily).'
@@ -45,6 +40,12 @@ export class NewKpiMetric {
   timezone?: string
   @Field({ nullable: true, description: 'Schedule ID for the registered cron job.' })
   scheduleId?: string
+
+  @Field(type => KpiMetricPeriodType, { nullable: true, description: 'Aggregation period type for this metric.' })
+  periodType?: KpiMetricPeriodType
+
+  @Field(type => KpiMetricCollectType, { nullable: true, description: '데이터 수집 방식' })
+  collectType?: KpiMetricCollectType
 }
 
 @InputType()
@@ -73,9 +74,6 @@ export class KpiMetricPatch {
   @Field({ nullable: true })
   active?: boolean
 
-  @Field({ nullable: true, description: 'Calculation formula for the metric, using other metric codes and operators.' })
-  formula?: string
-
   @Field({
     nullable: true,
     description: 'Cron schedule string for periodic KPI value aggregation (e.g., "0 0 * * *" for daily).'
@@ -85,13 +83,20 @@ export class KpiMetricPatch {
   @Field(type => GraphQLUpload, { nullable: true })
   thumbnail?: FileUpload
 
-  @Field({ nullable: true })
-  cuFlag?: string
-
   @Field({ nullable: true, description: 'Timezone for the schedule.' })
   timezone?: string
+
   @Field({ nullable: true, description: 'Schedule ID for the registered cron job.' })
   scheduleId?: string
+
+  @Field(type => KpiMetricPeriodType, { nullable: true, description: 'Aggregation period type for this metric.' })
+  periodType?: KpiMetricPeriodType
+
+  @Field({ nullable: true })
+  cuFlag?: string
+
+  @Field(type => KpiMetricCollectType, { nullable: true, description: '데이터 수집 방식' })
+  collectType?: KpiMetricCollectType
 }
 
 @ObjectType()

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

@@ -15,6 +15,30 @@ import { Domain } from '@things-factory/shell'
 import { User } from '@things-factory/auth-base'
 import { DataSet } from '@things-factory/dataset'
 
+export enum KpiMetricPeriodType {
+  DAY = 'DAY',
+  WEEK = 'WEEK',
+  MONTH = 'MONTH',
+  QUARTER = 'QUARTER',
+  RANGE = 'RANGE'
+}
+
+registerEnumType(KpiMetricPeriodType, {
+  name: 'KpiMetricPeriodType',
+  description: 'Aggregation period type for metric (DAY, WEEK, MONTH, QUARTER, RANGE)'
+})
+
+export enum KpiMetricCollectType {
+  AUTO = 'AUTO', // 데이터셋 등 자동 수집
+  MANUAL = 'MANUAL', // 수동 입력
+  IMPORT = 'IMPORT', // 외부 파일 등 임포트
+  EXTERNAL = 'EXTERNAL' // 외부 API 등
+}
+registerEnumType(KpiMetricCollectType, {
+  name: 'KpiMetricCollectType',
+  description: '방식: AUTO(자동), MANUAL(수동), IMPORT(임포트), EXTERNAL(외부API)'
+})
+
 @Entity()
 @Index('ix_kpi_metric_0', (kpiMetric: KpiMetric) => [kpiMetric.domain, kpiMetric.name], {
   where: '"deleted_at" IS NULL',
@@ -66,17 +90,6 @@ export class KpiMetric {
   @Field({ nullable: true, description: 'Indicates whether this metric is active and usable.' })
   active?: boolean
 
-  @Column({ nullable: true })
-  @Field({ nullable: true, description: 'Calculation formula for the metric, using other metric codes and operators.' })
-  formula?: string
-
-  @Column({ nullable: true })
-  @Field({
-    nullable: true,
-    description: 'Cron schedule string for periodic KPI value aggregation (e.g., "0 0 * * *" for daily).'
-  })
-  schedule?: string
-
   @Column({ nullable: true })
   @Field({ nullable: true, description: 'Schedule ID for the registered cron job.' })
   scheduleId?: string
@@ -85,6 +98,14 @@ export class KpiMetric {
   @Field({ nullable: true, description: 'Timezone for the schedule.' })
   timezone?: string
 
+  @Column({ type: 'enum', enum: KpiMetricCollectType, default: KpiMetricCollectType.AUTO })
+  @Field(type => KpiMetricCollectType, { description: '데이터 수집 방식' })
+  collectType: KpiMetricCollectType
+
+  @Column({ default: 'DAY' })
+  @Field(type => KpiMetricPeriodType, { description: 'Aggregation period type for this metric.' })
+  periodType: KpiMetricPeriodType
+
   @CreateDateColumn()
   @Field({ nullable: true, description: 'Timestamp when this KPI metric was created.' })
   createdAt?: Date

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

@@ -0,0 +1,7 @@
+import { KpiMetricValue } from './kpi-metric-value'
+import { KpiMetricValueQuery } from './kpi-metric-value-query'
+import { KpiMetricValueMutation } from './kpi-metric-value-mutation'
+
+export const entities = [KpiMetricValue]
+export const resolvers = [KpiMetricValueQuery, KpiMetricValueMutation]
+export const subscribers = []