@things-factory/dataset 10.0.0-beta.9 → 10.0.0-beta.91

package/dist-server/controllers/issue-ooc-review.js

@@ -6,20 +6,22 @@ const auth_base_1 = require("@things-factory/auth-base");
 const worklist_1 = require("@things-factory/worklist");
 const issue_1 = require("@things-factory/worklist/dist-server/controllers/activity-instance/issue");
 const data_ooc_js_1 = require("../service/data-ooc/data-ooc.js");
+const domain_inheritance_js_1 = require("../utils/domain-inheritance.js");
 async function issueOocReview(dataOoc, dataSet, context) {
     const { domain, tx } = context.state;
     const { collectedAt } = dataOoc;
+    const domainIds = await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain);
     var activities = await tx.getRepository(worklist_1.Activity).find({
         where: {
-            domain: domain.parentId ? (0, typeorm_1.In)([domain.id, domain.parentId]) : { id: domain.id },
+            domain: { id: (0, typeorm_1.In)(domainIds) },
             name: 'OOC Review'
         }
     });
-    var activity = activities.find(a => a.domainId === domain.id) || activities.find(a => a.domainId === domain.parentId);
+    var activity = [...activities].sort((a, b) => domainIds.indexOf(a.domainId) - domainIds.indexOf(b.domainId))[0];
     if (activity) {
         const assigneeRole = dataSet.supervisoryRoleId &&
             (await tx.getRepository(auth_base_1.Role).findOneBy({
-                domain: { id: (0, typeorm_1.In)([domain.id, domain.parentId].filter(Boolean)) },
+                domain: { id: (0, typeorm_1.In)(domainIds) },
                 id: dataSet.supervisoryRoleId
             }));
         if (assigneeRole) {

package/dist-server/controllers/issue-ooc-review.js.map

@@ -1 +1 @@
-{"version":3,"file":"issue-ooc-review.js","sourceRoot":"","sources":["../../server/controllers/issue-ooc-review.ts"],"names":[],"mappings":";;AASA,wCA8CC;AAvDD,qCAA4B;AAE5B,yDAAgD;AAChD,uDAAmD;AACnD,oGAAgG;AAGhG,iEAAyD;AAElD,KAAK,UAAU,cAAc,CAAC,OAAgB,EAAE,OAAgB,EAAE,OAAwB;IAC/F,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IACpC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;IAE/B,IAAI,UAAU,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,IAAI,CAAC;QACrD,KAAK,EAAE;YACL,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,YAAE,EAAC,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE;YAC9E,IAAI,EAAE,YAAY;SACnB;KACF,CAAC,CAAA;IAEF,IAAI,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC,EAAE,CAAC,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,CAAC,CAAA;IAErH,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,YAAY,GAChB,OAAO,CAAC,iBAAiB;YACzB,CAAC,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,SAAS,CAAC;gBACtC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE;gBAChE,EAAE,EAAE,OAAO,CAAC,iBAAiB;aAC9B,CAAC,CAAC,CAAA;QAEL,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,gBAAgB,GAAG;gBACvB,IAAI,EAAE,YAAY,OAAO,CAAC,IAAI,EAAE;gBAChC,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,UAAU,EAAE,QAAQ,CAAC,EAAE;gBACvB,KAAK,EAAE,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,YAAY,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC;gBACvF,KAAK,EAAE;oBACL,SAAS,EAAE,OAAO,CAAC,EAAE;iBACtB;gBACD,YAAY;gBACZ,UAAU,EAAE,CAAC;gBACb,UAAU,EAAE,CAAC;gBACb,YAAY,EAAE,EAAE;aACjB,CAAA;YAED,MAAM,sBAAsB,GAAG,MAAM,IAAA,aAAK,EAAC,gBAAuB,EAAE,OAAO,CAAC,CAAA;YAC5E,MAAM,EAAE,CAAC,aAAa,CAAC,qBAAO,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,sBAAsB,EAAE,CAAC,CAAA;QACxF,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CACX,sDAAsD,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,EAAE,wBAAwB,CACzG,CAAA;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAA;IACpD,CAAC;AACH,CAAC","sourcesContent":["import { In } from 'typeorm'\n\nimport { Role } from '@things-factory/auth-base'\nimport { Activity } from '@things-factory/worklist'\nimport { issue } from '@things-factory/worklist/dist-server/controllers/activity-instance/issue'\n\nimport { DataSet } from '../service/data-set/data-set.js'\nimport { DataOoc } from '../service/data-ooc/data-ooc.js'\n\nexport async function issueOocReview(dataOoc: DataOoc, dataSet: DataSet, context: ResolverContext): Promise<void> {\n  const { domain, tx } = context.state\n  const { collectedAt } = dataOoc\n\n  var activities = await tx.getRepository(Activity).find({\n    where: {\n      domain: domain.parentId ? In([domain.id, domain.parentId]) : { id: domain.id },\n      name: 'OOC Review'\n    }\n  })\n\n  var activity = activities.find(a => a.domainId === domain.id) || activities.find(a => a.domainId === domain.parentId)\n\n  if (activity) {\n    const assigneeRole =\n      dataSet.supervisoryRoleId &&\n      (await tx.getRepository(Role).findOneBy({\n        domain: { id: In([domain.id, domain.parentId].filter(Boolean)) },\n        id: dataSet.supervisoryRoleId\n      }))\n\n    if (assigneeRole) {\n      const activityInstance = {\n        name: `[OOC 검토] ${dataSet.name}`,\n        description: dataSet.description,\n        activityId: activity.id,\n        dueAt: new Date(collectedAt.getTime() + (activity.standardTime || 24 * 60 * 60) * 1000),\n        input: {\n          dataOocId: dataOoc.id\n        },\n        assigneeRole,\n        threadsMin: 1,\n        threadsMax: 1,\n        approvalLine: []\n      }\n\n      const reviewActivityInstance = await issue(activityInstance as any, context)\n      await tx.getRepository(DataOoc).update({ id: dataOoc.id }, { reviewActivityInstance })\n    } else {\n      console.error(\n        `Assignees are not set. So Data OOC Review task for ${dataOoc.name}(${dataOoc.id}) could not be issued.`\n      )\n    }\n  } else {\n    console.warn('OOC Review Activity not installed.')\n  }\n}\n"]}
+{"version":3,"file":"issue-ooc-review.js","sourceRoot":"","sources":["../../server/controllers/issue-ooc-review.ts"],"names":[],"mappings":";;AAUA,wCAiDC;AA3DD,qCAA4B;AAE5B,yDAAgD;AAChD,uDAAmD;AACnD,oGAAgG;AAGhG,iEAAyD;AACzD,0EAA0E;AAEnE,KAAK,UAAU,cAAc,CAAC,OAAgB,EAAE,OAAgB,EAAE,OAAwB;IAC/F,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IACpC,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAA;IAC/B,MAAM,SAAS,GAAG,MAAM,IAAA,iDAAyB,EAAC,MAAM,CAAC,CAAA;IAEzD,IAAI,UAAU,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,IAAI,CAAC;QACrD,KAAK,EAAE;YACL,MAAM,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,EAAE;YAC7B,IAAI,EAAE,YAAY;SACnB;KACF,CAAC,CAAA;IAEF,IAAI,QAAQ,GAAG,CAAC,GAAG,UAAU,CAAC,CAAC,IAAI,CACjC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CACxE,CAAC,CAAC,CAAC,CAAA;IAEJ,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,YAAY,GAChB,OAAO,CAAC,iBAAiB;YACzB,CAAC,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,SAAS,CAAC;gBACtC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,EAAE;gBAC7B,EAAE,EAAE,OAAO,CAAC,iBAAiB;aAC9B,CAAC,CAAC,CAAA;QAEL,IAAI,YAAY,EAAE,CAAC;YACjB,MAAM,gBAAgB,GAAG;gBACvB,IAAI,EAAE,YAAY,OAAO,CAAC,IAAI,EAAE;gBAChC,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,UAAU,EAAE,QAAQ,CAAC,EAAE;gBACvB,KAAK,EAAE,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,CAAC,YAAY,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAAC;gBACvF,KAAK,EAAE;oBACL,SAAS,EAAE,OAAO,CAAC,EAAE;iBACtB;gBACD,YAAY;gBACZ,UAAU,EAAE,CAAC;gBACb,UAAU,EAAE,CAAC;gBACb,YAAY,EAAE,EAAE;aACjB,CAAA;YAED,MAAM,sBAAsB,GAAG,MAAM,IAAA,aAAK,EAAC,gBAAuB,EAAE,OAAO,CAAC,CAAA;YAC5E,MAAM,EAAE,CAAC,aAAa,CAAC,qBAAO,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,EAAE,EAAE,sBAAsB,EAAE,CAAC,CAAA;QACxF,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,KAAK,CACX,sDAAsD,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,EAAE,wBAAwB,CACzG,CAAA;QACH,CAAC;IACH,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAA;IACpD,CAAC;AACH,CAAC","sourcesContent":["import { In } from 'typeorm'\n\nimport { Role } from '@things-factory/auth-base'\nimport { Activity } from '@things-factory/worklist'\nimport { issue } from '@things-factory/worklist/dist-server/controllers/activity-instance/issue'\n\nimport { DataSet } from '../service/data-set/data-set.js'\nimport { DataOoc } from '../service/data-ooc/data-ooc.js'\nimport { getDomainIdsWithAncestors } from '../utils/domain-inheritance.js'\n\nexport async function issueOocReview(dataOoc: DataOoc, dataSet: DataSet, context: ResolverContext): Promise<void> {\n  const { domain, tx } = context.state\n  const { collectedAt } = dataOoc\n  const domainIds = await getDomainIdsWithAncestors(domain)\n\n  var activities = await tx.getRepository(Activity).find({\n    where: {\n      domain: { id: In(domainIds) },\n      name: 'OOC Review'\n    }\n  })\n\n  var activity = [...activities].sort(\n    (a, b) => domainIds.indexOf(a.domainId) - domainIds.indexOf(b.domainId)\n  )[0]\n\n  if (activity) {\n    const assigneeRole =\n      dataSet.supervisoryRoleId &&\n      (await tx.getRepository(Role).findOneBy({\n        domain: { id: In(domainIds) },\n        id: dataSet.supervisoryRoleId\n      }))\n\n    if (assigneeRole) {\n      const activityInstance = {\n        name: `[OOC 검토] ${dataSet.name}`,\n        description: dataSet.description,\n        activityId: activity.id,\n        dueAt: new Date(collectedAt.getTime() + (activity.standardTime || 24 * 60 * 60) * 1000),\n        input: {\n          dataOocId: dataOoc.id\n        },\n        assigneeRole,\n        threadsMin: 1,\n        threadsMax: 1,\n        approvalLine: []\n      }\n\n      const reviewActivityInstance = await issue(activityInstance as any, context)\n      await tx.getRepository(DataOoc).update({ id: dataOoc.id }, { reviewActivityInstance })\n    } else {\n      console.error(\n        `Assignees are not set. So Data OOC Review task for ${dataOoc.name}(${dataOoc.id}) could not be issued.`\n      )\n    }\n  } else {\n    console.warn('OOC Review Activity not installed.')\n  }\n}\n"]}

package/dist-server/controllers/query-data-summary-by-period.js

@@ -5,6 +5,7 @@ const typeorm_1 = require("typeorm");
 const shell_1 = require("@things-factory/shell");
 const data_set_js_1 = require("../service/data-set/data-set.js");
 const data_summary_js_1 = require("../service/data-summary/data-summary.js");
+const domain_inheritance_js_1 = require("../utils/domain-inheritance.js");
 const STAT_FUNCTION_MAP = {
     sum: 'sum',
     mean: 'mean',
@@ -19,8 +20,9 @@ const STAT_FUNCTION_MAP = {
 async function queryDataSummaryByPeriod(period, dataSetName, dataKeys, params, context) {
     const { domain, user, tx } = context.state;
     const { t } = context;
+    const domainIds = await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain);
     const dataSet = await (0, shell_1.getRepository)(data_set_js_1.DataSet).findOne({
-        where: { domain: { id: (0, typeorm_1.In)([domain.id, domain.parentId].filter(Boolean)) }, name: dataSetName },
+        where: { domain: { id: (0, typeorm_1.In)(domainIds) }, name: dataSetName },
         relations: ['dataKeySet']
     });
     if (!dataSet) {
@@ -129,7 +131,7 @@ async function queryDataSummaryByPeriod(period, dataSetName, dataKeys, params, c
             filters: params?.filters?.filter(({ name }) => name !== 'date' && name !== 'month') || [],
             sortings: []
         },
-        domain,
+        domain: undefined,
         alias: 'summary',
         searchables: searchables
     })
@@ -142,7 +144,7 @@ async function queryDataSummaryByPeriod(period, dataSetName, dataKeys, params, c
         .innerJoin('summary.dataSet', 'ds', 'ds.id = :dataSetName', {
         dataSetName: dataSet.id
     })
-        .andWhere('summary.domain = :domain', { domain: domain.id })
+        .andWhere('summary.domain IN (:...ancestorDomainIds)', { ancestorDomainIds: domainIds })
         .andWhere('summary.date >= :from', { from })
         .andWhere('summary.date < :to', { to })
         .addGroupBy('summary.dataSet')

package/dist-server/controllers/query-data-summary-by-period.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-data-summary-by-period.js","sourceRoot":"","sources":["../../server/controllers/query-data-summary-by-period.ts"],"names":[],"mappings":"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","sourcesContent":["import { In } from 'typeorm'\n\nimport {\n  getQueryBuilderFromListParams,\n  getRepository,\n  getTimesForPeriod,\n  ListParam,\n  Sorting\n} from '@things-factory/shell'\n\nimport { DataSet, DataSetSummaryPeriodType } from '../service/data-set/data-set.js'\nimport { DataSummary } from '../service/data-summary/data-summary.js'\n\nconst STAT_FUNCTION_MAP = {\n  sum: 'sum',\n  mean: 'mean',\n  stddev: 'standardDeviation',\n  variance: 'variance',\n  min: 'min',\n  max: 'max',\n  range: 'range',\n  median: 'median',\n  mode: 'mode'\n}\n\nexport async function queryDataSummaryByPeriod(\n  period: 'today' | 'this month' | '30 days' | 'this year' | '12 months' | 'date range' | 'month',\n  dataSetName: string,\n  dataKeys: string[] | null,\n  params: ListParam,\n  context: ResolverContext\n): Promise<DataSummary[]> {\n  const { domain, user, tx } = context.state\n  const { t } = context\n\n  const dataSet = await getRepository(DataSet).findOne({\n    where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, name: dataSetName },\n    relations: ['dataKeySet']\n  })\n\n  if (!dataSet) {\n    throw new Error(t('error.dataset not found', { dataSetName }))\n  }\n\n  // limitations\n  const summaryPeriodType = dataSet.summaryPeriod\n  if (\n    (summaryPeriodType == DataSetSummaryPeriodType.Day || summaryPeriodType == DataSetSummaryPeriodType.WorkDate) &&\n    period == 'today'\n  ) {\n    throw new Error(t('error.summary not supported', { dataSetName, period: t(`label.period-${period}`) }))\n  }\n\n  // dataKeys 가 설정되지 않았다면, dataSet의 dataKeySet을 그대로 적용한다는 의미임.\n  // dataKeys == [] 라면, dataKeySet을 적용하지 않는다는 의미임.\n  // dataKeys에는 dataKeySet의 dataKey 값을 따라야 한다.\n  const dataKeyItems = !dataSet.dataKeySet?.dataKeyItems\n    ? []\n    : dataKeys\n      ? dataKeys\n          .map(dataKey => {\n            return dataSet.dataKeySet.dataKeyItems.find(item => item.dataKey == dataKey)\n          })\n          .filter(Boolean)\n      : dataSet.dataKeySet.dataKeyItems\n\n  const searchables = dataKeyItems.map((item, index) => `key0${index + 1}`)\n  const dataItems = dataSet.dataItems.filter(item => item.agg)\n\n  const { date, month } = params.filters.reduce(\n    (acc, filter) => {\n      if (filter.name === 'date') acc.date = filter.value\n      if (filter.name === 'month') acc.month = filter.value\n      return acc\n    },\n    { date: null, month: null }\n  )\n\n  const { from, to } = await getTimesForPeriod(period, { date, month }, context)\n\n  const selectPeriod = queryBuilder => {\n    if (period == 'today') {\n      queryBuilder.addSelect('summary.date', 'date').addSelect('summary.period', 'period')\n    } else if (['this year', '12 months'].includes(period)) {\n      queryBuilder.addSelect('SUBSTRING(summary.date, 1, 7) AS month')\n    } else {\n      queryBuilder.addSelect('summary.date', 'date')\n    }\n\n    return queryBuilder\n  }\n  const selectKeys = dataKeyItems.map((item, index) => {\n    const aliasName = `key0${index + 1}`\n    const columnName = `summary.${aliasName}`\n\n    return `${columnName} as ${aliasName}`\n  }) as string[]\n  const selectData = dataItems.map((item, index) => {\n    const aliasName = `data0${index + 1}`\n    const columnName = `summary.${aliasName}`\n\n    switch (item.agg) {\n      case STAT_FUNCTION_MAP.sum:\n        return `SUM(${columnName}) as ${aliasName}`\n      case STAT_FUNCTION_MAP.mean:\n        // 일차 mean 된 값들을 다시 계산하므로, 무의미할 수 있다.\n        return `AVG(${columnName}) as ${aliasName}`\n      case STAT_FUNCTION_MAP.stddev:\n        // 일차 stddev 된 값들을 다시 계산하므로, 무의미할 수 있다.\n        return `STDDEV(${columnName}) as ${aliasName}`\n      case STAT_FUNCTION_MAP.variance:\n        // 일차 variance 된 값들을 다시 계산하므로, 무의미할 수 있다.\n        return `VARIANCE(${columnName}) as ${aliasName}`\n      case STAT_FUNCTION_MAP.min:\n        return `MIN(${columnName}) as ${aliasName}`\n      case STAT_FUNCTION_MAP.max:\n        return `MAX(${columnName}) as ${aliasName}`\n      case STAT_FUNCTION_MAP.range:\n        // 일차 range 값들을 다시 계산하므로, 무의미할 수 있다.\n        return `MAX(${columnName}) - MIN(${columnName}) as ${aliasName}`\n      case STAT_FUNCTION_MAP.mode:\n        // not guaranteed\n        return `MODE() WITHIN GROUP (ORDER BY ${columnName})`\n      default:\n        return `AVG(${columnName}) as ${aliasName}`\n    }\n  })\n\n  const groupByPeriod =\n    period == 'today'\n      ? 'summary.date, summary.period'\n      : ['this year', '12 months'].includes(period)\n        ? 'SUBSTRING(summary.date, 1, 7)'\n        : 'summary.date'\n  const groupByKeys = dataKeyItems\n    .map((item, index) => {\n      return `summary.key0${index + 1}`\n    })\n    .join(', ')\n\n  const desc = false\n  var orderByPeriod: Sorting[] =\n    period == 'today'\n      ? [\n          { name: 'date', desc },\n          { name: 'period', desc }\n        ]\n      : ['this year', '12 months'].includes(period)\n        ? [{ name: 'month', desc }]\n        : [{ name: 'date', desc }]\n\n  if (params?.sortings && params.sortings.length > 0) {\n    orderByPeriod = params.sortings\n  }\n\n  var queryBuilder = getQueryBuilderFromListParams({\n    repository: getRepository(DataSummary),\n    params: {\n      ...params,\n      filters: params?.filters?.filter(({ name }) => name !== 'date' && name !== 'month') || [],\n      sortings: []\n    },\n    domain,\n    alias: 'summary',\n    searchables: searchables\n  })\n    .select('summary.dataSet')\n    .addSelect(selectData)\n    .addSelect('SUM(summary.count)', 'count')\n    .addSelect('SUM(summary.countOoc)', 'countOoc')\n    .addSelect('SUM(summary.countOos)', 'countOos')\n\n  queryBuilder = selectPeriod(queryBuilder)\n    .innerJoin('summary.dataSet', 'ds', 'ds.id = :dataSetName', {\n      dataSetName: dataSet.id\n    })\n    .andWhere('summary.domain = :domain', { domain: domain.id })\n    .andWhere('summary.date >= :from', { from })\n    .andWhere('summary.date < :to', { to })\n    .addGroupBy('summary.dataSet')\n    .addGroupBy(groupByPeriod)\n\n  if (dataKeyItems.length > 0) {\n    queryBuilder.addSelect(selectKeys).addGroupBy(groupByKeys)\n  }\n\n  orderByPeriod.map(orderBy => {\n    const { name: sort, desc } = orderBy\n    queryBuilder.addOrderBy(sort, desc ? 'DESC' : 'ASC')\n  })\n\n  const items = await queryBuilder.getRawMany()\n\n  return items\n}\n"]}
+{"version":3,"file":"query-data-summary-by-period.js","sourceRoot":"","sources":["../../server/controllers/query-data-summary-by-period.ts"],"names":[],"mappings":";;AA0BA,4DA0KC;AApMD,qCAA4B;AAE5B,iDAM8B;AAE9B,iEAAmF;AACnF,6EAAqE;AACrE,0EAA0E;AAE1E,MAAM,iBAAiB,GAAG;IACxB,GAAG,EAAE,KAAK;IACV,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,mBAAmB;IAC3B,QAAQ,EAAE,UAAU;IACpB,GAAG,EAAE,KAAK;IACV,GAAG,EAAE,KAAK;IACV,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;IAChB,IAAI,EAAE,MAAM;CACb,CAAA;AAEM,KAAK,UAAU,wBAAwB,CAC5C,MAA+F,EAC/F,WAAmB,EACnB,QAAyB,EACzB,MAAiB,EACjB,OAAwB;IAExB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;IAC1C,MAAM,EAAE,CAAC,EAAE,GAAG,OAAO,CAAA;IACrB,MAAM,SAAS,GAAG,MAAM,IAAA,iDAAyB,EAAC,MAAM,CAAC,CAAA;IAEzD,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAa,EAAC,qBAAO,CAAC,CAAC,OAAO,CAAC;QACnD,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE;QAC3D,SAAS,EAAE,CAAC,YAAY,CAAC;KAC1B,CAAC,CAAA;IAEF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,yBAAyB,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,CAAA;IAChE,CAAC;IAED,cAAc;IACd,MAAM,iBAAiB,GAAG,OAAO,CAAC,aAAa,CAAA;IAC/C,IACE,CAAC,iBAAiB,IAAI,sCAAwB,CAAC,GAAG,IAAI,iBAAiB,IAAI,sCAAwB,CAAC,QAAQ,CAAC;QAC7G,MAAM,IAAI,OAAO,EACjB,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,6BAA6B,EAAE,EAAE,WAAW,EAAE,MAAM,EAAE,CAAC,CAAC,gBAAgB,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;IACzG,CAAC;IAED,4DAA4D;IAC5D,gDAAgD;IAChD,4CAA4C;IAC5C,MAAM,YAAY,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,YAAY;QACpD,CAAC,CAAC,EAAE;QACJ,CAAC,CAAC,QAAQ;YACR,CAAC,CAAC,QAAQ;iBACL,GAAG,CAAC,OAAO,CAAC,EAAE;gBACb,OAAO,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,CAAA;YAC9E,CAAC,CAAC;iBACD,MAAM,CAAC,OAAO,CAAC;YACpB,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAA;IAErC,MAAM,WAAW,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,OAAO,KAAK,GAAG,CAAC,EAAE,CAAC,CAAA;IACzE,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAE5D,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAC3C,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE;QACd,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM;YAAE,GAAG,CAAC,IAAI,GAAG,MAAM,CAAC,KAAK,CAAA;QACnD,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO;YAAE,GAAG,CAAC,KAAK,GAAG,MAAM,CAAC,KAAK,CAAA;QACrD,OAAO,GAAG,CAAA;IACZ,CAAC,EACD,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAC5B,CAAA;IAED,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAG,MAAM,IAAA,yBAAiB,EAAC,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,OAAO,CAAC,CAAA;IAE9E,MAAM,YAAY,GAAG,YAAY,CAAC,EAAE;QAClC,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;YACtB,YAAY,CAAC,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAA;QACtF,CAAC;aAAM,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACvD,YAAY,CAAC,SAAS,CAAC,wCAAwC,CAAC,CAAA;QAClE,CAAC;aAAM,CAAC;YACN,YAAY,CAAC,SAAS,CAAC,cAAc,EAAE,MAAM,CAAC,CAAA;QAChD,CAAC;QAED,OAAO,YAAY,CAAA;IACrB,CAAC,CAAA;IACD,MAAM,UAAU,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAClD,MAAM,SAAS,GAAG,OAAO,KAAK,GAAG,CAAC,EAAE,CAAA;QACpC,MAAM,UAAU,GAAG,WAAW,SAAS,EAAE,CAAA;QAEzC,OAAO,GAAG,UAAU,OAAO,SAAS,EAAE,CAAA;IACxC,CAAC,CAAa,CAAA;IACd,MAAM,UAAU,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAC/C,MAAM,SAAS,GAAG,QAAQ,KAAK,GAAG,CAAC,EAAE,CAAA;QACrC,MAAM,UAAU,GAAG,WAAW,SAAS,EAAE,CAAA;QAEzC,QAAQ,IAAI,CAAC,GAAG,EAAE,CAAC;YACjB,KAAK,iBAAiB,CAAC,GAAG;gBACxB,OAAO,OAAO,UAAU,QAAQ,SAAS,EAAE,CAAA;YAC7C,KAAK,iBAAiB,CAAC,IAAI;gBACzB,qCAAqC;gBACrC,OAAO,OAAO,UAAU,QAAQ,SAAS,EAAE,CAAA;YAC7C,KAAK,iBAAiB,CAAC,MAAM;gBAC3B,uCAAuC;gBACvC,OAAO,UAAU,UAAU,QAAQ,SAAS,EAAE,CAAA;YAChD,KAAK,iBAAiB,CAAC,QAAQ;gBAC7B,yCAAyC;gBACzC,OAAO,YAAY,UAAU,QAAQ,SAAS,EAAE,CAAA;YAClD,KAAK,iBAAiB,CAAC,GAAG;gBACxB,OAAO,OAAO,UAAU,QAAQ,SAAS,EAAE,CAAA;YAC7C,KAAK,iBAAiB,CAAC,GAAG;gBACxB,OAAO,OAAO,UAAU,QAAQ,SAAS,EAAE,CAAA;YAC7C,KAAK,iBAAiB,CAAC,KAAK;gBAC1B,oCAAoC;gBACpC,OAAO,OAAO,UAAU,WAAW,UAAU,QAAQ,SAAS,EAAE,CAAA;YAClE,KAAK,iBAAiB,CAAC,IAAI;gBACzB,iBAAiB;gBACjB,OAAO,iCAAiC,UAAU,GAAG,CAAA;YACvD;gBACE,OAAO,OAAO,UAAU,QAAQ,SAAS,EAAE,CAAA;QAC/C,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,MAAM,aAAa,GACjB,MAAM,IAAI,OAAO;QACf,CAAC,CAAC,8BAA8B;QAChC,CAAC,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC3C,CAAC,CAAC,+BAA+B;YACjC,CAAC,CAAC,cAAc,CAAA;IACtB,MAAM,WAAW,GAAG,YAAY;SAC7B,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QACnB,OAAO,eAAe,KAAK,GAAG,CAAC,EAAE,CAAA;IACnC,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAA;IAEb,MAAM,IAAI,GAAG,KAAK,CAAA;IAClB,IAAI,aAAa,GACf,MAAM,IAAI,OAAO;QACf,CAAC,CAAC;YACE,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;YACtB,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;SACzB;QACH,CAAC,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC3C,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YAC3B,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAA;IAEhC,IAAI,MAAM,EAAE,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACnD,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAA;IACjC,CAAC;IAED,IAAI,YAAY,GAAG,IAAA,qCAA6B,EAAC;QAC/C,UAAU,EAAE,IAAA,qBAAa,EAAC,6BAAW,CAAC;QACtC,MAAM,EAAE;YACN,GAAG,MAAM;YACT,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,MAAM,IAAI,IAAI,KAAK,OAAO,CAAC,IAAI,EAAE;YACzF,QAAQ,EAAE,EAAE;SACb;QACD,MAAM,EAAE,SAAS;QACjB,KAAK,EAAE,SAAS;QAChB,WAAW,EAAE,WAAW;KACzB,CAAC;SACC,MAAM,CAAC,iBAAiB,CAAC;SACzB,SAAS,CAAC,UAAU,CAAC;SACrB,SAAS,CAAC,oBAAoB,EAAE,OAAO,CAAC;SACxC,SAAS,CAAC,uBAAuB,EAAE,UAAU,CAAC;SAC9C,SAAS,CAAC,uBAAuB,EAAE,UAAU,CAAC,CAAA;IAEjD,YAAY,GAAG,YAAY,CAAC,YAAY,CAAC;SACtC,SAAS,CAAC,iBAAiB,EAAE,IAAI,EAAE,sBAAsB,EAAE;QAC1D,WAAW,EAAE,OAAO,CAAC,EAAE;KACxB,CAAC;SACD,QAAQ,CAAC,2CAA2C,EAAE,EAAE,iBAAiB,EAAE,SAAS,EAAE,CAAC;SACvF,QAAQ,CAAC,uBAAuB,EAAE,EAAE,IAAI,EAAE,CAAC;SAC3C,QAAQ,CAAC,oBAAoB,EAAE,EAAE,EAAE,EAAE,CAAC;SACtC,UAAU,CAAC,iBAAiB,CAAC;SAC7B,UAAU,CAAC,aAAa,CAAC,CAAA;IAE5B,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5B,YAAY,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,WAAW,CAAC,CAAA;IAC5D,CAAC;IAED,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE;QAC1B,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,CAAA;QACpC,YAAY,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IACtD,CAAC,CAAC,CAAA;IAEF,MAAM,KAAK,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,CAAA;IAE7C,OAAO,KAAK,CAAA;AACd,CAAC","sourcesContent":["import { In } from 'typeorm'\n\nimport {\n  getQueryBuilderFromListParams,\n  getRepository,\n  getTimesForPeriod,\n  ListParam,\n  Sorting\n} from '@things-factory/shell'\n\nimport { DataSet, DataSetSummaryPeriodType } from '../service/data-set/data-set.js'\nimport { DataSummary } from '../service/data-summary/data-summary.js'\nimport { getDomainIdsWithAncestors } from '../utils/domain-inheritance.js'\n\nconst STAT_FUNCTION_MAP = {\n  sum: 'sum',\n  mean: 'mean',\n  stddev: 'standardDeviation',\n  variance: 'variance',\n  min: 'min',\n  max: 'max',\n  range: 'range',\n  median: 'median',\n  mode: 'mode'\n}\n\nexport async function queryDataSummaryByPeriod(\n  period: 'today' | 'this month' | '30 days' | 'this year' | '12 months' | 'date range' | 'month',\n  dataSetName: string,\n  dataKeys: string[] | null,\n  params: ListParam,\n  context: ResolverContext\n): Promise<DataSummary[]> {\n  const { domain, user, tx } = context.state\n  const { t } = context\n  const domainIds = await getDomainIdsWithAncestors(domain)\n\n  const dataSet = await getRepository(DataSet).findOne({\n    where: { domain: { id: In(domainIds) }, name: dataSetName },\n    relations: ['dataKeySet']\n  })\n\n  if (!dataSet) {\n    throw new Error(t('error.dataset not found', { dataSetName }))\n  }\n\n  // limitations\n  const summaryPeriodType = dataSet.summaryPeriod\n  if (\n    (summaryPeriodType == DataSetSummaryPeriodType.Day || summaryPeriodType == DataSetSummaryPeriodType.WorkDate) &&\n    period == 'today'\n  ) {\n    throw new Error(t('error.summary not supported', { dataSetName, period: t(`label.period-${period}`) }))\n  }\n\n  // dataKeys 가 설정되지 않았다면, dataSet의 dataKeySet을 그대로 적용한다는 의미임.\n  // dataKeys == [] 라면, dataKeySet을 적용하지 않는다는 의미임.\n  // dataKeys에는 dataKeySet의 dataKey 값을 따라야 한다.\n  const dataKeyItems = !dataSet.dataKeySet?.dataKeyItems\n    ? []\n    : dataKeys\n      ? dataKeys\n          .map(dataKey => {\n            return dataSet.dataKeySet.dataKeyItems.find(item => item.dataKey == dataKey)\n          })\n          .filter(Boolean)\n      : dataSet.dataKeySet.dataKeyItems\n\n  const searchables = dataKeyItems.map((item, index) => `key0${index + 1}`)\n  const dataItems = dataSet.dataItems.filter(item => item.agg)\n\n  const { date, month } = params.filters.reduce(\n    (acc, filter) => {\n      if (filter.name === 'date') acc.date = filter.value\n      if (filter.name === 'month') acc.month = filter.value\n      return acc\n    },\n    { date: null, month: null }\n  )\n\n  const { from, to } = await getTimesForPeriod(period, { date, month }, context)\n\n  const selectPeriod = queryBuilder => {\n    if (period == 'today') {\n      queryBuilder.addSelect('summary.date', 'date').addSelect('summary.period', 'period')\n    } else if (['this year', '12 months'].includes(period)) {\n      queryBuilder.addSelect('SUBSTRING(summary.date, 1, 7) AS month')\n    } else {\n      queryBuilder.addSelect('summary.date', 'date')\n    }\n\n    return queryBuilder\n  }\n  const selectKeys = dataKeyItems.map((item, index) => {\n    const aliasName = `key0${index + 1}`\n    const columnName = `summary.${aliasName}`\n\n    return `${columnName} as ${aliasName}`\n  }) as string[]\n  const selectData = dataItems.map((item, index) => {\n    const aliasName = `data0${index + 1}`\n    const columnName = `summary.${aliasName}`\n\n    switch (item.agg) {\n      case STAT_FUNCTION_MAP.sum:\n        return `SUM(${columnName}) as ${aliasName}`\n      case STAT_FUNCTION_MAP.mean:\n        // 일차 mean 된 값들을 다시 계산하므로, 무의미할 수 있다.\n        return `AVG(${columnName}) as ${aliasName}`\n      case STAT_FUNCTION_MAP.stddev:\n        // 일차 stddev 된 값들을 다시 계산하므로, 무의미할 수 있다.\n        return `STDDEV(${columnName}) as ${aliasName}`\n      case STAT_FUNCTION_MAP.variance:\n        // 일차 variance 된 값들을 다시 계산하므로, 무의미할 수 있다.\n        return `VARIANCE(${columnName}) as ${aliasName}`\n      case STAT_FUNCTION_MAP.min:\n        return `MIN(${columnName}) as ${aliasName}`\n      case STAT_FUNCTION_MAP.max:\n        return `MAX(${columnName}) as ${aliasName}`\n      case STAT_FUNCTION_MAP.range:\n        // 일차 range 값들을 다시 계산하므로, 무의미할 수 있다.\n        return `MAX(${columnName}) - MIN(${columnName}) as ${aliasName}`\n      case STAT_FUNCTION_MAP.mode:\n        // not guaranteed\n        return `MODE() WITHIN GROUP (ORDER BY ${columnName})`\n      default:\n        return `AVG(${columnName}) as ${aliasName}`\n    }\n  })\n\n  const groupByPeriod =\n    period == 'today'\n      ? 'summary.date, summary.period'\n      : ['this year', '12 months'].includes(period)\n        ? 'SUBSTRING(summary.date, 1, 7)'\n        : 'summary.date'\n  const groupByKeys = dataKeyItems\n    .map((item, index) => {\n      return `summary.key0${index + 1}`\n    })\n    .join(', ')\n\n  const desc = false\n  var orderByPeriod: Sorting[] =\n    period == 'today'\n      ? [\n          { name: 'date', desc },\n          { name: 'period', desc }\n        ]\n      : ['this year', '12 months'].includes(period)\n        ? [{ name: 'month', desc }]\n        : [{ name: 'date', desc }]\n\n  if (params?.sortings && params.sortings.length > 0) {\n    orderByPeriod = params.sortings\n  }\n\n  var queryBuilder = getQueryBuilderFromListParams({\n    repository: getRepository(DataSummary),\n    params: {\n      ...params,\n      filters: params?.filters?.filter(({ name }) => name !== 'date' && name !== 'month') || [],\n      sortings: []\n    },\n    domain: undefined,\n    alias: 'summary',\n    searchables: searchables\n  })\n    .select('summary.dataSet')\n    .addSelect(selectData)\n    .addSelect('SUM(summary.count)', 'count')\n    .addSelect('SUM(summary.countOoc)', 'countOoc')\n    .addSelect('SUM(summary.countOos)', 'countOos')\n\n  queryBuilder = selectPeriod(queryBuilder)\n    .innerJoin('summary.dataSet', 'ds', 'ds.id = :dataSetName', {\n      dataSetName: dataSet.id\n    })\n    .andWhere('summary.domain IN (:...ancestorDomainIds)', { ancestorDomainIds: domainIds })\n    .andWhere('summary.date >= :from', { from })\n    .andWhere('summary.date < :to', { to })\n    .addGroupBy('summary.dataSet')\n    .addGroupBy(groupByPeriod)\n\n  if (dataKeyItems.length > 0) {\n    queryBuilder.addSelect(selectKeys).addGroupBy(groupByKeys)\n  }\n\n  orderByPeriod.map(orderBy => {\n    const { name: sort, desc } = orderBy\n    queryBuilder.addOrderBy(sort, desc ? 'DESC' : 'ASC')\n  })\n\n  const items = await queryBuilder.getRawMany()\n\n  return items\n}\n"]}

package/dist-server/routes.js

@@ -10,6 +10,7 @@ const shiny_report_js_1 = require("./controllers/shiny-report.js");
 const issue_data_collection_task_js_1 = require("./controllers/issue-data-collection-task.js");
 const data_sensor_js_1 = require("./service/data-sensor/data-sensor.js");
 const data_set_js_1 = require("./service/data-set/data-set.js");
+const domain_inheritance_js_1 = require("./utils/domain-inheritance.js");
 process.on('bootstrap-module-global-public-route', (app, globalPublicRouter) => {
     /*
      * can add global public routes to application (auth not required, tenancy not required)
@@ -115,9 +116,10 @@ process.on('bootstrap-module-global-public-route', (app, globalPublicRouter) =>
             if (!domain) {
                 throw new Error(`domain(${domainId}) not found`);
             }
+            const domainIds = await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain);
             const dataSet = await tx
                 .getRepository(data_set_js_1.DataSet)
-                .findOne({ where: { domain: { id: (0, typeorm_1.In)([domain.id, domain.parentId].filter(Boolean)) }, id: dataSetId } });
+                .findOne({ where: { domain: { id: (0, typeorm_1.In)(domainIds) }, id: dataSetId } });
             // do what you gotta do
         });
         context.status = 200;

package/dist-server/routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":"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","sourcesContent":["import { In } from 'typeorm'\n\nimport { Domain, getDataSource } from '@things-factory/shell'\nimport { User } from '@things-factory/auth-base'\nimport { runScenario } from '@things-factory/integration-base'\nimport { ScheduleRegisterRequest } from '@things-factory/scheduler-client'\n\nimport { createDataSample } from './controllers/create-data-sample.js'\nimport { renderJasperReport } from './controllers/jasper-report.js'\nimport { renderShinyReport } from './controllers/shiny-report.js'\nimport { issueDataCollectionTask } from './controllers/issue-data-collection-task.js'\nimport { DataSensor } from './service/data-sensor/data-sensor.js'\nimport { DataSet } from './service/data-set/data-set.js'\n\nprocess.on('bootstrap-module-global-public-route' as any, (app, globalPublicRouter) => {\n  /*\n   * can add global public routes to application (auth not required, tenancy not required)\n   *\n   * ex) routes.get('/path', async(context, next) => {})\n   * ex) routes.post('/path', async(context, next) => {})\n   */\n\n  globalPublicRouter.post('/sensor-data', async (context, next) => {\n    // 데이타 검증\n    const { deviceId, data, rawData, timestamp = Date.now() } = context.request.body\n    if (!deviceId) {\n      throw new Error(`The deviceId(${deviceId}) property are mandatory`)\n    }\n\n    // make new data-sample\n    await getDataSource().transaction(async tx => {\n      // find sensor through deviceId\n      const sensor = await tx.getRepository(DataSensor).findOne({\n        where: { deviceId },\n        relations: ['domain', 'appliance', 'dataSet', 'decoder']\n      })\n\n      if (!sensor) {\n        throw new Error(`Sensor having given deviceId(${deviceId}) not found`)\n      }\n\n      if (!sensor.active) {\n        throw new Error(`State of the sensor given deviceId(${deviceId}) is not active`)\n      }\n\n      if (!sensor.appliance) {\n        throw new Error(`Appliance of the sensor given deviceId(${deviceId}) is not set up`)\n      }\n\n      const domain = sensor.domain\n      const dataSet = sensor.dataSet\n\n      /* \n        원칙적으로 user 인증정보를 가지고 요청해야 하지만, 인증정보를 보낼 수 없는 상황이라고 전제하여 처리한다.\n        앞으로, 보완되어야 한다.\n      */\n      const user: User =\n        context.user ||\n        (await tx.getRepository(User).findOne({\n          where: {\n            reference: sensor.appliance.id,\n            userType: 'appliance'\n          }\n        }))\n\n      context.state = {\n        user,\n        ...context.state,\n        domain,\n        tx\n      }\n\n      var decoded\n      if (sensor.decoder) {\n        const { name: scenarioName } = sensor.decoder\n        const variables = {\n          dataSensor: sensor,\n          source: deviceId,\n          data,\n          rawData,\n          timestamp\n        }\n\n        decoded = (await runScenario(null, scenarioName, variables, context))?.result\n      }\n\n      if (dataSet) {\n        await createDataSample(\n          {\n            dataSet,\n            data,\n            rawData,\n            source: deviceId,\n            collectedAt: new Date(timestamp),\n            ...decoded\n          },\n          context\n        )\n      }\n\n      context.status = 200\n      context.body = {\n        data,\n        ...decoded\n      }\n    })\n  })\n\n  /* When a callback occurs from the scheduler when a scheduled dataset is on schedule, data collection task for the dataset should be issued. */\n  globalPublicRouter.post('/callback-schedule-for-dataset', async (context, next) => {\n    const { client } = context.request.body as ScheduleRegisterRequest\n\n    if (!client || typeof client !== 'object') {\n      throw new Error('client property should be a part of callback body.')\n    }\n\n    const { group: domainId, key: dataSetId } = client\n\n    if (!domainId || !dataSetId) {\n      throw new Error(`group(${domainId}) and key(${dataSetId}) properties should not be empty`)\n    }\n\n    await issueDataCollectionTask(domainId, dataSetId, context)\n\n    context.status = 200\n  })\n\n  /* When a callback occurs from the scheduler when a scheduled summary is on schedule, data summary procedure for the dataset should be executed. */\n  globalPublicRouter.post('/callback-schedule-for-data-summary', async (context, next) => {\n    const { client } = context.request.body as ScheduleRegisterRequest\n\n    if (!client || typeof client !== 'object') {\n      throw new Error('client property should be a part of callback body.')\n    }\n\n    const { group: domainId, key: dataSetId } = client\n\n    if (!domainId || !dataSetId) {\n      throw new Error(`group(${domainId}) and key(${dataSetId}) properties should not be empty`)\n    }\n\n    await getDataSource().transaction(async tx => {\n      const domain = await tx.getRepository(Domain).findOneBy({ id: domainId })\n\n      if (!domain) {\n        throw new Error(`domain(${domainId}) not found`)\n      }\n\n      const dataSet = await tx\n        .getRepository(DataSet)\n        .findOne({ where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id: dataSetId } })\n\n      // do what you gotta do\n    })\n\n    context.status = 200\n  })\n})\n\nprocess.on('bootstrap-module-global-private-route' as any, (app, globalPrivateRouter) => {\n  /*\n   * can add global private routes to application (auth required, tenancy not required)\n   */\n})\n\nprocess.on('bootstrap-module-domain-public-route' as any, (app, domainPublicRouter) => {\n  /*\n   * can add domain public routes to application (auth not required, tenancy required)\n   */\n})\n\nprocess.on('bootstrap-module-domain-private-route' as any, (app, domainPrivateRouter) => {\n  /*\n   * can add domain private routes to application (auth required, tenancy required)\n   */\n  domainPrivateRouter.get('/data-report/jasper', async (context, next) => {\n    context.body = await renderJasperReport(context)\n  })\n\n  domainPrivateRouter.get('/data-report/shiny', async (context, next) => {\n    await renderShinyReport(context)\n  })\n\n  domainPrivateRouter.get('/data-report/:reportType', async (context, next) => {\n    let { reportType } = context.params\n    context.body = `${reportType} Not Implemented.`\n  })\n})\n"]}
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":";;AAAA,qCAA4B;AAE5B,iDAA6D;AAC7D,yDAAgD;AAChD,uEAA8D;AAG9D,+EAAsE;AACtE,qEAAmE;AACnE,mEAAiE;AACjE,+FAAqF;AACrF,yEAAiE;AACjE,gEAAwD;AACxD,yEAAyE;AAEzE,OAAO,CAAC,EAAE,CAAC,sCAA6C,EAAE,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE;IACpF;;;;;OAKG;IAEH,kBAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC9D,SAAS;QACT,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAA;QAChF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,gBAAgB,QAAQ,0BAA0B,CAAC,CAAA;QACrE,CAAC;QAED,uBAAuB;QACvB,MAAM,IAAA,qBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC3C,+BAA+B;YAC/B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAU,CAAC,CAAC,OAAO,CAAC;gBACxD,KAAK,EAAE,EAAE,QAAQ,EAAE;gBACnB,SAAS,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,CAAC;aACzD,CAAC,CAAA;YAEF,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,gCAAgC,QAAQ,aAAa,CAAC,CAAA;YACxE,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,IAAI,KAAK,CAAC,sCAAsC,QAAQ,iBAAiB,CAAC,CAAA;YAClF,CAAC;YAED,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,0CAA0C,QAAQ,iBAAiB,CAAC,CAAA;YACtF,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;YAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;YAE9B;;;cAGE;YACF,MAAM,IAAI,GACR,OAAO,CAAC,IAAI;gBACZ,CAAC,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC;oBACpC,KAAK,EAAE;wBACL,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE;wBAC9B,QAAQ,EAAE,WAAW;qBACtB;iBACF,CAAC,CAAC,CAAA;YAEL,OAAO,CAAC,KAAK,GAAG;gBACd,IAAI;gBACJ,GAAG,OAAO,CAAC,KAAK;gBAChB,MAAM;gBACN,EAAE;aACH,CAAA;YAED,IAAI,OAAO,CAAA;YACX,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;gBACnB,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,CAAA;gBAC7C,MAAM,SAAS,GAAG;oBAChB,UAAU,EAAE,MAAM;oBAClB,MAAM,EAAE,QAAQ;oBAChB,IAAI;oBACJ,OAAO;oBACP,SAAS;iBACV,CAAA;gBAED,OAAO,GAAG,CAAC,MAAM,IAAA,8BAAW,EAAC,IAAI,EAAE,YAAY,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,EAAE,MAAM,CAAA;YAC/E,CAAC;YAED,IAAI,OAAO,EAAE,CAAC;gBACZ,MAAM,IAAA,wCAAgB,EACpB;oBACE,OAAO;oBACP,IAAI;oBACJ,OAAO;oBACP,MAAM,EAAE,QAAQ;oBAChB,WAAW,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC;oBAChC,GAAG,OAAO;iBACX,EACD,OAAO,CACR,CAAA;YACH,CAAC;YAED,OAAO,CAAC,MAAM,GAAG,GAAG,CAAA;YACpB,OAAO,CAAC,IAAI,GAAG;gBACb,IAAI;gBACJ,GAAG,OAAO;aACX,CAAA;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,+IAA+I;IAC/I,kBAAkB,CAAC,IAAI,CAAC,gCAAgC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAChF,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,IAA+B,CAAA;QAElE,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;QACvE,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;QAElD,IAAI,CAAC,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,SAAS,QAAQ,aAAa,SAAS,kCAAkC,CAAC,CAAA;QAC5F,CAAC;QAED,MAAM,IAAA,uDAAuB,EAAC,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAA;QAE3D,OAAO,CAAC,MAAM,GAAG,GAAG,CAAA;IACtB,CAAC,CAAC,CAAA;IAEF,mJAAmJ;IACnJ,kBAAkB,CAAC,IAAI,CAAC,qCAAqC,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QACrF,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,IAA+B,CAAA;QAElE,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC1C,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAA;QACvE,CAAC;QAED,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;QAElD,IAAI,CAAC,QAAQ,IAAI,CAAC,SAAS,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CAAC,SAAS,QAAQ,aAAa,SAAS,kCAAkC,CAAC,CAAA;QAC5F,CAAC;QAED,MAAM,IAAA,qBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC3C,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,cAAM,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAA;YAEzE,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,UAAU,QAAQ,aAAa,CAAC,CAAA;YAClD,CAAC;YAED,MAAM,SAAS,GAAG,MAAM,IAAA,iDAAyB,EAAC,MAAM,CAAC,CAAA;YACzD,MAAM,OAAO,GAAG,MAAM,EAAE;iBACrB,aAAa,CAAC,qBAAO,CAAC;iBACtB,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,IAAA,YAAE,EAAC,SAAS,CAAC,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,CAAC,CAAA;YAEvE,uBAAuB;QACzB,CAAC,CAAC,CAAA;QAEF,OAAO,CAAC,MAAM,GAAG,GAAG,CAAA;IACtB,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,uCAA8C,EAAE,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;IACtF;;OAEG;AACL,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,sCAA6C,EAAE,CAAC,GAAG,EAAE,kBAAkB,EAAE,EAAE;IACpF;;OAEG;AACL,CAAC,CAAC,CAAA;AAEF,OAAO,CAAC,EAAE,CAAC,uCAA8C,EAAE,CAAC,GAAG,EAAE,mBAAmB,EAAE,EAAE;IACtF;;OAEG;IACH,mBAAmB,CAAC,GAAG,CAAC,qBAAqB,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QACrE,OAAO,CAAC,IAAI,GAAG,MAAM,IAAA,qCAAkB,EAAC,OAAO,CAAC,CAAA;IAClD,CAAC,CAAC,CAAA;IAEF,mBAAmB,CAAC,GAAG,CAAC,oBAAoB,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QACpE,MAAM,IAAA,mCAAiB,EAAC,OAAO,CAAC,CAAA;IAClC,CAAC,CAAC,CAAA;IAEF,mBAAmB,CAAC,GAAG,CAAC,0BAA0B,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;QAC1E,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,MAAM,CAAA;QACnC,OAAO,CAAC,IAAI,GAAG,GAAG,UAAU,mBAAmB,CAAA;IACjD,CAAC,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA","sourcesContent":["import { In } from 'typeorm'\n\nimport { Domain, getDataSource } from '@things-factory/shell'\nimport { User } from '@things-factory/auth-base'\nimport { runScenario } from '@things-factory/integration-base'\nimport { ScheduleRegisterRequest } from '@things-factory/scheduler-client'\n\nimport { createDataSample } from './controllers/create-data-sample.js'\nimport { renderJasperReport } from './controllers/jasper-report.js'\nimport { renderShinyReport } from './controllers/shiny-report.js'\nimport { issueDataCollectionTask } from './controllers/issue-data-collection-task.js'\nimport { DataSensor } from './service/data-sensor/data-sensor.js'\nimport { DataSet } from './service/data-set/data-set.js'\nimport { getDomainIdsWithAncestors } from './utils/domain-inheritance.js'\n\nprocess.on('bootstrap-module-global-public-route' as any, (app, globalPublicRouter) => {\n  /*\n   * can add global public routes to application (auth not required, tenancy not required)\n   *\n   * ex) routes.get('/path', async(context, next) => {})\n   * ex) routes.post('/path', async(context, next) => {})\n   */\n\n  globalPublicRouter.post('/sensor-data', async (context, next) => {\n    // 데이타 검증\n    const { deviceId, data, rawData, timestamp = Date.now() } = context.request.body\n    if (!deviceId) {\n      throw new Error(`The deviceId(${deviceId}) property are mandatory`)\n    }\n\n    // make new data-sample\n    await getDataSource().transaction(async tx => {\n      // find sensor through deviceId\n      const sensor = await tx.getRepository(DataSensor).findOne({\n        where: { deviceId },\n        relations: ['domain', 'appliance', 'dataSet', 'decoder']\n      })\n\n      if (!sensor) {\n        throw new Error(`Sensor having given deviceId(${deviceId}) not found`)\n      }\n\n      if (!sensor.active) {\n        throw new Error(`State of the sensor given deviceId(${deviceId}) is not active`)\n      }\n\n      if (!sensor.appliance) {\n        throw new Error(`Appliance of the sensor given deviceId(${deviceId}) is not set up`)\n      }\n\n      const domain = sensor.domain\n      const dataSet = sensor.dataSet\n\n      /* \n        원칙적으로 user 인증정보를 가지고 요청해야 하지만, 인증정보를 보낼 수 없는 상황이라고 전제하여 처리한다.\n        앞으로, 보완되어야 한다.\n      */\n      const user: User =\n        context.user ||\n        (await tx.getRepository(User).findOne({\n          where: {\n            reference: sensor.appliance.id,\n            userType: 'appliance'\n          }\n        }))\n\n      context.state = {\n        user,\n        ...context.state,\n        domain,\n        tx\n      }\n\n      var decoded\n      if (sensor.decoder) {\n        const { name: scenarioName } = sensor.decoder\n        const variables = {\n          dataSensor: sensor,\n          source: deviceId,\n          data,\n          rawData,\n          timestamp\n        }\n\n        decoded = (await runScenario(null, scenarioName, variables, context))?.result\n      }\n\n      if (dataSet) {\n        await createDataSample(\n          {\n            dataSet,\n            data,\n            rawData,\n            source: deviceId,\n            collectedAt: new Date(timestamp),\n            ...decoded\n          },\n          context\n        )\n      }\n\n      context.status = 200\n      context.body = {\n        data,\n        ...decoded\n      }\n    })\n  })\n\n  /* When a callback occurs from the scheduler when a scheduled dataset is on schedule, data collection task for the dataset should be issued. */\n  globalPublicRouter.post('/callback-schedule-for-dataset', async (context, next) => {\n    const { client } = context.request.body as ScheduleRegisterRequest\n\n    if (!client || typeof client !== 'object') {\n      throw new Error('client property should be a part of callback body.')\n    }\n\n    const { group: domainId, key: dataSetId } = client\n\n    if (!domainId || !dataSetId) {\n      throw new Error(`group(${domainId}) and key(${dataSetId}) properties should not be empty`)\n    }\n\n    await issueDataCollectionTask(domainId, dataSetId, context)\n\n    context.status = 200\n  })\n\n  /* When a callback occurs from the scheduler when a scheduled summary is on schedule, data summary procedure for the dataset should be executed. */\n  globalPublicRouter.post('/callback-schedule-for-data-summary', async (context, next) => {\n    const { client } = context.request.body as ScheduleRegisterRequest\n\n    if (!client || typeof client !== 'object') {\n      throw new Error('client property should be a part of callback body.')\n    }\n\n    const { group: domainId, key: dataSetId } = client\n\n    if (!domainId || !dataSetId) {\n      throw new Error(`group(${domainId}) and key(${dataSetId}) properties should not be empty`)\n    }\n\n    await getDataSource().transaction(async tx => {\n      const domain = await tx.getRepository(Domain).findOneBy({ id: domainId })\n\n      if (!domain) {\n        throw new Error(`domain(${domainId}) not found`)\n      }\n\n      const domainIds = await getDomainIdsWithAncestors(domain)\n      const dataSet = await tx\n        .getRepository(DataSet)\n        .findOne({ where: { domain: { id: In(domainIds) }, id: dataSetId } })\n\n      // do what you gotta do\n    })\n\n    context.status = 200\n  })\n})\n\nprocess.on('bootstrap-module-global-private-route' as any, (app, globalPrivateRouter) => {\n  /*\n   * can add global private routes to application (auth required, tenancy not required)\n   */\n})\n\nprocess.on('bootstrap-module-domain-public-route' as any, (app, domainPublicRouter) => {\n  /*\n   * can add domain public routes to application (auth not required, tenancy required)\n   */\n})\n\nprocess.on('bootstrap-module-domain-private-route' as any, (app, domainPrivateRouter) => {\n  /*\n   * can add domain private routes to application (auth required, tenancy required)\n   */\n  domainPrivateRouter.get('/data-report/jasper', async (context, next) => {\n    context.body = await renderJasperReport(context)\n  })\n\n  domainPrivateRouter.get('/data-report/shiny', async (context, next) => {\n    await renderShinyReport(context)\n  })\n\n  domainPrivateRouter.get('/data-report/:reportType', async (context, next) => {\n    let { reportType } = context.params\n    context.body = `${reportType} Not Implemented.`\n  })\n})\n"]}

package/dist-server/service/data-archive/data-archive-query.js

@@ -3,27 +3,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataArchiveQuery = void 0;
 const tslib_1 = require("tslib");
 const type_graphql_1 = require("type-graphql");
+const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
 const shell_1 = require("@things-factory/shell");
 const data_archive_js_1 = require("./data-archive.js");
 const data_archive_type_js_1 = require("./data-archive-type.js");
+const domain_inheritance_js_1 = require("../../utils/domain-inheritance.js");
 var parser = require('cron-parser');
 let DataArchiveQuery = class DataArchiveQuery {
     async dataArchive(id, context) {
         const { domain } = context.state;
+        const domainIds = await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain);
         return await (0, shell_1.getRepository)(data_archive_js_1.DataArchive).findOne({
-            where: { domain: { id: domain.id }, id }
+            where: { domain: { id: (0, typeorm_1.In)(domainIds) }, id }
         });
     }
     async dataArchives(params, context) {
         const { domain } = context.state;
+        const domainIds = await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain);
         const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
             repository: (0, shell_1.getRepository)(data_archive_js_1.DataArchive),
             params,
-            domain,
+            domain: undefined,
             alias: 'dataArchive',
             searchables: []
         });
+        queryBuilder.andWhere('dataArchive.domain IN (:...ancestorDomainIds)', { ancestorDomainIds: domainIds });
         const [items, total] = await queryBuilder.getManyAndCount();
         return { items, total };
     }

package/dist-server/service/data-archive/data-archive-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-archive-query.js","sourceRoot":"","sources":["../../../server/service/data-archive/data-archive-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'\n\nimport { Role, User } from '@things-factory/auth-base'\nimport { Domain, getQueryBuilderFromListParams, ListParam, getRepository } from '@things-factory/shell'\n\nimport { DataArchive } from './data-archive.js'\nimport { DataArchiveList } from './data-archive-type.js'\n\nvar parser = require('cron-parser')\n\n@Resolver(DataArchive)\nexport class DataArchiveQuery {\n  @Directive('@privilege(category: \"data-archive\", privilege: \"query\", domainOwnerGranted: true)')\n  @Query(returns => DataArchive, {\n    description:\n      'Retrieves a single data archive by its unique identifier. This query fetches detailed information about a data archive request including its status, download URL, and associated dataset information for data export purposes.'\n  })\n  async dataArchive(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<DataArchive> {\n    const { domain } = context.state\n\n    return await getRepository(DataArchive).findOne({\n      where: { domain: { id: domain.id }, id }\n    })\n  }\n\n  @Directive('@privilege(category: \"data-archive\", privilege: \"query\", domainOwnerGranted: true)')\n  @Query(returns => DataArchiveList, {\n    description:\n      'Retrieves multiple data archives with pagination support. This query is used for listing and managing data export requests, allowing users to track the status of their data download requests and access completed archives.'\n  })\n  async dataArchives(\n    @Args(type => ListParam) params: ListParam,\n    @Ctx() context: ResolverContext\n  ): Promise<DataArchiveList> {\n    const { domain } = context.state\n\n    const queryBuilder = getQueryBuilderFromListParams({\n      repository: getRepository(DataArchive),\n      params,\n      domain,\n      alias: 'dataArchive',\n      searchables: []\n    })\n\n    const [items, total] = await queryBuilder.getManyAndCount()\n\n    return { items, total }\n  }\n\n  @FieldResolver(type => Domain, {\n    description:\n      'Retrieves the domain that this data archive belongs to. This field resolver provides access to the organizational context and settings associated with the archive request.'\n  })\n  async domain(@Root() dataArchive: DataArchive): Promise<Domain> {\n    return dataArchive.domainId && (await getRepository(Domain).findOneBy({ id: dataArchive.domainId }))\n  }\n\n  @FieldResolver(type => User, {\n    description:\n      'Retrieves the user who last updated this data archive. This field resolver identifies the person responsible for the most recent modifications to the archive request.'\n  })\n  async updater(@Root() dataArchive: DataArchive): Promise<User> {\n    return dataArchive.updaterId && (await getRepository(User).findOneBy({ id: dataArchive.updaterId }))\n  }\n\n  @FieldResolver(type => User, {\n    description:\n      'Retrieves the user who created this data archive request. This field resolver identifies the person responsible for initiating the data export and download process.'\n  })\n  async creator(@Root() dataArchive: DataArchive): Promise<User> {\n    return dataArchive.creatorId && (await getRepository(User).findOneBy({ id: dataArchive.creatorId }))\n  }\n}\n"]}
+{"version":3,"file":"data-archive-query.js","sourceRoot":"","sources":["../../../server/service/data-archive/data-archive-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'\nimport { In } from 'typeorm'\n\nimport { Role, User } from '@things-factory/auth-base'\nimport { Domain, getQueryBuilderFromListParams, ListParam, getRepository } from '@things-factory/shell'\n\nimport { DataArchive } from './data-archive.js'\nimport { DataArchiveList } from './data-archive-type.js'\nimport { getDomainIdsWithAncestors } from '../../utils/domain-inheritance.js'\n\nvar parser = require('cron-parser')\n\n@Resolver(DataArchive)\nexport class DataArchiveQuery {\n  @Directive('@privilege(category: \"data-archive\", privilege: \"query\", domainOwnerGranted: true)')\n  @Query(returns => DataArchive, {\n    description:\n      'Retrieves a single data archive by its unique identifier. This query fetches detailed information about a data archive request including its status, download URL, and associated dataset information for data export purposes.'\n  })\n  async dataArchive(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<DataArchive> {\n    const { domain } = context.state\n    const domainIds = await getDomainIdsWithAncestors(domain)\n\n    return await getRepository(DataArchive).findOne({\n      where: { domain: { id: In(domainIds) }, id }\n    })\n  }\n\n  @Directive('@privilege(category: \"data-archive\", privilege: \"query\", domainOwnerGranted: true)')\n  @Query(returns => DataArchiveList, {\n    description:\n      'Retrieves multiple data archives with pagination support. This query is used for listing and managing data export requests, allowing users to track the status of their data download requests and access completed archives.'\n  })\n  async dataArchives(\n    @Args(type => ListParam) params: ListParam,\n    @Ctx() context: ResolverContext\n  ): Promise<DataArchiveList> {\n    const { domain } = context.state\n    const domainIds = await getDomainIdsWithAncestors(domain)\n\n    const queryBuilder = getQueryBuilderFromListParams({\n      repository: getRepository(DataArchive),\n      params,\n      domain: undefined,\n      alias: 'dataArchive',\n      searchables: []\n    })\n\n    queryBuilder.andWhere('dataArchive.domain IN (:...ancestorDomainIds)', { ancestorDomainIds: domainIds })\n\n    const [items, total] = await queryBuilder.getManyAndCount()\n\n    return { items, total }\n  }\n\n  @FieldResolver(type => Domain, {\n    description:\n      'Retrieves the domain that this data archive belongs to. This field resolver provides access to the organizational context and settings associated with the archive request.'\n  })\n  async domain(@Root() dataArchive: DataArchive): Promise<Domain> {\n    return dataArchive.domainId && (await getRepository(Domain).findOneBy({ id: dataArchive.domainId }))\n  }\n\n  @FieldResolver(type => User, {\n    description:\n      'Retrieves the user who last updated this data archive. This field resolver identifies the person responsible for the most recent modifications to the archive request.'\n  })\n  async updater(@Root() dataArchive: DataArchive): Promise<User> {\n    return dataArchive.updaterId && (await getRepository(User).findOneBy({ id: dataArchive.updaterId }))\n  }\n\n  @FieldResolver(type => User, {\n    description:\n      'Retrieves the user who created this data archive request. This field resolver identifies the person responsible for initiating the data export and download process.'\n  })\n  async creator(@Root() dataArchive: DataArchive): Promise<User> {\n    return dataArchive.creatorId && (await getRepository(User).findOneBy({ id: dataArchive.creatorId }))\n  }\n}\n"]}

package/dist-server/service/data-key-set/data-key-set-query.js

@@ -9,21 +9,28 @@ const auth_base_1 = require("@things-factory/auth-base");
 const shell_1 = require("@things-factory/shell");
 const data_key_set_js_1 = require("./data-key-set.js");
 const data_key_set_type_js_1 = require("./data-key-set-type.js");
+const domain_inheritance_js_1 = require("../../utils/domain-inheritance.js");
 let DataKeySetQuery = class DataKeySetQuery {
     async dataKeySet(id, context) {
         const { domain } = context.state;
+        const domainIds = await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain);
         return await (0, shell_1.getRepository)(data_key_set_js_1.DataKeySet).findOne({
-            where: { domain: { id: (0, typeorm_1.In)([domain.id, domain.parentId].filter(Boolean)) }, id }
+            where: { domain: { id: (0, typeorm_1.In)(domainIds) }, id }
         });
     }
     async dataKeySets(params, context) {
         const { domain } = context.state;
+        const domainIds = await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain);
         const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
-            domain,
+            // 도메인 필터링은 ancestor 기반으로 직접 적용
+            domain: undefined,
             params,
-            repository: await (0, shell_1.getRepository)(data_key_set_js_1.DataKeySet),
+            repository: (0, shell_1.getRepository)(data_key_set_js_1.DataKeySet),
             searchables: ['name', 'description']
         });
+        queryBuilder.andWhere(`${queryBuilder.alias}.domain IN (:...ancestorDomainIds)`, {
+            ancestorDomainIds: domainIds
+        });
         const [items, total] = await queryBuilder.getManyAndCount();
         return { items, total };
     }

package/dist-server/service/data-key-set/data-key-set-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-key-set-query.js","sourceRoot":"","sources":["../../../server/service/data-key-set/data-key-set-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { In } from 'typeorm'\nimport { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'\n\nimport { Attachment } from '@things-factory/attachment-base'\nimport { User } from '@things-factory/auth-base'\nimport { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'\n\nimport { DataKeySet } from './data-key-set.js'\nimport { DataKeySetList } from './data-key-set-type.js'\n\n@Resolver(DataKeySet)\nexport class DataKeySetQuery {\n  @Query(returns => DataKeySet!, {\n    nullable: true,\n    description:\n      'Retrieves a single data key set by its unique identifier. This query fetches detailed information about a key set including its key items, configuration, and metadata. Data key sets define the indexing and categorization structure for data samples and summaries.'\n  })\n  async dataKeySet(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<DataKeySet> {\n    const { domain } = context.state\n\n    return await getRepository(DataKeySet).findOne({\n      where: { domain: { id: In([domain.id, domain.parentId].filter(Boolean)) }, id }\n    })\n  }\n\n  @Query(returns => DataKeySetList, {\n    description:\n      'Retrieves multiple data key sets with pagination and filtering support. This query allows searching key sets by name and description, and is used for listing and managing data categorization structures across all datasets.'\n  })\n  async dataKeySets(\n    @Args(type => ListParam) params: ListParam,\n    @Ctx() context: ResolverContext\n  ): Promise<DataKeySetList> {\n    const { domain } = context.state\n\n    const queryBuilder = getQueryBuilderFromListParams({\n      domain,\n      params,\n      repository: await getRepository(DataKeySet),\n      searchables: ['name', 'description']\n    })\n\n    const [items, total] = await queryBuilder.getManyAndCount()\n\n    return { items, total }\n  }\n\n  @FieldResolver(type => String, {\n    description:\n      'Retrieves the thumbnail image path for this data key set. This field resolver provides access to visual representation of the key set, typically used for display purposes in user interfaces.'\n  })\n  async thumbnail(@Root() dataKeySet: DataKeySet): Promise<string | undefined> {\n    const attachment: Attachment = await getRepository(Attachment).findOne({\n      where: {\n        domain: { id: dataKeySet.domainId },\n        refType: DataKeySet.name,\n        refBy: dataKeySet.id\n      }\n    })\n\n    return attachment?.fullpath\n  }\n\n  @FieldResolver(type => Domain, {\n    description:\n      'Retrieves the domain that this data key set belongs to. This field resolver provides access to the organizational context and settings associated with the key set.'\n  })\n  async domain(@Root() dataKeySet: DataKeySet): Promise<Domain> {\n    return dataKeySet.domainId && (await getRepository(Domain).findOneBy({ id: dataKeySet.domainId }))\n  }\n\n  @FieldResolver(type => User, {\n    description:\n      'Retrieves the user who last updated this data key set. This field resolver identifies the person responsible for the most recent modifications to the key set configuration.'\n  })\n  async updater(@Root() dataKeySet: DataKeySet): Promise<User> {\n    return dataKeySet.updaterId && (await getRepository(User).findOneBy({ id: dataKeySet.updaterId }))\n  }\n\n  @FieldResolver(type => User, {\n    description:\n      'Retrieves the user who created this data key set. This field resolver identifies the person responsible for initially defining the key set structure and configuration.'\n  })\n  async creator(@Root() dataKeySet: DataKeySet): Promise<User> {\n    return dataKeySet.creatorId && (await getRepository(User).findOneBy({ id: dataKeySet.creatorId }))\n  }\n}\n"]}
+{"version":3,"file":"data-key-set-query.js","sourceRoot":"","sources":["../../../server/service/data-key-set/data-key-set-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { In } from 'typeorm'\nimport { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'\n\nimport { Attachment } from '@things-factory/attachment-base'\nimport { User } from '@things-factory/auth-base'\nimport { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'\n\nimport { DataKeySet } from './data-key-set.js'\nimport { DataKeySetList } from './data-key-set-type.js'\nimport { getDomainIdsWithAncestors } from '../../utils/domain-inheritance.js'\n\n@Resolver(DataKeySet)\nexport class DataKeySetQuery {\n  @Query(returns => DataKeySet!, {\n    nullable: true,\n    description:\n      'Retrieves a single data key set by its unique identifier. This query fetches detailed information about a key set including its key items, configuration, and metadata. Data key sets define the indexing and categorization structure for data samples and summaries.'\n  })\n  async dataKeySet(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<DataKeySet> {\n    const { domain } = context.state\n    const domainIds = await getDomainIdsWithAncestors(domain)\n\n    return await getRepository(DataKeySet).findOne({\n      where: { domain: { id: In(domainIds) }, id }\n    })\n  }\n\n  @Query(returns => DataKeySetList, {\n    description:\n      'Retrieves multiple data key sets with pagination and filtering support. This query allows searching key sets by name and description, and is used for listing and managing data categorization structures across all datasets.'\n  })\n  async dataKeySets(\n    @Args(type => ListParam) params: ListParam,\n    @Ctx() context: ResolverContext\n  ): Promise<DataKeySetList> {\n    const { domain } = context.state\n    const domainIds = await getDomainIdsWithAncestors(domain)\n\n    const queryBuilder = getQueryBuilderFromListParams({\n      // 도메인 필터링은 ancestor 기반으로 직접 적용\n      domain: undefined,\n      params,\n      repository: getRepository(DataKeySet),\n      searchables: ['name', 'description']\n    })\n\n    queryBuilder.andWhere(`${queryBuilder.alias}.domain IN (:...ancestorDomainIds)`, {\n      ancestorDomainIds: domainIds\n    })\n\n    const [items, total] = await queryBuilder.getManyAndCount()\n\n    return { items, total }\n  }\n\n  @FieldResolver(type => String, {\n    description:\n      'Retrieves the thumbnail image path for this data key set. This field resolver provides access to visual representation of the key set, typically used for display purposes in user interfaces.'\n  })\n  async thumbnail(@Root() dataKeySet: DataKeySet): Promise<string | undefined> {\n    const attachment: Attachment = await getRepository(Attachment).findOne({\n      where: {\n        domain: { id: dataKeySet.domainId },\n        refType: DataKeySet.name,\n        refBy: dataKeySet.id\n      }\n    })\n\n    return attachment?.fullpath\n  }\n\n  @FieldResolver(type => Domain, {\n    description:\n      'Retrieves the domain that this data key set belongs to. This field resolver provides access to the organizational context and settings associated with the key set.'\n  })\n  async domain(@Root() dataKeySet: DataKeySet): Promise<Domain> {\n    return dataKeySet.domainId && (await getRepository(Domain).findOneBy({ id: dataKeySet.domainId }))\n  }\n\n  @FieldResolver(type => User, {\n    description:\n      'Retrieves the user who last updated this data key set. This field resolver identifies the person responsible for the most recent modifications to the key set configuration.'\n  })\n  async updater(@Root() dataKeySet: DataKeySet): Promise<User> {\n    return dataKeySet.updaterId && (await getRepository(User).findOneBy({ id: dataKeySet.updaterId }))\n  }\n\n  @FieldResolver(type => User, {\n    description:\n      'Retrieves the user who created this data key set. This field resolver identifies the person responsible for initially defining the key set structure and configuration.'\n  })\n  async creator(@Root() dataKeySet: DataKeySet): Promise<User> {\n    return dataKeySet.creatorId && (await getRepository(User).findOneBy({ id: dataKeySet.creatorId }))\n  }\n}\n"]}

package/dist-server/service/data-ooc/data-ooc-query.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataOocQuery = void 0;
 const tslib_1 = require("tslib");
 const type_graphql_1 = require("type-graphql");
+const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
 const shell_1 = require("@things-factory/shell");
 const worklist_1 = require("@things-factory/worklist");
@@ -12,21 +13,27 @@ const data_set_js_1 = require("../data-set/data-set.js");
 const data_sample_js_1 = require("../data-sample/data-sample.js");
 const data_ooc_js_1 = require("./data-ooc.js");
 const data_ooc_type_js_1 = require("./data-ooc-type.js");
+const domain_inheritance_js_1 = require("../../utils/domain-inheritance.js");
 let DataOocQuery = class DataOocQuery {
     async dataOoc(id, context) {
         const { domain } = context.state;
+        const domainIds = await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain);
         return await (0, shell_1.getRepository)(data_ooc_js_1.DataOoc).findOne({
-            where: { domain: { id: domain.id }, id }
+            where: { domain: { id: (0, typeorm_1.In)(domainIds) }, id }
         });
     }
     async dataOocs(params, context) {
         const { domain } = context.state;
+        const domainIds = await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain);
         const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
             repository: (0, shell_1.getRepository)(data_ooc_js_1.DataOoc),
             params,
-            domain,
+            domain: undefined,
             searchables: ['name', 'description']
         });
+        queryBuilder.andWhere(`${queryBuilder.alias}.domain IN (:...ancestorDomainIds)`, {
+            ancestorDomainIds: domainIds
+        });
         const [items, total] = await queryBuilder.getManyAndCount();
         return { items, total };
     }

package/dist-server/service/data-ooc/data-ooc-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-ooc-query.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'\n\nimport { User } from '@things-factory/auth-base'\nimport { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'\nimport { ActivityInstance } from '@things-factory/worklist'\n\nimport { DataSetHistory } from '../data-set-history/data-set-history.js'\nimport { DataItem } from '../data-set/data-item-type.js'\nimport { DataSet } from '../data-set/data-set.js'\nimport { DataSample } from '../data-sample/data-sample.js'\nimport { DataOoc } from './data-ooc.js'\nimport { DataOocList } from './data-ooc-type.js'\n\n@Resolver(DataOoc)\nexport class DataOocQuery {\n  @Directive('@privilege(category: \"data-ooc\", privilege: \"query\", domainOwnerGranted: true)')\n  @Query(returns => DataOoc, {\n    description:\n      'Retrieves a single out-of-control (OOC) record by its unique identifier. This query fetches detailed information about an OOC event including its status, corrective actions, review process, and associated data sample.'\n  })\n  async dataOoc(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<DataOoc> {\n    const { domain } = context.state\n\n    return await getRepository(DataOoc).findOne({\n      where: { domain: { id: domain.id }, id }\n    })\n  }\n\n  @Directive('@privilege(category: \"data-ooc\", privilege: \"query\", domainOwnerGranted: true)')\n  @Query(returns => DataOocList, {\n    description:\n      'Retrieves multiple out-of-control (OOC) records with pagination and filtering support. This query allows searching OOC events by name and description, and is used for monitoring and managing quality control issues across all datasets.'\n  })\n  async dataOocs(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<DataOocList> {\n    const { domain } = context.state\n\n    const queryBuilder = getQueryBuilderFromListParams({\n      repository: getRepository(DataOoc),\n      params,\n      domain,\n      searchables: ['name', 'description']\n    })\n\n    const [items, total] = await queryBuilder.getManyAndCount()\n\n    return { items, total }\n  }\n\n  @FieldResolver(type => [DataItem], {\n    description:\n      'Retrieves the data items (field definitions) associated with this OOC record. These items define the structure and validation rules for the OOC data, including field names, types, and constraints.'\n  })\n  async dataItems(@Root() dataOoc: DataOoc): Promise<DataItem[]> {\n    const dataSetHistory: DataSetHistory =\n      dataOoc.dataSetId &&\n      (await getRepository(DataSetHistory).findOne({\n        where: {\n          originalId: dataOoc.dataSetId,\n          version: dataOoc.dataSetVersion\n        }\n      }))\n    return dataSetHistory?.dataItems.filter(item => item.active) || []\n  }\n\n  @FieldResolver(type => DataSample, {\n    description:\n      'Retrieves the original data sample that triggered this OOC event. This field resolver provides access to the source data that was flagged as out of control or out of specification.'\n  })\n  async dataSample(@Root() dataOoc: DataOoc): Promise<DataSample> {\n    return dataOoc.dataSampleId && (await getRepository(DataSample).findOneBy({ id: dataOoc.dataSampleId }))\n  }\n\n  @FieldResolver(type => DataSet, {\n    description:\n      'Retrieves the dataset that this OOC event belongs to. This field resolver provides access to the dataset configuration and settings associated with the OOC event.'\n  })\n  async dataSet(@Root() dataOoc: DataOoc): Promise<DataSet> {\n    return dataOoc.dataSetId && (await getRepository(DataSet).findOneBy({ id: dataOoc.dataSetId }))\n  }\n\n  @FieldResolver(type => ActivityInstance, {\n    description:\n      'Retrieves the review activity instance associated with this OOC event. This field resolver provides access to the workflow process for reviewing and approving the OOC event.'\n  })\n  async reviewActivityInstance(@Root() dataOoc: DataOoc): Promise<ActivityInstance> {\n    return (\n      dataOoc.reviewActivityInstanceId &&\n      (await getRepository(ActivityInstance).findOneBy({ id: dataOoc.reviewActivityInstanceId }))\n    )\n  }\n\n  @FieldResolver(type => ActivityInstance, {\n    description:\n      'Retrieves the resolution activity instance associated with this OOC event. This field resolver provides access to the workflow process for implementing corrective actions and resolving the OOC issue.'\n  })\n  async resolveActivityInstance(@Root() dataOoc: DataOoc): Promise<ActivityInstance> {\n    return (\n      dataOoc.resolveActivityInstanceId &&\n      (await getRepository(ActivityInstance).findOneBy({ id: dataOoc.resolveActivityInstanceId }))\n    )\n  }\n\n  @FieldResolver(type => User, {\n    description:\n      'Retrieves the user who implemented the corrective action for this OOC event. This field resolver identifies the person responsible for resolving the out-of-control situation.'\n  })\n  async corrector(@Root() dataOoc: DataOoc): Promise<User> {\n    return dataOoc.correctorId && (await getRepository(User).findOneBy({ id: dataOoc.correctorId }))\n  }\n\n  @FieldResolver(type => User, {\n    description:\n      'Retrieves the user who reviewed this OOC event. This field resolver identifies the person responsible for reviewing and approving the out-of-control situation.'\n  })\n  async reviewer(@Root() dataOoc: DataOoc): Promise<User> {\n    return dataOoc.reviewerId && (await getRepository(User).findOneBy({ id: dataOoc.reviewerId }))\n  }\n\n  @FieldResolver(type => Domain)\n  async domain(@Root() dataOoc: DataOoc): Promise<Domain> {\n    return await getRepository(Domain).findOneBy({ id: dataOoc.domainId })\n  }\n\n  @FieldResolver(type => User)\n  async updater(@Root() dataOoc: DataOoc): Promise<User> {\n    return dataOoc.updaterId && (await getRepository(User).findOneBy({ id: dataOoc.updaterId }))\n  }\n\n  @FieldResolver(type => User)\n  async creator(@Root() dataOoc: DataOoc): Promise<User> {\n    return dataOoc.creatorId && (await getRepository(User).findOneBy({ id: dataOoc.creatorId }))\n  }\n}\n"]}
+{"version":3,"file":"data-ooc-query.js","sourceRoot":"","sources":["../../../server/service/data-ooc/data-ooc-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arg, Args, Ctx, Directive, FieldResolver, Query, Resolver, Root } from 'type-graphql'\nimport { In } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'\nimport { ActivityInstance } from '@things-factory/worklist'\n\nimport { DataSetHistory } from '../data-set-history/data-set-history.js'\nimport { DataItem } from '../data-set/data-item-type.js'\nimport { DataSet } from '../data-set/data-set.js'\nimport { DataSample } from '../data-sample/data-sample.js'\nimport { DataOoc } from './data-ooc.js'\nimport { DataOocList } from './data-ooc-type.js'\nimport { getDomainIdsWithAncestors } from '../../utils/domain-inheritance.js'\n\n@Resolver(DataOoc)\nexport class DataOocQuery {\n  @Directive('@privilege(category: \"data-ooc\", privilege: \"query\", domainOwnerGranted: true)')\n  @Query(returns => DataOoc, {\n    description:\n      'Retrieves a single out-of-control (OOC) record by its unique identifier. This query fetches detailed information about an OOC event including its status, corrective actions, review process, and associated data sample.'\n  })\n  async dataOoc(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<DataOoc> {\n    const { domain } = context.state\n    const domainIds = await getDomainIdsWithAncestors(domain)\n\n    return await getRepository(DataOoc).findOne({\n      where: { domain: { id: In(domainIds) }, id }\n    })\n  }\n\n  @Directive('@privilege(category: \"data-ooc\", privilege: \"query\", domainOwnerGranted: true)')\n  @Query(returns => DataOocList, {\n    description:\n      'Retrieves multiple out-of-control (OOC) records with pagination and filtering support. This query allows searching OOC events by name and description, and is used for monitoring and managing quality control issues across all datasets.'\n  })\n  async dataOocs(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<DataOocList> {\n    const { domain } = context.state\n    const domainIds = await getDomainIdsWithAncestors(domain)\n\n    const queryBuilder = getQueryBuilderFromListParams({\n      repository: getRepository(DataOoc),\n      params,\n      domain: undefined,\n      searchables: ['name', 'description']\n    })\n\n    queryBuilder.andWhere(`${queryBuilder.alias}.domain IN (:...ancestorDomainIds)`, {\n      ancestorDomainIds: domainIds\n    })\n\n    const [items, total] = await queryBuilder.getManyAndCount()\n\n    return { items, total }\n  }\n\n  @FieldResolver(type => [DataItem], {\n    description:\n      'Retrieves the data items (field definitions) associated with this OOC record. These items define the structure and validation rules for the OOC data, including field names, types, and constraints.'\n  })\n  async dataItems(@Root() dataOoc: DataOoc): Promise<DataItem[]> {\n    const dataSetHistory: DataSetHistory =\n      dataOoc.dataSetId &&\n      (await getRepository(DataSetHistory).findOne({\n        where: {\n          originalId: dataOoc.dataSetId,\n          version: dataOoc.dataSetVersion\n        }\n      }))\n    return dataSetHistory?.dataItems.filter(item => item.active) || []\n  }\n\n  @FieldResolver(type => DataSample, {\n    description:\n      'Retrieves the original data sample that triggered this OOC event. This field resolver provides access to the source data that was flagged as out of control or out of specification.'\n  })\n  async dataSample(@Root() dataOoc: DataOoc): Promise<DataSample> {\n    return dataOoc.dataSampleId && (await getRepository(DataSample).findOneBy({ id: dataOoc.dataSampleId }))\n  }\n\n  @FieldResolver(type => DataSet, {\n    description:\n      'Retrieves the dataset that this OOC event belongs to. This field resolver provides access to the dataset configuration and settings associated with the OOC event.'\n  })\n  async dataSet(@Root() dataOoc: DataOoc): Promise<DataSet> {\n    return dataOoc.dataSetId && (await getRepository(DataSet).findOneBy({ id: dataOoc.dataSetId }))\n  }\n\n  @FieldResolver(type => ActivityInstance, {\n    description:\n      'Retrieves the review activity instance associated with this OOC event. This field resolver provides access to the workflow process for reviewing and approving the OOC event.'\n  })\n  async reviewActivityInstance(@Root() dataOoc: DataOoc): Promise<ActivityInstance> {\n    return (\n      dataOoc.reviewActivityInstanceId &&\n      (await getRepository(ActivityInstance).findOneBy({ id: dataOoc.reviewActivityInstanceId }))\n    )\n  }\n\n  @FieldResolver(type => ActivityInstance, {\n    description:\n      'Retrieves the resolution activity instance associated with this OOC event. This field resolver provides access to the workflow process for implementing corrective actions and resolving the OOC issue.'\n  })\n  async resolveActivityInstance(@Root() dataOoc: DataOoc): Promise<ActivityInstance> {\n    return (\n      dataOoc.resolveActivityInstanceId &&\n      (await getRepository(ActivityInstance).findOneBy({ id: dataOoc.resolveActivityInstanceId }))\n    )\n  }\n\n  @FieldResolver(type => User, {\n    description:\n      'Retrieves the user who implemented the corrective action for this OOC event. This field resolver identifies the person responsible for resolving the out-of-control situation.'\n  })\n  async corrector(@Root() dataOoc: DataOoc): Promise<User> {\n    return dataOoc.correctorId && (await getRepository(User).findOneBy({ id: dataOoc.correctorId }))\n  }\n\n  @FieldResolver(type => User, {\n    description:\n      'Retrieves the user who reviewed this OOC event. This field resolver identifies the person responsible for reviewing and approving the out-of-control situation.'\n  })\n  async reviewer(@Root() dataOoc: DataOoc): Promise<User> {\n    return dataOoc.reviewerId && (await getRepository(User).findOneBy({ id: dataOoc.reviewerId }))\n  }\n\n  @FieldResolver(type => Domain)\n  async domain(@Root() dataOoc: DataOoc): Promise<Domain> {\n    return await getRepository(Domain).findOneBy({ id: dataOoc.domainId })\n  }\n\n  @FieldResolver(type => User)\n  async updater(@Root() dataOoc: DataOoc): Promise<User> {\n    return dataOoc.updaterId && (await getRepository(User).findOneBy({ id: dataOoc.updaterId }))\n  }\n\n  @FieldResolver(type => User)\n  async creator(@Root() dataOoc: DataOoc): Promise<User> {\n    return dataOoc.creatorId && (await getRepository(User).findOneBy({ id: dataOoc.creatorId }))\n  }\n}\n"]}

package/dist-server/service/data-sample/data-sample-query.js

@@ -14,28 +14,35 @@ const data_set_js_1 = require("../data-set/data-set.js");
 const data_ooc_js_1 = require("../data-ooc/data-ooc.js");
 const data_sample_js_1 = require("./data-sample.js");
 const data_sample_type_js_1 = require("./data-sample-type.js");
+const domain_inheritance_js_1 = require("../../utils/domain-inheritance.js");
 let DataSampleQuery = class DataSampleQuery {
     async dataSample(id, context) {
         const { domain } = context.state;
+        const domainIds = await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain);
         return await (0, shell_1.getRepository)(data_sample_js_1.DataSample).findOne({
-            where: { domain: { id: domain.id }, id }
+            where: { domain: { id: (0, typeorm_1.In)(domainIds) }, id }
         });
     }
     async dataSamples(params, context) {
         const { domain } = context.state;
+        const domainIds = await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain);
         const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
             repository: (0, shell_1.getRepository)(data_sample_js_1.DataSample),
             params,
-            domain,
+            domain: undefined,
             searchables: ['name', 'description']
         });
+        queryBuilder.andWhere(`${queryBuilder.alias}.domain IN (:...ancestorDomainIds)`, {
+            ancestorDomainIds: domainIds
+        });
         const [items, total] = await queryBuilder.getManyAndCount();
         return { items, total };
     }
     async dataSamplesByDataSet(dataSetId, params, context) {
         const { domain } = context.state;
+        const domainIds = await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain);
         const dataSet = await (0, shell_1.getRepository)(data_set_js_1.DataSet).findOne({
-            where: { domain: { id: (0, typeorm_1.In)([domain.id, domain.parentId].filter(Boolean)) }, id: dataSetId },
+            where: { domain: { id: (0, typeorm_1.In)(domainIds) }, id: dataSetId },
             relations: ['dataKeySet']
         });
         if (!dataSet) {
@@ -46,34 +53,36 @@ let DataSampleQuery = class DataSampleQuery {
         const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
             repository: (0, shell_1.getRepository)(data_sample_js_1.DataSample),
             params,
-            domain,
+            domain: undefined,
             alias: 'sample',
             searchables: ['name', 'description'].concat(searchables)
-        }).innerJoin('sample.dataSet', 'ds', 'ds.id = :dataSetId', {
-            dataSetId
-        });
+        })
+            .andWhere('sample.domain IN (:...ancestorDomainIds)', { ancestorDomainIds: domainIds })
+            .innerJoin('sample.dataSet', 'ds', 'ds.id = :dataSetId', { dataSetId });
         const [items, total] = await queryBuilder.getManyAndCount();
         return { items, total };
     }
     async dataSamplesByDataKeySet(dataKeySetId, params, context) {
         const { domain } = context.state;
+        const domainIds = await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain);
         const dataKeySet = await (0, shell_1.getRepository)(data_key_set_js_1.DataKeySet).findOneBy({ id: dataKeySetId });
         const dataKeyItems = dataKeySet?.dataKeyItems || [];
         const searchables = dataKeyItems.map((item, index) => `key0${index + 1}`);
         const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
             repository: (0, shell_1.getRepository)(data_sample_js_1.DataSample),
             params,
