@dssp/dkpi 1.0.0-alpha.102 → 1.0.0-alpha.103

package/dist-server/service/kpi-metric-value/kpi-metric-value-query.d.ts

@@ -3,10 +3,13 @@ import { KpiMetricValue, KpiMetricValueList } from '@things-factory/kpi';
 import { Project } from '@dssp/project';
 export declare class KpiMetricValueQuery {
     /**
-     * KPI 메트릭 값 목록 페이지 전용 — 도메인 필터 없이 모든 도메인의 KpiMetricValue
-     * 를 반환. 접근 권한은 @privilege 가 superUser/domainOwner 만 허용해 보호.
-     * 자식 도메인 (프로젝트 테넌트) 의 값까지 admin 화면에서 한꺼번에 확인 가능.
+     * KPI 메트릭 값 목록 조회.
+     *  - projectId 지정: 그 프로젝트의 **테넌트 도메인으로 스코프**. 프로젝트 KPI 화면 전용.
+     *    (프로젝트가 SYSTEM + 테넌트 두 도메인에 KMV 중복을 가진 경우, cross-domain 조회는
+     *     동일 metric 을 여러 row 로 돌려줘 저장 시 서로 덮어쓰는 문제를 유발 → 스코프로 차단)
+     *  - projectId 미지정: 도메인 필터 없이 전 도메인 조회 (admin 목록 페이지 cross-domain view).
+     * 접근 권한은 @privilege 가 superUser/domainOwner 만 허용해 보호.
      */
-    kpiMetricValues(params: ListParam, context: ResolverContext): Promise<KpiMetricValueList>;
+    kpiMetricValues(params: ListParam, projectId: string, context: ResolverContext): Promise<KpiMetricValueList>;
     project(kpiMetricValue: KpiMetricValue): Promise<Project | null>;
 }

package/dist-server/service/kpi-metric-value/kpi-metric-value-query.js

