@dssp/dkpi 1.0.27 → 1.0.29

package/dist-server/service/kpi-stat/kpi-stat-query.js

@@ -7,8 +7,22 @@ const shell_1 = require("@things-factory/shell");
 const kpi_1 = require("@things-factory/kpi");
 const domain_inheritance_js_1 = require("@things-factory/kpi/dist-server/service/utils/domain-inheritance.js");
 const kpi_stat_types_1 = require("./kpi-stat-types");
+const PROJECT_AXIS_COLUMNS = {
+    sectorType: 'sector_type',
+    buildingUsage: 'building_usage',
+    projectScale: 'project_scale',
+    facilityType: 'facility_type'
+};
+function applyProjectAxisFilters(queryBuilder, alias, filters) {
+    for (const [key, column] of Object.entries(PROJECT_AXIS_COLUMNS)) {
+        const value = filters[key];
+        if (!(value === null || value === void 0 ? void 0 : value.trim()))
+            continue;
+        queryBuilder.andWhere(`${alias}.${column} = :${key}`, { [key]: value });
+    }
+}
 let KpiStatQuery = class KpiStatQuery {
-    async totalKpiZValueComprehensiveStats(startYearMonth, endYearMonth, sectorType, buildingUsage, context) {
+    async totalKpiZValueComprehensiveStats(startYearMonth, endYearMonth, sectorType, buildingUsage, projectScale, facilityType, context) {
         const { domain } = context.state;
         const queryBuilder = (0, shell_1.getRepository)('kpi_values')
             .createQueryBuilder('kv')
@@ -34,12 +48,7 @@ let KpiStatQuery = class KpiStatQuery {
         if (endYearMonth && endYearMonth.trim() !== '') {
             queryBuilder.andWhere(`LEFT(kv.value_date, 7) <= :endYearMonth`, { endYearMonth });
         }
-        if (sectorType === null || sectorType === void 0 ? void 0 : sectorType.trim()) {
-            queryBuilder.andWhere('p.sector_type = :sectorType', { sectorType });
-        }
-        if (buildingUsage === null || buildingUsage === void 0 ? void 0 : buildingUsage.trim()) {
-            queryBuilder.andWhere('p.building_usage = :buildingUsage', { buildingUsage });
-        }
+        applyProjectAxisFilters(queryBuilder, 'p', { sectorType, buildingUsage, projectScale, facilityType });
         queryBuilder.groupBy('k.name');
         const results = await queryBuilder.getRawMany();
         return results.map(result => {
@@ -63,7 +72,7 @@ let KpiStatQuery = class KpiStatQuery {
             };
         });
     }
-    async totalKpiYValueComprehensiveStats(startYearMonth, endYearMonth, sectorType, buildingUsage, context) {
+    async totalKpiYValueComprehensiveStats(startYearMonth, endYearMonth, sectorType, buildingUsage, projectScale, facilityType, context) {
         const { domain } = context.state;
         const queryBuilder = (0, shell_1.getRepository)('kpi_values')
             .createQueryBuilder('kv')
@@ -89,12 +98,7 @@ let KpiStatQuery = class KpiStatQuery {
         if (endYearMonth && endYearMonth.trim() !== '') {
             queryBuilder.andWhere(`LEFT(kv.value_date, 7) <= :endYearMonth`, { endYearMonth });
         }
-        if (sectorType === null || sectorType === void 0 ? void 0 : sectorType.trim()) {
-            queryBuilder.andWhere('p.sector_type = :sectorType', { sectorType });
-        }
-        if (buildingUsage === null || buildingUsage === void 0 ? void 0 : buildingUsage.trim()) {
-            queryBuilder.andWhere('p.building_usage = :buildingUsage', { buildingUsage });
-        }
+        applyProjectAxisFilters(queryBuilder, 'p', { sectorType, buildingUsage, projectScale, facilityType });
         queryBuilder.groupBy('k.name').orderBy('k.name', 'ASC');
         const results = await queryBuilder.getRawMany();
         return results.map(result => {
@@ -118,7 +122,7 @@ let KpiStatQuery = class KpiStatQuery {
             };
         });
     }
-    async kpiZValueComprehensiveStatsByGeoGroup(geoGroup, kpiName, startYearMonth, endYearMonth, sectorType, buildingUsage, context) {
+    async kpiZValueComprehensiveStatsByGeoGroup(geoGroup, kpiName, startYearMonth, endYearMonth, sectorType, buildingUsage, projectScale, facilityType, context) {
         var _a, _b;
         const { domain } = context.state;
         const queryBuilder = (0, shell_1.getRepository)('kpi_values')
@@ -163,12 +167,7 @@ let KpiStatQuery = class KpiStatQuery {
         if (endYearMonth && endYearMonth.trim() !== '') {
             queryBuilder.andWhere(`LEFT(kv.value_date, 7) <= :endYearMonth`, { endYearMonth });
         }
-        if (sectorType === null || sectorType === void 0 ? void 0 : sectorType.trim()) {
-            queryBuilder.andWhere('p.sector_type = :sectorType', { sectorType });
-        }
-        if (buildingUsage === null || buildingUsage === void 0 ? void 0 : buildingUsage.trim()) {
-            queryBuilder.andWhere('p.building_usage = :buildingUsage', { buildingUsage });
-        }
+        applyProjectAxisFilters(queryBuilder, 'p', { sectorType, buildingUsage, projectScale, facilityType });
         // KPI 필터: kpiName이 지정되면 해당 Y-level KPI만, 없으면 Z-level KPI 전체
         if (kpiName && kpiName.trim() !== '') {
             // kpiName 표기 불일치('일정성과(Y1)' vs 'Y1. 일정...') 방지 — Y1~Y6 코드로 LIKE 매칭
@@ -256,7 +255,7 @@ let KpiStatQuery = class KpiStatQuery {
         })
             .filter(result => result.geoGroup !== null);
     }
-    async kpiZValueMonthlyTrendByGeoGroup(kpiName, startYearMonth, endYearMonth, sectorType, buildingUsage, context) {
+    async kpiZValueMonthlyTrendByGeoGroup(kpiName, startYearMonth, endYearMonth, sectorType, buildingUsage, projectScale, facilityType, context) {
         var _a, _b;
         const { domain } = context.state;
         const queryBuilder = (0, shell_1.getRepository)('kpi_values')
@@ -298,12 +297,7 @@ let KpiStatQuery = class KpiStatQuery {
         if (endYearMonth && endYearMonth.trim() !== '') {
             queryBuilder.andWhere(`LEFT(kv.value_date, 7) <= :endYearMonth`, { endYearMonth });
         }
-        if (sectorType === null || sectorType === void 0 ? void 0 : sectorType.trim()) {
-            queryBuilder.andWhere('p.sector_type = :sectorType', { sectorType });
-        }
-        if (buildingUsage === null || buildingUsage === void 0 ? void 0 : buildingUsage.trim()) {
-            queryBuilder.andWhere('p.building_usage = :buildingUsage', { buildingUsage });
-        }
+        applyProjectAxisFilters(queryBuilder, 'p', { sectorType, buildingUsage, projectScale, facilityType });
         // KPI 필터: kpiName이 지정되면 해당 Y-level KPI만, 없으면 Z-level KPI 전체
         if (kpiName && kpiName.trim() !== '') {
             // kpiName 표기 불일치('일정성과(Y1)' vs 'Y1. 일정...') 방지 — Y1~Y6 코드로 LIKE 매칭
@@ -327,7 +321,7 @@ let KpiStatQuery = class KpiStatQuery {
         })
             .filter(result => result.geoGroup !== null);
     }
-    async kpiZValueMonthlyTrendBySigungu(geoGroup, kpiName, startYearMonth, endYearMonth, sectorType, buildingUsage, context) {
+    async kpiZValueMonthlyTrendBySigungu(geoGroup, kpiName, startYearMonth, endYearMonth, sectorType, buildingUsage, projectScale, facilityType, context) {
         var _a, _b;
         const { domain } = context.state;
         const queryBuilder = (0, shell_1.getRepository)('kpi_values')
@@ -350,12 +344,7 @@ let KpiStatQuery = class KpiStatQuery {
         if (endYearMonth && endYearMonth.trim() !== '') {
             queryBuilder.andWhere(`LEFT(kv.value_date, 7) <= :endYearMonth`, { endYearMonth });
         }
-        if (sectorType === null || sectorType === void 0 ? void 0 : sectorType.trim()) {
-            queryBuilder.andWhere('p.sector_type = :sectorType', { sectorType });
-        }
-        if (buildingUsage === null || buildingUsage === void 0 ? void 0 : buildingUsage.trim()) {
-            queryBuilder.andWhere('p.building_usage = :buildingUsage', { buildingUsage });
-        }
+        applyProjectAxisFilters(queryBuilder, 'p', { sectorType, buildingUsage, projectScale, facilityType });
         if (kpiName && kpiName.trim() !== '') {
             // kpiName 표기 불일치('일정성과(Y1)' vs 'Y1. 일정...') 방지 — Y1~Y6 코드로 LIKE 매칭
             queryBuilder.andWhere('k.name LIKE :kpiNameLike', { kpiNameLike: `%${(_b = (_a = kpiName.match(/Y[1-6]/)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : kpiName}%` });
@@ -376,7 +365,7 @@ let KpiStatQuery = class KpiStatQuery {
             };
         });
     }
-    async kpiProjectStats(sectorType, buildingUsage, kpiNamePattern, startYearMonth, endYearMonth, context) {
+    async kpiProjectStats(sectorType, buildingUsage, projectScale, facilityType, kpiNamePattern, startYearMonth, endYearMonth, context) {
         const { domain } = context.state;
         const qb = (0, shell_1.getRepository)('kpi_values')
             .createQueryBuilder('kv')
@@ -397,12 +386,7 @@ let KpiStatQuery = class KpiStatQuery {
             .innerJoin('projects', 'p', 'kv."group" = p.id::text')
             .where('p.end_date IS NOT NULL')
             .andWhere('kv.domain_id IN (:...domainIds)', { domainIds: await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain) });
-        if (sectorType === null || sectorType === void 0 ? void 0 : sectorType.trim()) {
-            qb.andWhere('p.sector_type = :sectorType', { sectorType });
-        }
-        if (buildingUsage === null || buildingUsage === void 0 ? void 0 : buildingUsage.trim()) {
-            qb.andWhere('p.building_usage = :buildingUsage', { buildingUsage });
-        }
+        applyProjectAxisFilters(qb, 'p', { sectorType, buildingUsage, projectScale, facilityType });
         if (kpiNamePattern === null || kpiNamePattern === void 0 ? void 0 : kpiNamePattern.trim()) {
             qb.andWhere('k.name LIKE :kpiNamePattern', { kpiNamePattern: `${kpiNamePattern}%` });
         }
@@ -428,7 +412,7 @@ let KpiStatQuery = class KpiStatQuery {
             projectCount: isNaN(Number(r.projectcount)) ? 0 : Number(r.projectcount)
         }));
     }
-    async kpiZValueStatsBySigungu(kpiName, startYearMonth, endYearMonth, sectorType, buildingUsage, context) {
+    async kpiZValueStatsBySigungu(kpiName, startYearMonth, endYearMonth, sectorType, buildingUsage, projectScale, facilityType, context) {
         var _a, _b;
         const { domain } = context.state;
         const queryBuilder = (0, shell_1.getRepository)('kpi_values')
@@ -454,12 +438,7 @@ let KpiStatQuery = class KpiStatQuery {
         if (endYearMonth === null || endYearMonth === void 0 ? void 0 : endYearMonth.trim()) {
             queryBuilder.andWhere(`LEFT(kv.value_date, 7) <= :endYearMonth`, { endYearMonth });
         }
-        if (sectorType === null || sectorType === void 0 ? void 0 : sectorType.trim()) {
-            queryBuilder.andWhere('p.sector_type = :sectorType', { sectorType });
-        }
-        if (buildingUsage === null || buildingUsage === void 0 ? void 0 : buildingUsage.trim()) {
-            queryBuilder.andWhere('p.building_usage = :buildingUsage', { buildingUsage });
-        }
+        applyProjectAxisFilters(queryBuilder, 'p', { sectorType, buildingUsage, projectScale, facilityType });
         if (kpiName === null || kpiName === void 0 ? void 0 : kpiName.trim()) {
             // kpiName 표기 불일치('일정성과(Y1)' vs 'Y1. 일정...') 방지 — Y1~Y6 코드로 LIKE 매칭
             queryBuilder.andWhere('k.name LIKE :kpiNameLike', { kpiNameLike: `%${(_b = (_a = kpiName.match(/Y[1-6]/)) === null || _a === void 0 ? void 0 : _a[0]) !== null && _b !== void 0 ? _b : kpiName}%` });
@@ -484,7 +463,7 @@ let KpiStatQuery = class KpiStatQuery {
         }))
             .filter(r => r.geoGroup !== null);
     }
-    async kpiYValueStatsByGeoGroup(geoGroup, startYearMonth, endYearMonth, sectorType, buildingUsage, context) {
+    async kpiYValueStatsByGeoGroup(geoGroup, startYearMonth, endYearMonth, sectorType, buildingUsage, projectScale, facilityType, context) {
         const { domain } = context.state;
         const queryBuilder = (0, shell_1.getRepository)('kpi_values')
             .createQueryBuilder('kv')
@@ -510,12 +489,7 @@ let KpiStatQuery = class KpiStatQuery {
         if (endYearMonth === null || endYearMonth === void 0 ? void 0 : endYearMonth.trim()) {
             queryBuilder.andWhere(`LEFT(kv.value_date, 7) <= :endYearMonth`, { endYearMonth });
         }
-        if (sectorType === null || sectorType === void 0 ? void 0 : sectorType.trim()) {
-            queryBuilder.andWhere('p.sector_type = :sectorType', { sectorType });
-        }
-        if (buildingUsage === null || buildingUsage === void 0 ? void 0 : buildingUsage.trim()) {
-            queryBuilder.andWhere('p.building_usage = :buildingUsage', { buildingUsage });
-        }
+        applyProjectAxisFilters(queryBuilder, 'p', { sectorType, buildingUsage, projectScale, facilityType });
         queryBuilder.groupBy('k.name').orderBy('k.name', 'ASC');
         const results = await queryBuilder.getRawMany();
         const clamp = (v) => Math.min(Math.max(isNaN(v) ? 0 : v, 0), 1);
@@ -530,7 +504,7 @@ let KpiStatQuery = class KpiStatQuery {
             projectCount: isNaN(Number(r.projectcount)) ? 0 : Number(r.projectcount)
         }));
     }
-    async kpiYValueStatsByMetroArea(metroArea, startYearMonth, endYearMonth, sectorType, buildingUsage, context) {
+    async kpiYValueStatsByMetroArea(metroArea, startYearMonth, endYearMonth, sectorType, buildingUsage, projectScale, facilityType, context) {
         if (!context || !context.state) {
             console.error('Context is undefined or missing state');
             return [];
@@ -561,12 +535,7 @@ let KpiStatQuery = class KpiStatQuery {
         if (endYearMonth && endYearMonth.trim() !== '') {
             queryBuilder.andWhere(`LEFT(kv.value_date, 7) <= :endYearMonth`, { endYearMonth });
         }
-        if (sectorType === null || sectorType === void 0 ? void 0 : sectorType.trim()) {
-            queryBuilder.andWhere('p.sector_type = :sectorType', { sectorType });
-        }
-        if (buildingUsage === null || buildingUsage === void 0 ? void 0 : buildingUsage.trim()) {
-            queryBuilder.andWhere('p.building_usage = :buildingUsage', { buildingUsage });
-        }
+        applyProjectAxisFilters(queryBuilder, 'p', { sectorType, buildingUsage, projectScale, facilityType });
         queryBuilder
             .andWhere(`CASE
           WHEN p.geo_group IN ('01','02','03','04','05','06','07','08') THEN '서울특별시'
@@ -620,9 +589,11 @@ tslib_1.__decorate([
     tslib_1.__param(1, (0, type_graphql_1.Arg)('endYearMonth', { nullable: true })),
     tslib_1.__param(2, (0, type_graphql_1.Arg)('sectorType', { nullable: true })),
     tslib_1.__param(3, (0, type_graphql_1.Arg)('buildingUsage', { nullable: true })),
-    tslib_1.__param(4, (0, type_graphql_1.Ctx)()),
+    tslib_1.__param(4, (0, type_graphql_1.Arg)('projectScale', { nullable: true })),
+    tslib_1.__param(5, (0, type_graphql_1.Arg)('facilityType', { nullable: true })),
+    tslib_1.__param(6, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, String, String, String, Object]),
+    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], KpiStatQuery.prototype, "totalKpiZValueComprehensiveStats", null);
 tslib_1.__decorate([
@@ -632,9 +603,11 @@ tslib_1.__decorate([
     tslib_1.__param(1, (0, type_graphql_1.Arg)('endYearMonth', { nullable: true })),
     tslib_1.__param(2, (0, type_graphql_1.Arg)('sectorType', { nullable: true })),
     tslib_1.__param(3, (0, type_graphql_1.Arg)('buildingUsage', { nullable: true })),
-    tslib_1.__param(4, (0, type_graphql_1.Ctx)()),
+    tslib_1.__param(4, (0, type_graphql_1.Arg)('projectScale', { nullable: true })),
+    tslib_1.__param(5, (0, type_graphql_1.Arg)('facilityType', { nullable: true })),
+    tslib_1.__param(6, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, String, String, String, Object]),
+    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], KpiStatQuery.prototype, "totalKpiYValueComprehensiveStats", null);
 tslib_1.__decorate([
@@ -648,9 +621,11 @@ tslib_1.__decorate([
     tslib_1.__param(3, (0, type_graphql_1.Arg)('endYearMonth', { nullable: true })),
     tslib_1.__param(4, (0, type_graphql_1.Arg)('sectorType', { nullable: true })),
     tslib_1.__param(5, (0, type_graphql_1.Arg)('buildingUsage', { nullable: true })),
-    tslib_1.__param(6, (0, type_graphql_1.Ctx)()),
+    tslib_1.__param(6, (0, type_graphql_1.Arg)('projectScale', { nullable: true })),
+    tslib_1.__param(7, (0, type_graphql_1.Arg)('facilityType', { nullable: true })),
+    tslib_1.__param(8, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, String, Object]),
+    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, String, String, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], KpiStatQuery.prototype, "kpiZValueComprehensiveStatsByGeoGroup", null);
 tslib_1.__decorate([
@@ -670,9 +645,11 @@ tslib_1.__decorate([
     tslib_1.__param(2, (0, type_graphql_1.Arg)('endYearMonth', { nullable: true })),
     tslib_1.__param(3, (0, type_graphql_1.Arg)('sectorType', { nullable: true })),
     tslib_1.__param(4, (0, type_graphql_1.Arg)('buildingUsage', { nullable: true })),
-    tslib_1.__param(5, (0, type_graphql_1.Ctx)()),
+    tslib_1.__param(5, (0, type_graphql_1.Arg)('projectScale', { nullable: true })),
+    tslib_1.__param(6, (0, type_graphql_1.Arg)('facilityType', { nullable: true })),
+    tslib_1.__param(7, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, Object]),
+    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, String, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], KpiStatQuery.prototype, "kpiZValueMonthlyTrendByGeoGroup", null);
 tslib_1.__decorate([
@@ -686,9 +663,11 @@ tslib_1.__decorate([
     tslib_1.__param(3, (0, type_graphql_1.Arg)('endYearMonth', { nullable: true })),
     tslib_1.__param(4, (0, type_graphql_1.Arg)('sectorType', { nullable: true })),
     tslib_1.__param(5, (0, type_graphql_1.Arg)('buildingUsage', { nullable: true })),
-    tslib_1.__param(6, (0, type_graphql_1.Ctx)()),
+    tslib_1.__param(6, (0, type_graphql_1.Arg)('projectScale', { nullable: true })),
+    tslib_1.__param(7, (0, type_graphql_1.Arg)('facilityType', { nullable: true })),
+    tslib_1.__param(8, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, String, Object]),
+    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, String, String, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], KpiStatQuery.prototype, "kpiZValueMonthlyTrendBySigungu", null);
 tslib_1.__decorate([
@@ -696,12 +675,14 @@ tslib_1.__decorate([
     (0, type_graphql_1.Query)(() => [kpi_stat_types_1.KpiProjectStat], { description: 'Get KPI stats aggregated from project data with optional sectorType/buildingUsage filters' }),
     tslib_1.__param(0, (0, type_graphql_1.Arg)('sectorType', { nullable: true })),
     tslib_1.__param(1, (0, type_graphql_1.Arg)('buildingUsage', { nullable: true })),
-    tslib_1.__param(2, (0, type_graphql_1.Arg)('kpiNamePattern', { nullable: true })),
-    tslib_1.__param(3, (0, type_graphql_1.Arg)('startYearMonth', { nullable: true })),
-    tslib_1.__param(4, (0, type_graphql_1.Arg)('endYearMonth', { nullable: true })),
-    tslib_1.__param(5, (0, type_graphql_1.Ctx)()),
+    tslib_1.__param(2, (0, type_graphql_1.Arg)('projectScale', { nullable: true })),
+    tslib_1.__param(3, (0, type_graphql_1.Arg)('facilityType', { nullable: true })),
+    tslib_1.__param(4, (0, type_graphql_1.Arg)('kpiNamePattern', { nullable: true })),
+    tslib_1.__param(5, (0, type_graphql_1.Arg)('startYearMonth', { nullable: true })),
+    tslib_1.__param(6, (0, type_graphql_1.Arg)('endYearMonth', { nullable: true })),
+    tslib_1.__param(7, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, Object]),
+    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, String, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], KpiStatQuery.prototype, "kpiProjectStats", null);
 tslib_1.__decorate([
@@ -714,9 +695,11 @@ tslib_1.__decorate([
     tslib_1.__param(2, (0, type_graphql_1.Arg)('endYearMonth', { nullable: true })),
     tslib_1.__param(3, (0, type_graphql_1.Arg)('sectorType', { nullable: true })),
     tslib_1.__param(4, (0, type_graphql_1.Arg)('buildingUsage', { nullable: true })),
-    tslib_1.__param(5, (0, type_graphql_1.Ctx)()),
+    tslib_1.__param(5, (0, type_graphql_1.Arg)('projectScale', { nullable: true })),
+    tslib_1.__param(6, (0, type_graphql_1.Arg)('facilityType', { nullable: true })),
+    tslib_1.__param(7, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, Object]),
+    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, String, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], KpiStatQuery.prototype, "kpiZValueStatsBySigungu", null);
 tslib_1.__decorate([
@@ -727,9 +710,11 @@ tslib_1.__decorate([
     tslib_1.__param(2, (0, type_graphql_1.Arg)('endYearMonth', { nullable: true })),
     tslib_1.__param(3, (0, type_graphql_1.Arg)('sectorType', { nullable: true })),
     tslib_1.__param(4, (0, type_graphql_1.Arg)('buildingUsage', { nullable: true })),
-    tslib_1.__param(5, (0, type_graphql_1.Ctx)()),
+    tslib_1.__param(5, (0, type_graphql_1.Arg)('projectScale', { nullable: true })),
+    tslib_1.__param(6, (0, type_graphql_1.Arg)('facilityType', { nullable: true })),
+    tslib_1.__param(7, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, Object]),
+    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, String, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], KpiStatQuery.prototype, "kpiYValueStatsByGeoGroup", null);
 tslib_1.__decorate([
@@ -740,9 +725,11 @@ tslib_1.__decorate([
     tslib_1.__param(2, (0, type_graphql_1.Arg)('endYearMonth', { nullable: true })),
     tslib_1.__param(3, (0, type_graphql_1.Arg)('sectorType', { nullable: true })),
     tslib_1.__param(4, (0, type_graphql_1.Arg)('buildingUsage', { nullable: true })),
-    tslib_1.__param(5, (0, type_graphql_1.Ctx)()),
+    tslib_1.__param(5, (0, type_graphql_1.Arg)('projectScale', { nullable: true })),
+    tslib_1.__param(6, (0, type_graphql_1.Arg)('facilityType', { nullable: true })),
+    tslib_1.__param(7, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, Object]),
+    tslib_1.__metadata("design:paramtypes", [String, String, String, String, String, String, String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], KpiStatQuery.prototype, "kpiYValueStatsByMetroArea", null);
 exports.KpiStatQuery = KpiStatQuery = tslib_1.__decorate([