-            domain,
+            domain: undefined,
             alias: 'sample',
             searchables: ['name', 'description'].concat(searchables)
-        }).innerJoin('sample.dataSet', 'ds', 'ds.dataKeySet = :dataKeySetId', {
-            dataKeySetId
-        });
+        })
+            .andWhere('sample.domain IN (:...ancestorDomainIds)', { ancestorDomainIds: domainIds })
+            .innerJoin('sample.dataSet', 'ds', 'ds.dataKeySet = :dataKeySetId', { dataKeySetId });
         const [items, total] = await queryBuilder.getManyAndCount();
         return { items, total };
     }
     async dataSamplesByPeriod(period, dataSetName, params, context) {
         const { domain } = context.state;
+        const domainIds = await (0, domain_inheritance_js_1.getDomainIdsWithAncestors)(domain);
         const { date, month } = params.filters.reduce((acc, filter) => {
             if (filter.name === 'date')
                 acc.date = filter.value;
@@ -83,7 +92,7 @@ let DataSampleQuery = class DataSampleQuery {
         }, { date: null, month: null });
         const { from, to } = await (0, shell_1.getISOStringsForPeriod)(period, { date, month }, context);
         const dataSet = await (0, shell_1.getRepository)(data_set_js_1.DataSet).findOne({
-            where: { domain: { id: (0, typeorm_1.In)([domain.id, domain.parentId].filter(Boolean)) }, name: dataSetName },
+            where: { domain: { id: (0, typeorm_1.In)(domainIds) }, name: dataSetName },
             relations: ['dataKeySet']
         });
         if (!dataSet) {
@@ -105,12 +114,12 @@ let DataSampleQuery = class DataSampleQuery {
                 ...params,
                 filters: alteredFilters
             },
-            domain,
+            domain: undefined,
             alias: 'sample',
             searchables: ['name', 'description'].concat(searchables)
-        }).innerJoin('sample.dataSet', 'ds', 'ds.id = :dataSetId', {
-            dataSetId: dataSet.id
-        });
+        })
+            .andWhere('sample.domain IN (:...ancestorDomainIds)', { ancestorDomainIds: domainIds })
+            .innerJoin('sample.dataSet', 'ds', 'ds.id = :dataSetId', { dataSetId: dataSet.id });
         const [items, total] = await queryBuilder.getManyAndCount();
         return { items, total };
     }