@@ -8,13 +8,28 @@ const kpi_1 = require("@things-factory/kpi");
 const project_1 = require("@dssp/project");
 let KpiMetricValueQuery = class KpiMetricValueQuery {
     /**
-     * KPI 메트릭 값 목록 페이지 전용 — 도메인 필터 없이 모든 도메인의 KpiMetricValue
-     * 를 반환. 접근 권한은 @privilege 가 superUser/domainOwner 만 허용해 보호.
-     * 자식 도메인 (프로젝트 테넌트) 의 값까지 admin 화면에서 한꺼번에 확인 가능.
+     * KPI 메트릭 값 목록 조회.
+     *  - projectId 지정: 그 프로젝트의 **테넌트 도메인으로 스코프**. 프로젝트 KPI 화면 전용.
+     *    (프로젝트가 SYSTEM + 테넌트 두 도메인에 KMV 중복을 가진 경우, cross-domain 조회는
+     *     동일 metric 을 여러 row 로 돌려줘 저장 시 서로 덮어쓰는 문제를 유발 → 스코프로 차단)
+     *  - projectId 미지정: 도메인 필터 없이 전 도메인 조회 (admin 목록 페이지 cross-domain view).
+     * 접근 권한은 @privilege 가 superUser/domainOwner 만 허용해 보호.
      */
-    async kpiMetricValues(params, context) {
+    async kpiMetricValues(params, projectId, context) {
+        // projectId 가 있으면 그 프로젝트가 속한 도메인(테넌트 승격됐으면 테넌트, 아니면 프로젝트 도메인)
+        // 으로 스코프. 없으면 undefined(=전 도메인, admin view).
+        let domain = undefined;
+        if (projectId) {
+            const project = await (0, shell_1.getRepository)(project_1.Project).findOneBy({ id: projectId });
+            if (project) {
+                const tenant = project.code &&
+                    (await (0, shell_1.getRepository)(shell_1.Domain).findOne({ where: { subdomain: project.code, extType: 'project' } }));
+                domain =
+                    tenant || (project.domainId ? await (0, shell_1.getRepository)(shell_1.Domain).findOneBy({ id: project.domainId }) : undefined);
+            }
+        }
         const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
-            domain: undefined, // 도메인 필터 미적용 — admin 운영자가 모든 도메인 데이터 조회
+            domain,
             params,
             repository: await (0, shell_1.getRepository)(kpi_1.KpiMetricValue),
             searchables: ['metricId', 'group', 'valueDate', 'org']
@@ -36,11 +51,12 @@ let KpiMetricValueQuery = class KpiMetricValueQuery {
 exports.KpiMetricValueQuery = KpiMetricValueQuery;
 tslib_1.__decorate([
     (0, type_graphql_1.Directive)('@privilege(category: "kpi", privilege: "read", domainOwnerGranted: true, superUserGranted: true)'),
-    (0, type_graphql_1.Query)(returns => kpi_1.KpiMetricValueList, { description: 'To fetch multiple KpiMetricValues (cross-domain admin view)' }),
+    (0, type_graphql_1.Query)(returns => kpi_1.KpiMetricValueList, { description: 'To fetch multiple KpiMetricValues (project-scoped or cross-domain admin view)' }),
     tslib_1.__param(0, (0, type_graphql_1.Args)(type => shell_1.ListParam)),
-    tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
+    tslib_1.__param(1, (0, type_graphql_1.Arg)('projectId', { nullable: true })),
+    tslib_1.__param(2, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, Object]),
+    tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], KpiMetricValueQuery.prototype, "kpiMetricValues", null);
 tslib_1.__decorate([

package/dist-server/service/kpi-metric-value/kpi-metric-value-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"kpi-metric-value-query.js","sourceRoot":"","sources":["../../../server/service/kpi-metric-value/kpi-metric-value-query.ts"],"names":[],"mappings":";;;;AAAA,+CAA8F;AAC9F,iDAAuG;AAEvG,6CAAwE;AACxE,2CAAuC;AAGhC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B;;;;OAIG;IAGG,AAAN,KAAK,CAAC,eAAe,CACM,MAAiB,EACnC,OAAwB;QAE/B,MAAM,YAAY,GAAG,IAAA,qCAA6B,EAAC;YACjD,MAAM,EAAE,SAAS,EAAE,wCAAwC;YAC3D,MAAM;YACN,UAAU,EAAE,MAAM,IAAA,qBAAa,EAAC,oBAAc,CAAC;YAC/C,WAAW,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC;SACvD,CAAC,CAAA;QAEF,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CAAS,cAA8B;QAClD,IAAI,CAAC,cAAc,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QACpC,IAAI,CAAC;YACH,OAAO,MAAM,IAAA,qBAAa,EAAC,iBAAO,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,cAAc,CAAC,GAAG,EAAE,CAAC,CAAA;QAC3E,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;CACF,CAAA;AAjCY,kDAAmB;AAQxB;IAFL,IAAA,wBAAS,EAAC,kGAAkG,CAAC;IAC7G,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,wBAAkB,EAAE,EAAE,WAAW,EAAE,6DAA6D,EAAE,CAAC;IAElH,mBAAA,IAAA,mBAAI,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAS,CAAC,CAAA;IACvB,mBAAA,IAAA,kBAAG,GAAE,CAAA;;6CAD2B,iBAAS;;0DAa3C;AAGK;IADL,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACpC,mBAAA,IAAA,mBAAI,GAAE,CAAA;;6CAAiB,oBAAc;;kDAOnD;8BAhCU,mBAAmB;IAD/B,IAAA,uBAAQ,EAAC,oBAAc,CAAC;GACZ,mBAAmB,CAiC/B","sourcesContent":["import { Directive, Resolver, Query, Args, Arg, Ctx, FieldResolver, Root } from 'type-graphql'\nimport { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'\nimport { User } from '@things-factory/auth-base'\nimport { KpiMetricValue, KpiMetricValueList } from '@things-factory/kpi'\nimport { Project } from '@dssp/project'\n\n@Resolver(KpiMetricValue)\nexport class KpiMetricValueQuery {\n  /**\n   * KPI 메트릭 값 목록 페이지 전용 — 도메인 필터 없이 모든 도메인의 KpiMetricValue\n   * 를 반환. 접근 권한은 @privilege 가 superUser/domainOwner 만 허용해 보호.\n   * 자식 도메인 (프로젝트 테넌트) 의 값까지 admin 화면에서 한꺼번에 확인 가능.\n   */\n  @Directive('@privilege(category: \"kpi\", privilege: \"read\", domainOwnerGranted: true, superUserGranted: true)')\n  @Query(returns => KpiMetricValueList, { description: 'To fetch multiple KpiMetricValues (cross-domain admin view)' })\n  async kpiMetricValues(\n    @Args(type => ListParam) params: ListParam,\n    @Ctx() context: ResolverContext\n  ): Promise<KpiMetricValueList> {\n    const queryBuilder = getQueryBuilderFromListParams({\n      domain: undefined, // 도메인 필터 미적용 — admin 운영자가 모든 도메인 데이터 조회\n      params,\n      repository: await getRepository(KpiMetricValue),\n      searchables: ['metricId', 'group', 'valueDate', 'org']\n    })\n\n    const [items, total] = await queryBuilder.getManyAndCount()\n\n    return { items, total }\n  }\n\n  @FieldResolver(type => Project, { nullable: true })\n  async project(@Root() kpiMetricValue: KpiMetricValue): Promise<Project | null> {\n    if (!kpiMetricValue.org) return null\n    try {\n      return await getRepository(Project).findOneBy({ id: kpiMetricValue.org })\n    } catch {\n      return null\n    }\n  }\n}\n"]}
+{"version":3,"file":"kpi-metric-value-query.js","sourceRoot":"","sources":["../../../server/service/kpi-metric-value/kpi-metric-value-query.ts"],"names":[],"mappings":";;;;AAAA,+CAA8F;AAC9F,iDAAuG;AAEvG,6CAAwE;AACxE,2CAAuC;AAGhC,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B;;;;;;;OAOG;IAGG,AAAN,KAAK,CAAC,eAAe,CACM,MAAiB,EACJ,SAAiB,EAChD,OAAwB;QAE/B,8DAA8D;QAC9D,6CAA6C;QAC7C,IAAI,MAAM,GAAuB,SAAS,CAAA;QAC1C,IAAI,SAAS,EAAE,CAAC;YACd,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAa,EAAC,iBAAO,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,CAAA;YACzE,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,MAAM,GACV,OAAO,CAAC,IAAI;oBACZ,CAAC,MAAM,IAAA,qBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAS,EAAE,CAAC,CAAC,CAAA;gBAC1G,MAAM;oBACJ,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,IAAA,qBAAa,EAAC,cAAM,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAA;YAC9G,CAAC;QACH,CAAC;QAED,MAAM,YAAY,GAAG,IAAA,qCAA6B,EAAC;YACjD,MAAM;YACN,MAAM;YACN,UAAU,EAAE,MAAM,IAAA,qBAAa,EAAC,oBAAc,CAAC;YAC/C,WAAW,EAAE,CAAC,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC;SACvD,CAAC,CAAA;QAEF,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,YAAY,CAAC,eAAe,EAAE,CAAA;QAE3D,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;IAGK,AAAN,KAAK,CAAC,OAAO,CAAS,cAA8B;QAClD,IAAI,CAAC,cAAc,CAAC,GAAG;YAAE,OAAO,IAAI,CAAA;QACpC,IAAI,CAAC;YACH,OAAO,MAAM,IAAA,qBAAa,EAAC,iBAAO,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,cAAc,CAAC,GAAG,EAAE,CAAC,CAAA;QAC3E,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,IAAI,CAAA;QACb,CAAC;IACH,CAAC;CACF,CAAA;AAnDY,kDAAmB;AAWxB;IAFL,IAAA,wBAAS,EAAC,kGAAkG,CAAC;IAC7G,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,wBAAkB,EAAE,EAAE,WAAW,EAAE,+EAA+E,EAAE,CAAC;IAEpI,mBAAA,IAAA,mBAAI,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAS,CAAC,CAAA;IACvB,mBAAA,IAAA,kBAAG,EAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAA;IACpC,mBAAA,IAAA,kBAAG,GAAE,CAAA;;6CAF2B,iBAAS;;0DA4B3C;AAGK;IADL,IAAA,4BAAa,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACpC,mBAAA,IAAA,mBAAI,GAAE,CAAA;;6CAAiB,oBAAc;;kDAOnD;8BAlDU,mBAAmB;IAD/B,IAAA,uBAAQ,EAAC,oBAAc,CAAC;GACZ,mBAAmB,CAmD/B","sourcesContent":["import { Directive, Resolver, Query, Args, Arg, Ctx, FieldResolver, Root } from 'type-graphql'\nimport { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'\nimport { User } from '@things-factory/auth-base'\nimport { KpiMetricValue, KpiMetricValueList } from '@things-factory/kpi'\nimport { Project } from '@dssp/project'\n\n@Resolver(KpiMetricValue)\nexport class KpiMetricValueQuery {\n  /**\n   * KPI 메트릭 값 목록 조회.\n   *  - projectId 지정: 그 프로젝트의 **테넌트 도메인으로 스코프**. 프로젝트 KPI 화면 전용.\n   *    (프로젝트가 SYSTEM + 테넌트 두 도메인에 KMV 중복을 가진 경우, cross-domain 조회는\n   *     동일 metric 을 여러 row 로 돌려줘 저장 시 서로 덮어쓰는 문제를 유발 → 스코프로 차단)\n   *  - projectId 미지정: 도메인 필터 없이 전 도메인 조회 (admin 목록 페이지 cross-domain view).\n   * 접근 권한은 @privilege 가 superUser/domainOwner 만 허용해 보호.\n   */\n  @Directive('@privilege(category: \"kpi\", privilege: \"read\", domainOwnerGranted: true, superUserGranted: true)')\n  @Query(returns => KpiMetricValueList, { description: 'To fetch multiple KpiMetricValues (project-scoped or cross-domain admin view)' })\n  async kpiMetricValues(\n    @Args(type => ListParam) params: ListParam,\n    @Arg('projectId', { nullable: true }) projectId: string,\n    @Ctx() context: ResolverContext\n  ): Promise<KpiMetricValueList> {\n    // projectId 가 있으면 그 프로젝트가 속한 도메인(테넌트 승격됐으면 테넌트, 아니면 프로젝트 도메인)\n    // 으로 스코프. 없으면 undefined(=전 도메인, admin view).\n    let domain: Domain | undefined = undefined\n    if (projectId) {\n      const project = await getRepository(Project).findOneBy({ id: projectId })\n      if (project) {\n        const tenant =\n          project.code &&\n          (await getRepository(Domain).findOne({ where: { subdomain: project.code, extType: 'project' } as any }))\n        domain =\n          tenant || (project.domainId ? await getRepository(Domain).findOneBy({ id: project.domainId }) : undefined)\n      }\n    }\n\n    const queryBuilder = getQueryBuilderFromListParams({\n      domain,\n      params,\n      repository: await getRepository(KpiMetricValue),\n      searchables: ['metricId', 'group', 'valueDate', 'org']\n    })\n\n    const [items, total] = await queryBuilder.getManyAndCount()\n\n    return { items, total }\n  }\n\n  @FieldResolver(type => Project, { nullable: true })\n  async project(@Root() kpiMetricValue: KpiMetricValue): Promise<Project | null> {\n    if (!kpiMetricValue.org) return null\n    try {\n      return await getRepository(Project).findOneBy({ id: kpiMetricValue.org })\n    } catch {\n      return null\n    }\n  }\n}\n"]}