@things-factory/dataset 5.0.13 → 6.0.0-alpha.3

package/dist-server/controllers/create-data-sample.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-data-sample.js","sourceRoot":"","sources":["../../server/controllers/create-data-sample.ts"],"names":[],"mappings":"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","sourcesContent":["import moment from 'moment-timezone'\nimport { EntityManager } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { Domain, getRedirectSubdomainPath, pubsub } from '@things-factory/shell'\nimport { getWorkDateAndShift } from '@things-factory/work-shift'\n\nimport { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'\nimport { DataSample } from '../service/data-sample/data-sample'\nimport { NewDataSample } from '../service/data-sample/data-sample-type'\nimport { DataSet } from '../service/data-set/data-set'\nimport { DataUseCase } from './data-use-case'\n\nconst fillDataKeys = (dataKeySet, data) => {\n  const keys = dataKeySet?.dataKeyItems || []\n  return keys.reduce((sum, key, index) => {\n    const value = data[key.dataKey]\n    if (value != null) {\n      sum[`key0${index + 1}`] = value instanceof Array ? value[0] : value\n    }\n    return sum\n  }, {})\n}\n\n// parse variable javascript string pattern\nconst replaceVariables = (keys, dic) => {\n  for (const k in keys) {\n    const matches = keys[k].match(/\\$\\{\\w*\\}/g)\n    matches &&\n      matches.forEach(m => {\n        keys[k] = keys[k].replace(m, dic[m.slice(2, -1)])\n      })\n  }\n  return keys\n}\n\n// It is required UTC date for Partitioning File System like AWS S3 from Athena.\n// ex) %YYYY, %MM, %DD\nconst formatDate = (keys, _moment) => {\n  for (const k in keys) {\n    const matches = keys[k].match(/%\\w*/g)\n    matches &&\n      matches.forEach(m => {\n        keys[k] = keys[k].replace(m, _moment.format(m.substr(1)))\n      })\n  }\n  return keys\n}\n\nexport async function createDataSample(\n  dataSample: NewDataSample,\n  context: { state: { domain: Domain; user: User; tx: EntityManager } }\n): Promise<DataSample> {\n  const { domain, user, tx } = context.state\n\n  const dataSet = await tx.getRepository(DataSet).findOne({\n    where: { id: dataSample.dataSet.id },\n    relations: ['dataKeySet']\n  })\n\n  const dataItems = dataSet.dataItems\n  const collectedAt = dataSample.collectedAt || new Date()\n\n  const timezone = dataSet.timezone || domain.timezone || 'UTC'\n  const format = 'YYYY-MM-DD'\n\n  // workDate ex) 2022-04-04\n  const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt, { timezone, format })\n\n  // local time dataSet timezone or domain timezone or default 'UTC'\n\n  const localDateTz = moment(collectedAt).tz(timezone)\n  const defaultPartitionKeys = {\n    domain: domain.subdomain,\n    datasetid: dataSample.dataSet.id /* It should not be 'data_set_id' as column name duplicated for Glue */,\n    date: localDateTz.format(format) /* local time date */,\n    workdate: workDate /* working date */,\n    workshift: workShift\n  }\n\n  var partitionKeys = {\n    ...defaultPartitionKeys,\n    ...dataSet.partitionKeys\n  }\n\n  partitionKeys = formatDate(partitionKeys, localDateTz)\n  partitionKeys = replaceVariables(partitionKeys, dataSample.data)\n\n  const dataKeys = fillDataKeys(dataSet?.dataKeySet, dataSample.data)\n\n  const { ooc, oos, judgment } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}\n  const result = await tx.getRepository(DataSample).save({\n    name: dataSet.name,\n    description: dataSet.description,\n    useCase: dataSet.useCase,\n    ...dataSample,\n    ...dataKeys,\n    dataSetVersion: dataSet.version,\n    domain,\n    partitionKeys,\n    ooc,\n    oos,\n    judgment,\n    collectedAt,\n    workDate,\n    workShift,\n    creator: user,\n    updater: user\n  })\n\n  if (ooc || oos) {\n    const dataOoc = await tx.getRepository(DataOoc).save({\n      ...result,\n      history: [\n        {\n          user: {\n            id: user.id,\n            name: user.name\n          },\n          state: DataOocStatus.CREATED,\n          timestamp: Date.now()\n        }\n      ],\n      state: DataOocStatus.CREATED\n    })\n\n    pubsub.publish('data-ooc', {\n      dataOoc,\n      supervisoryRoleId: dataSet.supervisoryRoleId\n    })\n\n    pubsub.publish('notification', {\n      notification: {\n        domain,\n        type: 'error',\n        title: `Data OOC occurred on '${dataSet.name}'`,\n        body: `Data OOC occurred on '${dataSet.name}'`,\n        url: getRedirectSubdomainPath(context, domain.subdomain, `/data-ooc/${dataOoc.id}`),\n        timestamp: collectedAt\n      }\n    })\n  }\n\n  return result\n}\n"]}
+{"version":3,"file":"create-data-sample.js","sourceRoot":"","sources":["../../server/controllers/create-data-sample.ts"],"names":[],"mappings":"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","sourcesContent":["import moment from 'moment-timezone'\nimport { EntityManager } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { Domain, getRedirectSubdomainPath, pubsub } from '@things-factory/shell'\nimport { getWorkDateAndShift } from '@things-factory/work-shift'\n\nimport { DataOoc, DataOocStatus } from '../service/data-ooc/data-ooc'\nimport { DataSample } from '../service/data-sample/data-sample'\nimport { NewDataSample } from '../service/data-sample/data-sample-type'\nimport { DataSet } from '../service/data-set/data-set'\nimport { DataUseCase } from './data-use-case'\n\n// See README.md at ## Data Samples\nprocess.env.TZ = 'UTC'\n\nconst fillDataKeys = (dataKeySet, data) => {\n  const keys = dataKeySet?.dataKeyItems || []\n  return keys.reduce((sum, key, index) => {\n    const value = data[key.dataKey]\n    if (value != null) {\n      sum[`key0${index + 1}`] = value instanceof Array ? value[0] : value\n    }\n    return sum\n  }, {})\n}\n\n// parse variable javascript string pattern\nconst replaceVariables = (keys, dic) => {\n  for (const k in keys) {\n    const matches = keys[k].match(/\\$\\{\\w*\\}/g)\n    matches &&\n      matches.forEach(m => {\n        keys[k] = keys[k].replace(m, dic[m.slice(2, -1)])\n      })\n  }\n  return keys\n}\n\n// It is required UTC date for Partitioning File System like AWS S3 from Athena.\n// ex) %YYYY, %MM, %DD\nconst formatDate = (keys, _moment) => {\n  for (const k in keys) {\n    const matches = keys[k].match(/%\\w*/g)\n    matches &&\n      matches.forEach(m => {\n        keys[k] = keys[k].replace(m, _moment.format(m.substr(1)))\n      })\n  }\n  return keys\n}\n\nexport async function createDataSample(\n  dataSample: NewDataSample,\n  context: { state: { domain: Domain; user: User; tx: EntityManager } }\n): Promise<DataSample> {\n  const { domain, user, tx } = context.state\n\n  const dataSet = await tx.getRepository(DataSet).findOne({\n    where: { id: dataSample.dataSet.id },\n    relations: ['dataKeySet']\n  })\n\n  const dataItems = dataSet.dataItems\n  const collectedAt = dataSample.collectedAt || new Date()\n\n  const timezone = dataSet.timezone || domain.timezone || 'UTC'\n  const format = 'YYYY-MM-DD'\n\n  // workDate ex) 2022-04-04\n  const { workDate, workShift } = await getWorkDateAndShift(domain, collectedAt, { timezone, format })\n\n  // local time dataSet timezone or domain timezone or default 'UTC'\n\n  const localDateTz = moment(collectedAt).tz(timezone)\n  const defaultPartitionKeys = {\n    domain: domain.subdomain,\n    datasetid: dataSample.dataSet.id /* It should not be 'data_set_id' as column name duplicated for Glue */,\n    date: localDateTz.format(format) /* local time date */,\n    workdate: workDate /* working date */,\n    workshift: workShift\n  }\n\n  var partitionKeys = {\n    ...defaultPartitionKeys,\n    ...dataSet.partitionKeys\n  }\n\n  partitionKeys = formatDate(partitionKeys, localDateTz)\n  partitionKeys = replaceVariables(partitionKeys, dataSample.data)\n\n  const dataKeys = fillDataKeys(dataSet?.dataKeySet, dataSample.data)\n\n  const { ooc, oos, judgment } = DataUseCase.evaluate(dataSet, dataItems, dataSample.data) || {}\n  const result = await tx.getRepository(DataSample).save({\n    name: dataSet.name,\n    description: dataSet.description,\n    useCase: dataSet.useCase,\n    type: dataSet.type,\n    ...dataSample,\n    ...dataKeys,\n    dataSetVersion: dataSet.version,\n    domain,\n    partitionKeys,\n    ooc,\n    oos,\n    judgment,\n    collectedAt,\n    workDate,\n    workShift,\n    creator: user,\n    updater: user\n  })\n\n  if (ooc || oos) {\n    const dataOoc = await tx.getRepository(DataOoc).save({\n      ...result,\n      history: [\n        {\n          user: {\n            id: user.id,\n            name: user.name\n          },\n          state: DataOocStatus.CREATED,\n          timestamp: Date.now()\n        }\n      ],\n      state: DataOocStatus.CREATED\n    })\n\n    pubsub.publish('data-ooc', {\n      dataOoc,\n      supervisoryRoleId: dataSet.supervisoryRoleId\n    })\n\n    pubsub.publish('notification', {\n      notification: {\n        domain,\n        type: 'error',\n        title: `Data OOC occurred on '${dataSet.name}'`,\n        body: `Data OOC occurred on '${dataSet.name}'`,\n        url: getRedirectSubdomainPath(context, domain.subdomain, `/data-ooc/${dataOoc.id}`),\n        timestamp: collectedAt\n      }\n    })\n  }\n\n  return result\n}\n"]}

package/dist-server/controllers/jasper-report.js

@@ -96,20 +96,23 @@ function parseJsonDataField(rows) {
 }
 const athenaClient = new aws_base_1.AthenaController();
 async function queryAthena(params) {
-    const { table, domain, dataSetId, fromWorkDate, toWorkDate, workShift, timezone } = params;
+    const { table, domain, datasetId, startDate, endDate, workShift, timezone } = params;
     const queryData = {
-        sql: `SELECT name, description, data, spec, workdate, workshift, 
+        sql: `SELECT ds.name, ds.description, ds.data, dsh.data_items as spec, ds.workdate, ds.workshift,
     DATE_FORMAT(
       FROM_UNIXTIME(collected_at / 1000 / 1000) AT TIME ZONE '${timezone || 'UTC'}', 
       '%Y-%m-%d %H:%i:%s'
-    ) AS collected_at
-    FROM ${table} 
-    WHERE domain='${domain}' 
-    AND datasetid = '${dataSetId}'
-    AND workdate >= '${fromWorkDate}'
-    AND workdate <= '${toWorkDate}'
-    ${workShift ? "AND workshift = '" + workShift + "'" : ''}
-    ORDER BY collected_at`,
+    ) AS dscollected_at
+    FROM ${table} ds
+    JOIN data_set_histories dsh 
+      ON (ds.datasetid = dsh.original_id
+        and ds.data_set_version = dsh.version)
+    WHERE ds.domain='${domain}' 
+    AND ds.datasetid = '${datasetId}'
+    AND ds.workdate >= '${startDate}'
+    AND ds.workdate <= '${endDate}'
+    ${workShift ? "AND ds.workshift = '" + workShift + "'" : ''}
+    ORDER BY ds.collected_at`,
         db: DATABASE
     };
     // and json_extract_scalar(data, '$.dauid') = 'A8032AD81730'
@@ -117,7 +120,7 @@ async function queryAthena(params) {
 }
 async function renderJasperReport(context) {
     const { state: { domain }, query } = context;
-    const template = await attachment_base_1.STORAGE.readFile(query['template'] || 'dynamic_header_sample.jrxml', 'utf-8');
+    const template = await attachment_base_1.STORAGE.readFile(query['reportTemplate'] || 'dynamic_header_sample.jrxml', 'utf-8');
     let templateType = query['templateType'] || 'crosstab';
     let parsedData = [];
     // @todo: get dataset timezone
@@ -147,7 +150,9 @@ async function renderJasperReport(context) {
         formData.append('template', template);
         formData.append('jsonString', JSON.stringify(parsedData));
         formData.append('parameters', JSON.stringify(parameters));
-        const reportUrl = `${PROTOCOL || 'http'}://${HOST}:${PORT}/rest/report/show_html`;
+        const { reportView } = query;
+        const subpath = reportView ? reportView.split('/').filter(x => x).join('/') : '';
+        const reportUrl = `${PROTOCOL || 'http'}://${HOST}:${PORT}/${subpath}`;
         const response = await (0, node_fetch_1.default)(reportUrl, {
             method: 'POST',
             body: formData

package/dist-server/controllers/jasper-report.js.map

@@ -1 +1 @@
-{"version":3,"file":"jasper-report.js","sourceRoot":"","sources":["../../server/controllers/jasper-report.ts"],"names":[],"mappings":"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","sourcesContent":["import FormData from 'form-data'\nimport fetch from 'node-fetch'\n\nimport { STORAGE } from '@things-factory/attachment-base'\nimport { AthenaController } from '@things-factory/aws-base'\nimport { config } from '@things-factory/env'\n\nconst dataReportConfig = config.get('dataReport')\nconst {\n  jasper: {\n    endpoint: { protocol: PROTOCOL, host: HOST, port: PORT },\n    datasource: { database: DATABASE }\n  }\n} = dataReportConfig || {\n  jasper: {\n    endpoint: {},\n    datasource: {}\n  }\n}\n\nfunction transformValuesToRows(queryResult) {\n  var parseData = []\n  let index = 1\n  for (let i = 0; i < queryResult.Items.length; i++) {\n    var j = 0\n    const data = JSON.parse(queryResult.Items[i].data)\n    const spec = JSON.parse(queryResult.Items[i].spec)\n\n    for (let key in data) {\n      if (Array.isArray(data[key])) {\n        for (j = 0; j < data[key].length; j++) {\n          for (let specKey in spec) {\n            if (key === specKey) {\n              parseData.push({\n                item: spec[specKey].name,\n                index: index + j,\n                value: String(data[key][j])\n              })\n            }\n          }\n        }\n      } else {\n        parseData.push({\n          item: key,\n          index,\n          value: String(data[key])\n        })\n      }\n    }\n    if (j !== 0) {\n      index = index + j\n    } else {\n      index = index + 1\n    }\n  }\n}\n\n/** @todo considering trasformation in lambda, as massive dataset */\nfunction pivotData(rows) {\n  let parsedData = []\n  let index = 1\n  for (let i = 0; i < rows.length; i++) {\n    let j = 0\n    const data = JSON.parse(rows[i].data)\n    const spec = JSON.parse(rows[i].spec)\n\n    for (let key in data) {\n      /** @todo rule to display or not, about unspecified spec */\n      const value = data[key]\n      !spec[key]?.hidden &&\n        parsedData.push({\n          item: spec[key]?.name || key,\n          index,\n          value: Array.isArray(value) ? value.join(', ') : value\n        })\n    }\n    if (j !== 0) {\n      index = index + j\n    } else {\n      index = index + 1\n    }\n  }\n\n  return parsedData\n}\n\nfunction parseJsonDataField(rows) {\n  let parsedData = []\n  for (let i = 0; i < rows.length; i++) {\n    const row = rows[i]\n    const data = JSON.parse(row.data)\n    for (let key in data) {\n      if (Array.isArray(data[key])) {\n        data[key] = data[key].toString()\n      }\n    }\n    delete row.data\n    parsedData.push({ ...row, ...data })\n  }\n\n  return parsedData\n}\n\nconst athenaClient = new AthenaController()\n\nasync function queryAthena(params) {\n  const { table, domain, dataSetId, fromWorkDate, toWorkDate, workShift, timezone } = params\n  const queryData = {\n    sql: `SELECT name, description, data, spec, workdate, workshift, \n    DATE_FORMAT(\n      FROM_UNIXTIME(collected_at / 1000 / 1000) AT TIME ZONE '${timezone || 'UTC'}', \n      '%Y-%m-%d %H:%i:%s'\n    ) AS collected_at\n    FROM ${table} \n    WHERE domain='${domain}' \n    AND datasetid = '${dataSetId}'\n    AND workdate >= '${fromWorkDate}'\n    AND workdate <= '${toWorkDate}'\n    ${workShift ? \"AND workshift = '\" + workShift + \"'\" : ''}\n    ORDER BY collected_at`,\n    db: DATABASE\n  }\n  // and json_extract_scalar(data, '$.dauid') = 'A8032AD81730'\n\n  return await athenaClient.query(queryData)\n}\n\nexport async function renderJasperReport(context: any) {\n  const {\n    state: { domain },\n    query\n  } = context\n\n  const template = await STORAGE.readFile(query['template'] || 'dynamic_header_sample.jrxml', 'utf-8')\n  let templateType = query['templateType'] || 'crosstab'\n  let parsedData = []\n\n  // @todo: get dataset timezone\n  /**\n   * const variables = await gql(dataSet(id:${dataSetId}) {\n   *  name, description, partition_keys, timezone\n   * })\n   */\n\n  query['domain'] = domain?.subdomain\n  query['timezone'] = domain?.timezone\n  const queryResult = await queryAthena(query)\n  const rows = queryResult.Items\n\n  if (!rows.length) {\n    return '<h3>Not found result.</h3>'\n  } else {\n    const firstRow = rows[0]\n    // uses the first row values as data-set has no history data.\n    const parameters = {\n      name: firstRow.name,\n      description: firstRow.description,\n      ...query\n    }\n\n    if (templateType === 'crosstab') {\n      parsedData = pivotData(rows)\n    } else {\n      parsedData = parseJsonDataField(rows)\n    }\n\n    const formData = new FormData()\n    formData.append('template', template)\n    formData.append('jsonString', JSON.stringify(parsedData))\n    formData.append('parameters', JSON.stringify(parameters))\n\n    const reportUrl = `${PROTOCOL || 'http'}://${HOST}:${PORT}/rest/report/show_html`\n    const response = await fetch(reportUrl, {\n      method: 'POST',\n      body: formData\n    })\n\n    return await response.text()\n  }\n}\n"]}
+{"version":3,"file":"jasper-report.js","sourceRoot":"","sources":["../../server/controllers/jasper-report.ts"],"names":[],"mappings":"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","sourcesContent":["import FormData from 'form-data'\nimport fetch from 'node-fetch'\n\nimport { STORAGE } from '@things-factory/attachment-base'\nimport { AthenaController } from '@things-factory/aws-base'\nimport { config } from '@things-factory/env'\n\nconst dataReportConfig = config.get('dataReport')\nconst {\n  jasper: {\n    endpoint: { protocol: PROTOCOL, host: HOST, port: PORT },\n    datasource: { database: DATABASE }\n  }\n} = dataReportConfig || {\n  jasper: {\n    endpoint: {},\n    datasource: {}\n  }\n}\n\nfunction transformValuesToRows(queryResult) {\n  var parseData = []\n  let index = 1\n  for (let i = 0; i < queryResult.Items.length; i++) {\n    var j = 0\n    const data = JSON.parse(queryResult.Items[i].data)\n    const spec = JSON.parse(queryResult.Items[i].spec)\n\n    for (let key in data) {\n      if (Array.isArray(data[key])) {\n        for (j = 0; j < data[key].length; j++) {\n          for (let specKey in spec) {\n            if (key === specKey) {\n              parseData.push({\n                item: spec[specKey].name,\n                index: index + j,\n                value: String(data[key][j])\n              })\n            }\n          }\n        }\n      } else {\n        parseData.push({\n          item: key,\n          index,\n          value: String(data[key])\n        })\n      }\n    }\n    if (j !== 0) {\n      index = index + j\n    } else {\n      index = index + 1\n    }\n  }\n}\n\n/** @todo considering trasformation in lambda, as massive dataset */\nfunction pivotData(rows) {\n  let parsedData = []\n  let index = 1\n  for (let i = 0; i < rows.length; i++) {\n    let j = 0\n    const data = JSON.parse(rows[i].data)\n    const spec = JSON.parse(rows[i].spec)\n\n    for (let key in data) {\n      /** @todo rule to display or not, about unspecified spec */\n      const value = data[key]\n      !spec[key]?.hidden &&\n        parsedData.push({\n          item: spec[key]?.name || key,\n          index,\n          value: Array.isArray(value) ? value.join(', ') : value\n        })\n    }\n    if (j !== 0) {\n      index = index + j\n    } else {\n      index = index + 1\n    }\n  }\n\n  return parsedData\n}\n\nfunction parseJsonDataField(rows) {\n  let parsedData = []\n  for (let i = 0; i < rows.length; i++) {\n    const row = rows[i]\n    const data = JSON.parse(row.data)\n    for (let key in data) {\n      if (Array.isArray(data[key])) {\n        data[key] = data[key].toString()\n      }\n    }\n    delete row.data\n    parsedData.push({ ...row, ...data })\n  }\n\n  return parsedData\n}\n\nconst athenaClient = new AthenaController()\n\nasync function queryAthena(params) {\n  const { table, domain, datasetId, startDate, endDate, workShift, timezone } = params\n  const queryData = {\n    sql: `SELECT ds.name, ds.description, ds.data, dsh.data_items as spec, ds.workdate, ds.workshift,\n    DATE_FORMAT(\n      FROM_UNIXTIME(collected_at / 1000 / 1000) AT TIME ZONE '${timezone || 'UTC'}', \n      '%Y-%m-%d %H:%i:%s'\n    ) AS dscollected_at\n    FROM ${table} ds\n    JOIN data_set_histories dsh \n      ON (ds.datasetid = dsh.original_id\n        and ds.data_set_version = dsh.version)\n    WHERE ds.domain='${domain}' \n    AND ds.datasetid = '${datasetId}'\n    AND ds.workdate >= '${startDate}'\n    AND ds.workdate <= '${endDate}'\n    ${workShift ? \"AND ds.workshift = '\" + workShift + \"'\" : ''}\n    ORDER BY ds.collected_at`,\n    db: DATABASE\n  }\n  // and json_extract_scalar(data, '$.dauid') = 'A8032AD81730'\n\n  return await athenaClient.query(queryData)\n}\n\nexport async function renderJasperReport(context: any) {\n  const {\n    state: { domain },\n    query\n  } = context\n\n  const template = await STORAGE.readFile(query['reportTemplate'] || 'dynamic_header_sample.jrxml', 'utf-8')\n  let templateType = query['templateType'] || 'crosstab'\n  let parsedData = []\n\n  // @todo: get dataset timezone\n  /**\n   * const variables = await gql(dataSet(id:${dataSetId}) {\n   *  name, description, partition_keys, timezone\n   * })\n   */\n\n  query['domain'] = domain?.subdomain\n  query['timezone'] = domain?.timezone\n  const queryResult = await queryAthena(query)\n  const rows = queryResult.Items\n\n  if (!rows.length) {\n    return '<h3>Not found result.</h3>'\n  } else {\n    const firstRow = rows[0]\n    // uses the first row values as data-set has no history data.\n    const parameters = {\n      name: firstRow.name,\n      description: firstRow.description,\n      ...query\n    }\n\n    if (templateType === 'crosstab') {\n      parsedData = pivotData(rows)\n    } else {\n      parsedData = parseJsonDataField(rows)\n    }\n\n    const formData = new FormData()\n    formData.append('template', template)\n    formData.append('jsonString', JSON.stringify(parsedData))\n    formData.append('parameters', JSON.stringify(parameters))\n\n    const { reportView } = query\n    const subpath = reportView ? reportView.split('/').filter(x => x).join('/') : ''\n    const reportUrl = `${PROTOCOL || 'http'}://${HOST}:${PORT}/${subpath}`\n    const response = await fetch(reportUrl, {\n      method: 'POST',\n      body: formData\n    })\n\n    return await response.text()\n  }\n}\n"]}

package/dist-server/controllers/shiny-report.js

@@ -0,0 +1,44 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderShinyReport = void 0;
+const env_1 = require("@things-factory/env");
+const querystring = require('querystring');
+const debug = require('debug')('things-factory:dataset:shiny-report');
+const dataReportConfig = env_1.config.get('dataReport');
+const { shiny: { endpoint: { protocol: PROTOCOL, host: HOST, port: PORT }, datasource: { database: DATABASE } } } = Object.assign({
+    shiny: {
+        endpoint: {},
+        datasource: {}
+    }
+}, dataReportConfig);
+async function renderShinyReport(context) {
+    debug('render:context', context);
+    try {
+        const { access_token: token } = querystring.parse(context.header.cookie, ';');
+        const { state: { domain }, query, response, } = context;
+        const urlParams = querystring.stringify(Object.assign(Object.assign({ token }, query), { database: DATABASE,
+            domain: domain === null || domain === void 0 ? void 0 : domain.subdomain }));
+        // const jsonParams = JSON.stringify({ 
+        //   ...query, 
+        //   ...{ database: DATABASE,  
+        //   domain: domain?.subdomain }
+        // })
+        const protocol = `${PROTOCOL || 'http'}://`;
+        const host = `${HOST}:${PORT}/`;
+        const subpath = (query === null || query === void 0 ? void 0 : query.reportView) || '';
+        if (!subpath) {
+            return context.body = '';
+        }
+        // filter not empty and join '/'
+        const url = host.split('/').concat(subpath.split('/'))
+            .filter(x => x).join('/');
+        // const reportUrl = `${protocol}${url}/?params=${jsonParams}`
+        const reportUrl = `${protocol}${url}/?${urlParams}`;
+        response.redirect(reportUrl);
+    }
+    catch (ex) {
+        context.body = `Error: ${ex.message} || ''`;
+    }
+}
+exports.renderShinyReport = renderShinyReport;
+//# sourceMappingURL=shiny-report.js.map

package/dist-server/controllers/shiny-report.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shiny-report.js","sourceRoot":"","sources":["../../server/controllers/shiny-report.ts"],"names":[],"mappings":";;;AAEA,6CAA4C;AAE5C,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;AAC1C,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,qCAAqC,CAAC,CAAA;AACrE,MAAM,gBAAgB,GAAG,YAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAA;AACjD,MAAM,EACJ,KAAK,EAAE,EACL,QAAQ,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,EACxD,UAAU,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,EACnC,EACF,GAAG,MAAM,CAAC,MAAM,CAAC;IAChB,KAAK,EAAE;QACL,QAAQ,EAAE,EAAE;QACZ,UAAU,EAAE,EAAE;KACf;CAAC,EAAE,gBAAgB,CAAC,CAAA;AAGhB,KAAK,UAAU,iBAAiB,CAAC,OAAY;IAClD,KAAK,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;IAEhC,IAAI;QACF,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;QAC7E,MAAM,EACJ,KAAK,EAAE,EAAE,MAAM,EAAE,EACjB,KAAK,EACL,QAAQ,GACT,GAAG,OAAO,CAAA;QAEX,MAAM,SAAS,GAAG,WAAW,CAAC,SAAS,+BACrC,KAAK,IACF,KAAK,GACL,EAAE,QAAQ,EAAE,QAAQ;YACvB,MAAM,EAAE,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,EAAE,EAC3B,CAAA;QAEF,uCAAuC;QACvC,eAAe;QACf,+BAA+B;QAC/B,gCAAgC;QAChC,KAAK;QAEL,MAAM,QAAQ,GAAG,GAAG,QAAQ,IAAI,MAAM,KAAK,CAAA;QAC3C,MAAM,IAAI,GAAG,GAAG,IAAI,IAAI,IAAI,GAAG,CAAA;QAC/B,MAAM,OAAO,GAAG,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,KAAI,EAAE,CAAA;QAEvC,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO,OAAO,CAAC,IAAI,GAAG,EAAE,CAAA;SACzB;QAED,gCAAgC;QAChC,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;aACnD,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAC3B,8DAA8D;QAC9D,MAAM,SAAS,GAAG,GAAG,QAAQ,GAAG,GAAG,KAAK,SAAS,EAAE,CAAA;QAEnD,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAA;KAC7B;IAAC,OAAM,EAAE,EAAE;QACV,OAAO,CAAC,IAAI,GAAG,UAAU,EAAE,CAAC,OAAO,QAAQ,CAAA;KAC5C;AAEH,CAAC;AA3CD,8CA2CC","sourcesContent":["import FormData from 'form-data'\nimport fetch from 'node-fetch'\nimport { config } from '@things-factory/env'\n\nconst querystring = require('querystring')\nconst debug = require('debug')('things-factory:dataset:shiny-report')\nconst dataReportConfig = config.get('dataReport')\nconst {\n  shiny: {\n    endpoint: { protocol: PROTOCOL, host: HOST, port: PORT },\n    datasource: { database: DATABASE }\n  }\n} = Object.assign({\n  shiny: {\n    endpoint: {},\n    datasource: {}\n  }}, dataReportConfig)\n\n\nexport async function renderShinyReport(context: any) {\n  debug('render:context', context)\n  \n  try {\n    const { access_token: token } = querystring.parse(context.header.cookie, ';')\n    const {\n      state: { domain },\n      query,\n      response,\n    } = context\n    \n    const urlParams = querystring.stringify({ \n      token,\n      ...query, \n      ...{ database: DATABASE,  \n      domain: domain?.subdomain }\n    })\n    \n    // const jsonParams = JSON.stringify({ \n    //   ...query, \n    //   ...{ database: DATABASE,  \n    //   domain: domain?.subdomain }\n    // })\n    \n    const protocol = `${PROTOCOL || 'http'}://`\n    const host = `${HOST}:${PORT}/`\n    const subpath = query?.reportView || ''\n\n    if (!subpath) {\n      return context.body = ''\n    }\n\n    // filter not empty and join '/'\n    const url = host.split('/').concat(subpath.split('/'))\n      .filter(x => x).join('/')\n    // const reportUrl = `${protocol}${url}/?params=${jsonParams}`\n    const reportUrl = `${protocol}${url}/?${urlParams}`\n\n    response.redirect(reportUrl)\n  } catch(ex) {\n    context.body = `Error: ${ex.message} || ''`\n  }\n  \n}\n"]}

package/dist-server/routes.js

@@ -4,6 +4,7 @@ const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
 const create_data_sample_1 = require("./controllers/create-data-sample");
 const jasper_report_1 = require("./controllers/jasper-report");
+const shiny_report_1 = require("./controllers/shiny-report");
 const data_sensor_1 = require("./service/data-sensor/data-sensor");
 process.on('bootstrap-module-global-public-route', (app, globalPublicRouter) => {
     /*
@@ -73,5 +74,12 @@ process.on('bootstrap-module-domain-private-route', (app, domainPrivateRouter) =
     domainPrivateRouter.get('/data-report/jasper', async (context, next) => {
         context.body = await (0, jasper_report_1.renderJasperReport)(context);
     });
+    domainPrivateRouter.get('/data-report/shiny', async (context, next) => {
+        await (0, shiny_report_1.renderShinyReport)(context);
+    });
+    domainPrivateRouter.get('/data-report/:reportType', async (context, next) => {
+        let { reportType } = context.params;
+        context.body = `${reportType} Not Implemented.`;
+    });
 });
 //# sourceMappingURL=routes.js.map

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 { getConnection } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\n\nimport { createDataSample } from './controllers/create-data-sample'\nimport { renderJasperReport } from './controllers/jasper-report'\nimport { DataSensor } from './service/data-sensor/data-sensor'\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 || !data) {\n      throw new Error(`deviceId(${deviceId}) and data(${JSON.stringify(data)}) properties are mandatory`)\n    }\n\n    // make new data-sample\n    await getConnection().transaction(async tx => {\n      // find sensor through deviceId\n      const sensor = await tx.getRepository(DataSensor).findOne({\n        where: { deviceId },\n        relations: ['domain', 'appliance', 'dataSet']\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      if (!sensor.dataSet) {\n        throw new Error(`DataSet of the sensor given deviceId(${deviceId}) is not set up`)\n      }\n\n      const domain = sensor.domain\n      const dataSet = sensor.dataSet\n      const user: User = await tx.getRepository(User).findOne({\n        where: {\n          reference: sensor.appliance.id,\n          userType: 'appliance'\n        }\n      })\n\n      return await createDataSample(\n        {\n          dataSet,\n          data,\n          rawData,\n          source: deviceId,\n          collectedAt: new Date(timestamp)\n        },\n        { state: { domain, user, tx } }\n      )\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"]}
+{"version":3,"file":"routes.js","sourceRoot":"","sources":["../server/routes.ts"],"names":[],"mappings":";;AAAA,qCAAuC;AAEvC,yDAAgD;AAEhD,yEAAmE;AACnE,+DAAgE;AAChE,6DAA8D;AAC9D,mEAA8D;AAE9D,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,IAAI,CAAC,IAAI,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,YAAY,QAAQ,cAAc,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;SACpG;QAED,uBAAuB;QACvB,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC3C,+BAA+B;YAC/B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAU,CAAC,CAAC,OAAO,CAAC;gBACxD,KAAK,EAAE,EAAE,QAAQ,EAAE;gBACnB,SAAS,EAAE,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,CAAC;aAC9C,CAAC,CAAA;YAEF,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,gCAAgC,QAAQ,aAAa,CAAC,CAAA;aACvE;YAED,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBAClB,MAAM,IAAI,KAAK,CAAC,sCAAsC,QAAQ,iBAAiB,CAAC,CAAA;aACjF;YAED,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;gBACrB,MAAM,IAAI,KAAK,CAAC,0CAA0C,QAAQ,iBAAiB,CAAC,CAAA;aACrF;YAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;gBACnB,MAAM,IAAI,KAAK,CAAC,wCAAwC,QAAQ,iBAAiB,CAAC,CAAA;aACnF;YAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;YAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAA;YAC9B,MAAM,IAAI,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC;gBACtD,KAAK,EAAE;oBACL,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE;oBAC9B,QAAQ,EAAE,WAAW;iBACtB;aACF,CAAC,CAAA;YAEF,OAAO,MAAM,IAAA,qCAAgB,EAC3B;gBACE,OAAO;gBACP,IAAI;gBACJ,OAAO;gBACP,MAAM,EAAE,QAAQ;gBAChB,WAAW,EAAE,IAAI,IAAI,CAAC,SAAS,CAAC;aACjC,EACD,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,EAAE,CAChC,CAAA;QACH,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,kCAAkB,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,gCAAiB,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 { getConnection } from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\n\nimport { createDataSample } from './controllers/create-data-sample'\nimport { renderJasperReport } from './controllers/jasper-report'\nimport { renderShinyReport } from './controllers/shiny-report'\nimport { DataSensor } from './service/data-sensor/data-sensor'\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 || !data) {\n      throw new Error(`deviceId(${deviceId}) and data(${JSON.stringify(data)}) properties are mandatory`)\n    }\n\n    // make new data-sample\n    await getConnection().transaction(async tx => {\n      // find sensor through deviceId\n      const sensor = await tx.getRepository(DataSensor).findOne({\n        where: { deviceId },\n        relations: ['domain', 'appliance', 'dataSet']\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      if (!sensor.dataSet) {\n        throw new Error(`DataSet of the sensor given deviceId(${deviceId}) is not set up`)\n      }\n\n      const domain = sensor.domain\n      const dataSet = sensor.dataSet\n      const user: User = await tx.getRepository(User).findOne({\n        where: {\n          reference: sensor.appliance.id,\n          userType: 'appliance'\n        }\n      })\n\n      return await createDataSample(\n        {\n          dataSet,\n          data,\n          rawData,\n          source: deviceId,\n          collectedAt: new Date(timestamp)\n        },\n        { state: { domain, user, tx } }\n      )\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-key-set/data-key-set-mutation.js

@@ -26,7 +26,7 @@ let DataKeySetMutation = class DataKeySetMutation {
         const { domain, user, tx } = context.state;
         const repository = tx.getRepository(data_key_set_1.DataKeySet);
         const dataKeySet = await repository.findOne({
-            where: { domain, id }
+            where: { domain: { id: domain.id }, id }
         });
         const result = await repository.save(Object.assign(Object.assign(Object.assign({}, dataKeySet), patch), { updater: user }));
         if (patch.thumbnail) {
@@ -66,7 +66,7 @@ let DataKeySetMutation = class DataKeySetMutation {
         if (_updateRecords.length > 0) {
             for (let i = 0; i < _updateRecords.length; i++) {
                 const updateRecord = _updateRecords[i];
-                const dataKeySet = await dataKeySetRepo.findOne(updateRecord.id);
+                const dataKeySet = await dataKeySetRepo.findOneBy({ id: updateRecord.id });
                 const result = await dataKeySetRepo.save(Object.assign(Object.assign(Object.assign({}, dataKeySet), updateRecord), { updater: user }));
                 if (updateRecord.thumbnail) {
                     await (0, attachment_base_1.deleteAttachmentsByRef)(null, { refBys: [result.id] }, context);
@@ -85,14 +85,14 @@ let DataKeySetMutation = class DataKeySetMutation {
     }
     async deleteDataKeySet(id, context) {
         const { domain, tx } = context.state;
-        await tx.getRepository(data_key_set_1.DataKeySet).delete({ domain, id });
+        await tx.getRepository(data_key_set_1.DataKeySet).delete({ domain: { id: domain.id }, id });
         await (0, attachment_base_1.deleteAttachmentsByRef)(null, { refBys: [id] }, context);
         return true;
     }
     async deleteDataKeySets(ids, context) {
         const { domain, tx } = context.state;
         await tx.getRepository(data_key_set_1.DataKeySet).delete({
-            domain,
+            domain: { id: domain.id },
             id: (0, typeorm_1.In)(ids)
         });
         await (0, attachment_base_1.deleteAttachmentsByRef)(null, { refBys: ids }, context);

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

@@ -1 +1 @@
-{"version":3,"file":"data-key-set-mutation.js","sourceRoot":"","sources":["../../../server/service/data-key-set/data-key-set-mutation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'\nimport { getRepository, In } from 'typeorm'\n\nimport { createAttachment, deleteAttachmentsByRef } from '@things-factory/attachment-base'\n\nimport { DataKeySet } from './data-key-set'\nimport { NewDataKeySet, DataKeySetPatch } from './data-key-set-type'\n\n@Resolver(DataKeySet)\nexport class DataKeySetMutation {\n  @Directive('@transaction')\n  @Mutation(returns => DataKeySet, { description: 'To create new DataKeySet' })\n  async createDataKeySet(@Arg('dataKeySet') dataKeySet: NewDataKeySet, @Ctx() context: any): Promise<DataKeySet> {\n    const { domain, user, tx } = context.state\n\n    const result = await tx.getRepository(DataKeySet).save({\n      ...dataKeySet,\n      domain,\n      creator: user,\n      updater: user\n    })\n\n    if (dataKeySet.thumbnail) {\n      await createAttachment(\n        null,\n        {\n          attachment: {\n            file: dataKeySet.thumbnail,\n            refType: DataKeySet.name,\n            refBy: result.id\n          }\n        },\n        context\n      )\n    }\n\n    return result\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => DataKeySet, { description: 'To modify DataKeySet information' })\n  async updateDataKeySet(\n    @Arg('id') id: string,\n    @Arg('patch') patch: DataKeySetPatch,\n    @Ctx() context: any\n  ): Promise<DataKeySet> {\n    const { domain, user, tx } = context.state\n\n    const repository = tx.getRepository(DataKeySet)\n    const dataKeySet = await repository.findOne({\n      where: { domain, id }\n    })\n\n    const result = await repository.save({\n      ...dataKeySet,\n      ...patch,\n      updater: user\n    })\n\n    if (patch.thumbnail) {\n      await deleteAttachmentsByRef(null, { refBys: [result.id] }, context)\n      await createAttachment(\n        null,\n        {\n          attachment: {\n            file: patch.thumbnail,\n            refType: DataKeySet.name,\n            refBy: result.id\n          }\n        },\n        context\n      )\n    }\n\n    return result\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => [DataKeySet], { description: \"To modify multiple DataKeySets' information\" })\n  async updateMultipleDataKeySet(\n    @Arg('patches', type => [DataKeySetPatch]) patches: DataKeySetPatch[],\n    @Ctx() context: any\n  ): Promise<DataKeySet[]> {\n    const { domain, user, tx } = context.state\n\n    let results = []\n    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')\n    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')\n    const dataKeySetRepo = tx.getRepository(DataKeySet)\n\n    if (_createRecords.length > 0) {\n      for (let i = 0; i < _createRecords.length; i++) {\n        const newRecord = _createRecords[i]\n\n        const result = await dataKeySetRepo.save({\n          ...newRecord,\n          domain,\n          creator: user,\n          updater: user\n        })\n\n        if (newRecord.thumbnail) {\n          await createAttachment(\n            null,\n            {\n              attachment: {\n                file: newRecord.thumbnail,\n                refType: DataKeySet.name,\n                refBy: result.id\n              }\n            },\n            context\n          )\n        }\n\n        results.push({ ...result, cuFlag: '+' })\n      }\n    }\n\n    if (_updateRecords.length > 0) {\n      for (let i = 0; i < _updateRecords.length; i++) {\n        const updateRecord = _updateRecords[i]\n        const dataKeySet = await dataKeySetRepo.findOne(updateRecord.id)\n\n        const result = await dataKeySetRepo.save({\n          ...dataKeySet,\n          ...updateRecord,\n          updater: user\n        })\n\n        if (updateRecord.thumbnail) {\n          await deleteAttachmentsByRef(null, { refBys: [result.id] }, context)\n          await createAttachment(\n            null,\n            {\n              attachment: {\n                file: updateRecord.thumbnail,\n                refType: DataKeySet.name,\n                refBy: result.id\n              }\n            },\n            context\n          )\n        }\n\n        results.push({ ...result, cuFlag: 'M' })\n      }\n    }\n\n    return results\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To delete DataKeySet' })\n  async deleteDataKeySet(@Arg('id') id: string, @Ctx() context: any): Promise<boolean> {\n    const { domain, tx } = context.state\n\n    await tx.getRepository(DataKeySet).delete({ domain, id })\n    await deleteAttachmentsByRef(null, { refBys: [id] }, context)\n\n    return true\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To delete multiple DataKeySets' })\n  async deleteDataKeySets(\n    @Arg('ids', type => [String]) ids: string[],\n    @Ctx() context: any\n  ): Promise<boolean> {\n    const { domain, tx } = context.state\n\n    await tx.getRepository(DataKeySet).delete({\n      domain,\n      id: In(ids)\n    })\n\n    await deleteAttachmentsByRef(null, { refBys: ids }, context)\n\n    return true\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To import multiple DataKeySets' })\n  async importDataKeySets(\n    @Arg('dataKeySets', type => [DataKeySetPatch]) dataKeySets: DataKeySetPatch[],\n    @Ctx() context: any\n  ): Promise<boolean> {\n    const { domain, tx } = context.state\n\n    await Promise.all(\n      dataKeySets.map(async (dataKeySet: DataKeySetPatch) => {\n        const createdDataKeySet: DataKeySet = await tx.getRepository(DataKeySet).save({ domain, ...dataKeySet })\n      })\n    )\n\n    return true\n  }\n}\n"]}
+{"version":3,"file":"data-key-set-mutation.js","sourceRoot":"","sources":["../../../server/service/data-key-set/data-key-set-mutation.ts"],"names":[],"mappings":"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","sourcesContent":["import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'\nimport { In } from 'typeorm'\n\nimport { createAttachment, deleteAttachmentsByRef } from '@things-factory/attachment-base'\n\nimport { DataKeySet } from './data-key-set'\nimport { DataKeySetPatch, NewDataKeySet } from './data-key-set-type'\n\n@Resolver(DataKeySet)\nexport class DataKeySetMutation {\n  @Directive('@transaction')\n  @Mutation(returns => DataKeySet, { description: 'To create new DataKeySet' })\n  async createDataKeySet(\n    @Arg('dataKeySet') dataKeySet: NewDataKeySet,\n    @Ctx() context: ResolverContext\n  ): Promise<DataKeySet> {\n    const { domain, user, tx } = context.state\n\n    const result = await tx.getRepository(DataKeySet).save({\n      ...dataKeySet,\n      domain,\n      creator: user,\n      updater: user\n    })\n\n    if (dataKeySet.thumbnail) {\n      await createAttachment(\n        null,\n        {\n          attachment: {\n            file: dataKeySet.thumbnail,\n            refType: DataKeySet.name,\n            refBy: result.id\n          }\n        },\n        context\n      )\n    }\n\n    return result\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => DataKeySet, { description: 'To modify DataKeySet information' })\n  async updateDataKeySet(\n    @Arg('id') id: string,\n    @Arg('patch') patch: DataKeySetPatch,\n    @Ctx() context: ResolverContext\n  ): Promise<DataKeySet> {\n    const { domain, user, tx } = context.state\n\n    const repository = tx.getRepository(DataKeySet)\n    const dataKeySet = await repository.findOne({\n      where: { domain: { id: domain.id }, id }\n    })\n\n    const result = await repository.save({\n      ...dataKeySet,\n      ...patch,\n      updater: user\n    })\n\n    if (patch.thumbnail) {\n      await deleteAttachmentsByRef(null, { refBys: [result.id] }, context)\n      await createAttachment(\n        null,\n        {\n          attachment: {\n            file: patch.thumbnail,\n            refType: DataKeySet.name,\n            refBy: result.id\n          }\n        },\n        context\n      )\n    }\n\n    return result\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => [DataKeySet], { description: \"To modify multiple DataKeySets' information\" })\n  async updateMultipleDataKeySet(\n    @Arg('patches', type => [DataKeySetPatch]) patches: DataKeySetPatch[],\n    @Ctx() context: ResolverContext\n  ): Promise<DataKeySet[]> {\n    const { domain, user, tx } = context.state\n\n    let results = []\n    const _createRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === '+')\n    const _updateRecords = patches.filter((patch: any) => patch.cuFlag.toUpperCase() === 'M')\n    const dataKeySetRepo = tx.getRepository(DataKeySet)\n\n    if (_createRecords.length > 0) {\n      for (let i = 0; i < _createRecords.length; i++) {\n        const newRecord = _createRecords[i]\n\n        const result = await dataKeySetRepo.save({\n          ...newRecord,\n          domain,\n          creator: user,\n          updater: user\n        })\n\n        if (newRecord.thumbnail) {\n          await createAttachment(\n            null,\n            {\n              attachment: {\n                file: newRecord.thumbnail,\n                refType: DataKeySet.name,\n                refBy: result.id\n              }\n            },\n            context\n          )\n        }\n\n        results.push({ ...result, cuFlag: '+' })\n      }\n    }\n\n    if (_updateRecords.length > 0) {\n      for (let i = 0; i < _updateRecords.length; i++) {\n        const updateRecord = _updateRecords[i]\n        const dataKeySet = await dataKeySetRepo.findOneBy({ id: updateRecord.id })\n\n        const result = await dataKeySetRepo.save({\n          ...dataKeySet,\n          ...updateRecord,\n          updater: user\n        })\n\n        if (updateRecord.thumbnail) {\n          await deleteAttachmentsByRef(null, { refBys: [result.id] }, context)\n          await createAttachment(\n            null,\n            {\n              attachment: {\n                file: updateRecord.thumbnail,\n                refType: DataKeySet.name,\n                refBy: result.id\n              }\n            },\n            context\n          )\n        }\n\n        results.push({ ...result, cuFlag: 'M' })\n      }\n    }\n\n    return results\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To delete DataKeySet' })\n  async deleteDataKeySet(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<boolean> {\n    const { domain, tx } = context.state\n\n    await tx.getRepository(DataKeySet).delete({ domain: { id: domain.id }, id })\n    await deleteAttachmentsByRef(null, { refBys: [id] }, context)\n\n    return true\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To delete multiple DataKeySets' })\n  async deleteDataKeySets(\n    @Arg('ids', type => [String]) ids: string[],\n    @Ctx() context: ResolverContext\n  ): Promise<boolean> {\n    const { domain, tx } = context.state\n\n    await tx.getRepository(DataKeySet).delete({\n      domain: { id: domain.id },\n      id: In(ids)\n    })\n\n    await deleteAttachmentsByRef(null, { refBys: ids }, context)\n\n    return true\n  }\n\n  @Directive('@transaction')\n  @Mutation(returns => Boolean, { description: 'To import multiple DataKeySets' })\n  async importDataKeySets(\n    @Arg('dataKeySets', type => [DataKeySetPatch]) dataKeySets: DataKeySetPatch[],\n    @Ctx() context: ResolverContext\n  ): Promise<boolean> {\n    const { domain, tx } = context.state\n\n    await Promise.all(\n      dataKeySets.map(async (dataKeySet: DataKeySetPatch) => {\n        const createdDataKeySet: DataKeySet = await tx.getRepository(DataKeySet).save({ domain, ...dataKeySet })\n      })\n    )\n\n    return true\n  }\n}\n"]}

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

@@ -1,10 +1,8 @@
 "use strict";
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataKeySetQuery = void 0;
 const tslib_1 = require("tslib");
 const type_graphql_1 = require("type-graphql");
-const typeorm_1 = require("typeorm");
 const attachment_base_1 = require("@things-factory/attachment-base");
 const auth_base_1 = require("@things-factory/auth-base");
 const shell_1 = require("@things-factory/shell");
@@ -13,8 +11,8 @@ const data_key_set_type_1 = require("./data-key-set-type");
 let DataKeySetQuery = class DataKeySetQuery {
     async dataKeySet(id, context) {
         const { domain } = context.state;
-        return await (0, typeorm_1.getRepository)(data_key_set_1.DataKeySet).findOne({
-            where: { domain, id }
+        return await (0, shell_1.getRepository)(data_key_set_1.DataKeySet).findOne({
+            where: { domain: { id: domain.id }, id }
         });
     }
     async dataKeySets(params, context) {
@@ -22,16 +20,16 @@ let DataKeySetQuery = class DataKeySetQuery {
         const queryBuilder = (0, shell_1.getQueryBuilderFromListParams)({
             domain,
             params,
-            repository: await (0, typeorm_1.getRepository)(data_key_set_1.DataKeySet),
+            repository: await (0, shell_1.getRepository)(data_key_set_1.DataKeySet),
             searchables: ['name', 'description']
         });
         const [items, total] = await queryBuilder.getManyAndCount();
         return { items, total };
     }
     async thumbnail(dataKeySet) {
-        const attachment = await (0, typeorm_1.getRepository)(attachment_base_1.Attachment).findOne({
+        const attachment = await (0, shell_1.getRepository)(attachment_base_1.Attachment).findOne({
             where: {
-                domain: dataKeySet.domainId,
+                domain: { id: dataKeySet.domainId },
                 refType: data_key_set_1.DataKeySet.name,
                 refBy: dataKeySet.id
             }
@@ -39,13 +37,13 @@ let DataKeySetQuery = class DataKeySetQuery {
         return attachment === null || attachment === void 0 ? void 0 : attachment.fullpath;
     }
     async domain(dataKeySet) {
-        return await (0, typeorm_1.getRepository)(shell_1.Domain).findOne(dataKeySet.domainId);
+        return await (0, shell_1.getRepository)(shell_1.Domain).findOneBy({ id: dataKeySet.domainId });
     }
     async updater(dataKeySet) {
-        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(dataKeySet.updaterId);
+        return await (0, shell_1.getRepository)(auth_base_1.User).findOneBy({ id: dataKeySet.updaterId });
     }
     async creator(dataKeySet) {
-        return await (0, typeorm_1.getRepository)(auth_base_1.User).findOne(dataKeySet.creatorId);
+        return await (0, shell_1.getRepository)(auth_base_1.User).findOneBy({ id: dataKeySet.creatorId });
     }
 };
 tslib_1.__decorate([
@@ -61,7 +59,7 @@ tslib_1.__decorate([
     tslib_1.__param(0, (0, type_graphql_1.Args)()),
     tslib_1.__param(1, (0, type_graphql_1.Ctx)()),
     tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [typeof (_a = typeof shell_1.ListParam !== "undefined" && shell_1.ListParam) === "function" ? _a : Object, Object]),
+    tslib_1.__metadata("design:paramtypes", [shell_1.ListParam, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], DataKeySetQuery.prototype, "dataKeySets", null);
 tslib_1.__decorate([

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 { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'\nimport { getRepository } from 'typeorm'\n\nimport { Attachment } from '@things-factory/attachment-base'\nimport { User } from '@things-factory/auth-base'\nimport { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'\n\nimport { DataKeySet } from './data-key-set'\nimport { DataKeySetList } from './data-key-set-type'\n\n@Resolver(DataKeySet)\nexport class DataKeySetQuery {\n  @Query(returns => DataKeySet!, { nullable: true, description: 'To fetch a DataKeySet' })\n  async dataKeySet(@Arg('id') id: string, @Ctx() context: any): Promise<DataKeySet> {\n    const { domain } = context.state\n\n    return await getRepository(DataKeySet).findOne({\n      where: { domain, id }\n    })\n  }\n\n  @Query(returns => DataKeySetList, { description: 'To fetch multiple DataKeySets' })\n  async dataKeySets(@Args() params: ListParam, @Ctx() context: any): 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  async thumbnail(@Root() dataKeySet: DataKeySet): Promise<string | undefined> {\n    const attachment: Attachment = await getRepository(Attachment).findOne({\n      where: {\n        domain: dataKeySet.domainId,\n        refType: DataKeySet.name,\n        refBy: dataKeySet.id\n      }\n    })\n\n    return attachment?.fullpath\n  }\n\n  @FieldResolver(type => Domain)\n  async domain(@Root() dataKeySet: DataKeySet): Promise<Domain> {\n    return await getRepository(Domain).findOne(dataKeySet.domainId)\n  }\n\n  @FieldResolver(type => User)\n  async updater(@Root() dataKeySet: DataKeySet): Promise<User> {\n    return await getRepository(User).findOne(dataKeySet.updaterId)\n  }\n\n  @FieldResolver(type => User)\n  async creator(@Root() dataKeySet: DataKeySet): Promise<User> {\n    return await getRepository(User).findOne(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 { 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'\nimport { DataKeySetList } from './data-key-set-type'\n\n@Resolver(DataKeySet)\nexport class DataKeySetQuery {\n  @Query(returns => DataKeySet!, { nullable: true, description: 'To fetch a DataKeySet' })\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: domain.id }, id }\n    })\n  }\n\n  @Query(returns => DataKeySetList, { description: 'To fetch multiple DataKeySets' })\n  async dataKeySets(@Args() params: ListParam, @Ctx() context: ResolverContext): 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  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  async domain(@Root() dataKeySet: DataKeySet): Promise<Domain> {\n    return await getRepository(Domain).findOneBy({ id: dataKeySet.domainId })\n  }\n\n  @FieldResolver(type => User)\n  async updater(@Root() dataKeySet: DataKeySet): Promise<User> {\n    return await getRepository(User).findOneBy({ id: dataKeySet.updaterId })\n  }\n\n  @FieldResolver(type => User)\n  async creator(@Root() dataKeySet: DataKeySet): Promise<User> {\n    return await getRepository(User).findOneBy({ id: dataKeySet.creatorId })\n  }\n}\n"]}

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

@@ -6,6 +6,7 @@ const GraphQLUpload_js_1 = tslib_1.__importDefault(require("graphql-upload/Graph
 const type_graphql_1 = require("type-graphql");
 const data_key_item_type_1 = require("./data-key-item-type");
 const data_key_set_1 = require("./data-key-set");
+const data_set_1 = require("../data-set/data-set");
 let NewDataKeySet = class NewDataKeySet {
 };
 tslib_1.__decorate([
@@ -20,6 +21,14 @@ tslib_1.__decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     tslib_1.__metadata("design:type", Boolean)
 ], NewDataKeySet.prototype, "active", void 0);
+tslib_1.__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    tslib_1.__metadata("design:type", String)
+], NewDataKeySet.prototype, "reportType", void 0);
+tslib_1.__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    tslib_1.__metadata("design:type", String)
+], NewDataKeySet.prototype, "reportView", void 0);
 tslib_1.__decorate([
     (0, type_graphql_1.Field)(type => [data_key_item_type_1.DataKeyItemPatch], { nullable: true }),
     tslib_1.__metadata("design:type", Array)
@@ -50,6 +59,14 @@ tslib_1.__decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     tslib_1.__metadata("design:type", Boolean)
 ], DataKeySetPatch.prototype, "active", void 0);
+tslib_1.__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    tslib_1.__metadata("design:type", String)
+], DataKeySetPatch.prototype, "reportType", void 0);
+tslib_1.__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    tslib_1.__metadata("design:type", String)
+], DataKeySetPatch.prototype, "reportView", void 0);
 tslib_1.__decorate([
     (0, type_graphql_1.Field)(type => [data_key_item_type_1.DataKeyItemPatch], { nullable: true }),
     tslib_1.__metadata("design:type", Array)

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

@@ -1 +1 @@
-{"version":3,"file":"data-key-set-type.js","sourceRoot":"","sources":["../../../server/service/data-key-set/data-key-set-type.ts"],"names":[],"mappings":";;;;AACA,+FAA2D;AAC3D,+CAAoE;AAEpE,6DAAuD;AACvD,iDAA2C;AAG3C,IAAa,aAAa,GAA1B,MAAa,aAAa;CAezB,CAAA;AAbC;IADC,IAAA,oBAAK,GAAE;;2CACI;AAGZ;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACV;AAGhB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,qCAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACrB;AAGjC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,0BAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC3B;AAdX,aAAa;IADzB,IAAA,wBAAS,GAAE;GACC,aAAa,CAezB;AAfY,sCAAa;AAkB1B,IAAa,eAAe,GAA5B,MAAa,eAAe;CAqB3B,CAAA;AAnBC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC3B;AAGX;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACV;AAGhB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,qCAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACrB;AAGjC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,0BAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAC3B;AAGtB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACX;AApBJ,eAAe;IAD3B,IAAA,wBAAS,GAAE;GACC,eAAe,CAqB3B;AArBY,0CAAe;AAwB5B,IAAa,cAAc,GAA3B,MAAa,cAAc;CAM1B,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,yBAAU,CAAC,CAAC;;6CACT;AAGnB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;6CACN;AALF,cAAc;IAD1B,IAAA,yBAAU,GAAE;GACA,cAAc,CAM1B;AANY,wCAAc","sourcesContent":["import type { FileUpload } from 'graphql-upload/GraphQLUpload.js'\nimport GraphQLUpload from 'graphql-upload/GraphQLUpload.js'\nimport { Field, ID, InputType, Int, ObjectType } from 'type-graphql'\n\nimport { DataKeyItemPatch } from './data-key-item-type'\nimport { DataKeySet } from './data-key-set'\n\n@InputType()\nexport class NewDataKeySet {\n  @Field()\n  name: string\n\n  @Field({ nullable: true })\n  description?: string\n\n  @Field({ nullable: true })\n  active?: boolean\n\n  @Field(type => [DataKeyItemPatch], { nullable: true })\n  dataKeyItems?: DataKeyItemPatch[]\n\n  @Field(type => GraphQLUpload, { nullable: true })\n  thumbnail?: FileUpload\n}\n\n@InputType()\nexport class DataKeySetPatch {\n  @Field(type => ID, { nullable: true })\n  id?: string\n\n  @Field({ nullable: true })\n  name?: string\n\n  @Field({ nullable: true })\n  description?: string\n\n  @Field({ nullable: true })\n  active?: boolean\n\n  @Field(type => [DataKeyItemPatch], { nullable: true })\n  dataKeyItems?: DataKeyItemPatch[]\n\n  @Field(type => GraphQLUpload, { nullable: true })\n  thumbnail?: FileUpload\n\n  @Field({ nullable: true })\n  cuFlag?: string\n}\n\n@ObjectType()\nexport class DataKeySetList {\n  @Field(type => [DataKeySet])\n  items: DataKeySet[]\n\n  @Field(type => Int)\n  total: number\n}\n"]}
+{"version":3,"file":"data-key-set-type.js","sourceRoot":"","sources":["../../../server/service/data-key-set/data-key-set-type.ts"],"names":[],"mappings":";;;;AACA,+FAA2D;AAC3D,+CAAoE;AAEpE,6DAAuD;AACvD,iDAA2C;AAC3C,mDAAwD;AAGxD,IAAa,aAAa,GAA1B,MAAa,aAAa;CAqBzB,CAAA;AAnBC;IADC,IAAA,oBAAK,GAAE;;2CACI;AAGZ;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACV;AAGhB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACI;AAG9B;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACP;AAGnB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,qCAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACrB;AAGjC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,0BAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC3B;AApBX,aAAa;IADzB,IAAA,wBAAS,GAAE;GACC,aAAa,CAqBzB;AArBY,sCAAa;AAwB1B,IAAa,eAAe,GAA5B,MAAa,eAAe;CA2B3B,CAAA;AAzBC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC3B;AAGX;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACb;AAGb;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACN;AAGpB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACV;AAGhB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACI;AAG9B;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACP;AAGnB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,qCAAgB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACrB;AAGjC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,0BAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDAC3B;AAGtB;IADC,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACX;AA1BJ,eAAe;IAD3B,IAAA,wBAAS,GAAE;GACC,eAAe,CA2B3B;AA3BY,0CAAe;AA8B5B,IAAa,cAAc,GAA3B,MAAa,cAAc;CAM1B,CAAA;AAJC;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,yBAAU,CAAC,CAAC;;6CACT;AAGnB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,kBAAG,CAAC;;6CACN;AALF,cAAc;IAD1B,IAAA,yBAAU,GAAE;GACA,cAAc,CAM1B;AANY,wCAAc","sourcesContent":["import type { FileUpload } from 'graphql-upload/GraphQLUpload.js'\nimport GraphQLUpload from 'graphql-upload/GraphQLUpload.js'\nimport { Field, ID, InputType, Int, ObjectType } from 'type-graphql'\n\nimport { DataKeyItemPatch } from './data-key-item-type'\nimport { DataKeySet } from './data-key-set'\nimport { DataSetReportType } from '../data-set/data-set'\n\n@InputType()\nexport class NewDataKeySet {\n  @Field()\n  name: string\n\n  @Field({ nullable: true })\n  description?: string\n\n  @Field({ nullable: true })\n  active?: boolean\n\n  @Field({ nullable: true })\n  reportType?: DataSetReportType\n\n  @Field({ nullable: true })\n  reportView?: string\n\n  @Field(type => [DataKeyItemPatch], { nullable: true })\n  dataKeyItems?: DataKeyItemPatch[]\n\n  @Field(type => GraphQLUpload, { nullable: true })\n  thumbnail?: FileUpload\n}\n\n@InputType()\nexport class DataKeySetPatch {\n  @Field(type => ID, { nullable: true })\n  id?: string\n\n  @Field({ nullable: true })\n  name?: string\n\n  @Field({ nullable: true })\n  description?: string\n\n  @Field({ nullable: true })\n  active?: boolean\n\n  @Field({ nullable: true })\n  reportType?: DataSetReportType\n\n  @Field({ nullable: true })\n  reportView?: string\n\n  @Field(type => [DataKeyItemPatch], { nullable: true })\n  dataKeyItems?: DataKeyItemPatch[]\n\n  @Field(type => GraphQLUpload, { nullable: true })\n  thumbnail?: FileUpload\n\n  @Field({ nullable: true })\n  cuFlag?: string\n}\n\n@ObjectType()\nexport class DataKeySetList {\n  @Field(type => [DataKeySet])\n  items: DataKeySet[]\n\n  @Field(type => Int)\n  total: number\n}\n"]}

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

@@ -1,5 +1,4 @@
 "use strict";
-var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataKeySet = void 0;
 const tslib_1 = require("tslib");
@@ -8,6 +7,7 @@ const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
 const shell_1 = require("@things-factory/shell");
 const data_key_item_type_1 = require("./data-key-item-type");
+const data_set_1 = require("../data-set/data-set");
 let DataKeySet = class DataKeySet {
 };
 tslib_1.__decorate([
@@ -18,7 +18,7 @@ tslib_1.__decorate([
 tslib_1.__decorate([
     (0, typeorm_1.ManyToOne)(type => shell_1.Domain),
     (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", typeof (_a = typeof shell_1.Domain !== "undefined" && shell_1.Domain) === "function" ? _a : Object)
+    tslib_1.__metadata("design:type", shell_1.Domain)
 ], DataKeySet.prototype, "domain", void 0);
 tslib_1.__decorate([
     (0, typeorm_1.RelationId)((dataKeySet) => dataKeySet.domain),
@@ -43,6 +43,16 @@ tslib_1.__decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     tslib_1.__metadata("design:type", Boolean)
 ], DataKeySet.prototype, "active", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    tslib_1.__metadata("design:type", String)
+], DataKeySet.prototype, "reportType", void 0);
+tslib_1.__decorate([
+    (0, typeorm_1.Column)({ nullable: true }),
+    (0, type_graphql_1.Field)({ nullable: true }),
+    tslib_1.__metadata("design:type", String)
+], DataKeySet.prototype, "reportView", void 0);
 tslib_1.__decorate([
     (0, typeorm_1.Column)('simple-json', { nullable: true }),
     (0, type_graphql_1.Field)(type => [data_key_item_type_1.DataKeyItem], { nullable: true }),
@@ -63,7 +73,7 @@ tslib_1.__decorate([
         nullable: true
     }),
     (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", typeof (_b = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _b : Object)
+    tslib_1.__metadata("design:type", auth_base_1.User)
 ], DataKeySet.prototype, "creator", void 0);
 tslib_1.__decorate([
     (0, typeorm_1.RelationId)((dataKeySet) => dataKeySet.creator),
@@ -74,7 +84,7 @@ tslib_1.__decorate([
         nullable: true
     }),
     (0, type_graphql_1.Field)({ nullable: true }),
-    tslib_1.__metadata("design:type", typeof (_c = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _c : Object)
+    tslib_1.__metadata("design:type", auth_base_1.User)
 ], DataKeySet.prototype, "updater", void 0);
 tslib_1.__decorate([
     (0, typeorm_1.RelationId)((dataKeySet) => dataKeySet.creator),

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

@@ -1 +1 @@
-{"version":3,"file":"data-key-set.js","sourceRoot":"","sources":["../../../server/service/data-key-set/data-key-set.ts"],"names":[],"mappings":";;;;;AAAA,+CAAoD;AACpD,qCASgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAE9C,6DAAkD;AAKlD,IAAa,UAAU,GAAvB,MAAa,UAAU;CA4DtB,CAAA;AAzDC;IAFC,IAAA,gCAAsB,EAAC,MAAM,CAAC;IAC9B,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,iBAAE,CAAC;;sCACC;AAInB;IAFC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;IACzB,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;0DACjB,cAAM,oBAAN,cAAM;0CAAA;AAGf;IADC,IAAA,oBAAU,EAAC,CAAC,UAAsB,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC;;4CACzC;AAIjB;IAFC,IAAA,gBAAM,GAAE;IACR,IAAA,oBAAK,GAAE;;wCACI;AAMZ;IAJC,IAAA,gBAAM,EAAC;QACN,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;+CACN;AAMpB;IAJC,IAAA,gBAAM,EAAC;QACN,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0CACV;AAIhB;IAFC,IAAA,gBAAM,EAAC,aAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACzC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC,gCAAW,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACtB;AAI3B;IAFC,IAAA,0BAAgB,GAAE;IAClB,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;sCACd,IAAI;6CAAA;AAIhB;IAFC,IAAA,0BAAgB,GAAE;IAClB,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;sCACd,IAAI;6CAAA;AAMhB;IAJC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;0DAChB,gBAAI,oBAAJ,gBAAI;2CAAA;AAGd;IADC,IAAA,oBAAU,EAAC,CAAC,UAAsB,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;;6CACzC;AAMlB;IAJC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;IACD,IAAA,oBAAK,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;0DAChB,gBAAI,oBAAJ,gBAAI;2CAAA;AAGd;IADC,IAAA,oBAAU,EAAC,CAAC,UAAsB,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;;6CACzC;AAGlB;IADC,IAAA,oBAAK,EAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CACxB;AA3DP,UAAU;IAHtB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,mBAAmB,EAAE,CAAC,UAAsB,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAC9G,IAAA,yBAAU,EAAC,EAAE,WAAW,EAAE,uBAAuB,EAAE,CAAC;GACxC,UAAU,CA4DtB;AA5DY,gCAAU","sourcesContent":["import { Field, ID, ObjectType } from 'type-graphql'\nimport {\n  Column,\n  CreateDateColumn,\n  Entity,\n  Index,\n  ManyToOne,\n  PrimaryGeneratedColumn,\n  RelationId,\n  UpdateDateColumn\n} from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { Domain } from '@things-factory/shell'\n\nimport { DataKeyItem } from './data-key-item-type'\n\n@Entity()\n@Index('ix_data_key_set_0', (dataKeySet: DataKeySet) => [dataKeySet.domain, dataKeySet.name], { unique: true })\n@ObjectType({ description: 'Entity for DataKeySet' })\nexport class DataKeySet {\n  @PrimaryGeneratedColumn('uuid')\n  @Field(type => ID)\n  readonly id: string\n\n  @ManyToOne(type => Domain)\n  @Field({ nullable: true })\n  domain?: Domain\n\n  @RelationId((dataKeySet: DataKeySet) => dataKeySet.domain)\n  domainId?: string\n\n  @Column()\n  @Field()\n  name: string\n\n  @Column({\n    nullable: true\n  })\n  @Field({ nullable: true })\n  description?: string\n\n  @Column({\n    nullable: true\n  })\n  @Field({ nullable: true })\n  active?: boolean\n\n  @Column('simple-json', { nullable: true })\n  @Field(type => [DataKeyItem], { nullable: true })\n  dataKeyItems: DataKeyItem[]\n\n  @CreateDateColumn()\n  @Field({ nullable: true })\n  createdAt?: Date\n\n  @UpdateDateColumn()\n  @Field({ nullable: true })\n  updatedAt?: Date\n\n  @ManyToOne(type => User, {\n    nullable: true\n  })\n  @Field({ nullable: true })\n  creator?: User\n\n  @RelationId((dataKeySet: DataKeySet) => dataKeySet.creator)\n  creatorId?: string\n\n  @ManyToOne(type => User, {\n    nullable: true\n  })\n  @Field({ nullable: true })\n  updater?: User\n\n  @RelationId((dataKeySet: DataKeySet) => dataKeySet.creator)\n  updaterId?: string\n\n  @Field(type => String, { nullable: true })\n  thumbnail?: string\n}\n"]}
+{"version":3,"file":"data-key-set.js","sourceRoot":"","sources":["../../../server/service/data-key-set/data-key-set.ts"],"names":[],"mappings":"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","sourcesContent":["import { Field, ID, ObjectType } from 'type-graphql'\nimport {\n  Column,\n  CreateDateColumn,\n  Entity,\n  Index,\n  ManyToOne,\n  PrimaryGeneratedColumn,\n  RelationId,\n  UpdateDateColumn\n} from 'typeorm'\n\nimport { User } from '@things-factory/auth-base'\nimport { Domain } from '@things-factory/shell'\n\nimport { DataKeyItem } from './data-key-item-type'\nimport { DataSetReportType } from '../data-set/data-set'\n\n@Entity()\n@Index('ix_data_key_set_0', (dataKeySet: DataKeySet) => [dataKeySet.domain, dataKeySet.name], { unique: true })\n@ObjectType({ description: 'Entity for DataKeySet' })\nexport class DataKeySet {\n  @PrimaryGeneratedColumn('uuid')\n  @Field(type => ID)\n  readonly id: string\n\n  @ManyToOne(type => Domain)\n  @Field({ nullable: true })\n  domain?: Domain\n\n  @RelationId((dataKeySet: DataKeySet) => dataKeySet.domain)\n  domainId?: string\n\n  @Column()\n  @Field()\n  name: string\n\n  @Column({\n    nullable: true\n  })\n  @Field({ nullable: true })\n  description?: string\n\n  @Column({\n    nullable: true\n  })\n  @Field({ nullable: true })\n  active?: boolean\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  reportType?: DataSetReportType\n\n  @Column({ nullable: true })\n  @Field({ nullable: true })\n  reportView?: string\n\n  @Column('simple-json', { nullable: true })\n  @Field(type => [DataKeyItem], { nullable: true })\n  dataKeyItems: DataKeyItem[]\n\n  @CreateDateColumn()\n  @Field({ nullable: true })\n  createdAt?: Date\n\n  @UpdateDateColumn()\n  @Field({ nullable: true })\n  updatedAt?: Date\n\n  @ManyToOne(type => User, {\n    nullable: true\n  })\n  @Field({ nullable: true })\n  creator?: User\n\n  @RelationId((dataKeySet: DataKeySet) => dataKeySet.creator)\n  creatorId?: string\n\n  @ManyToOne(type => User, {\n    nullable: true\n  })\n  @Field({ nullable: true })\n  updater?: User\n\n  @RelationId((dataKeySet: DataKeySet) => dataKeySet.creator)\n  updaterId?: string\n\n  @Field(type => String, { nullable: true })\n  thumbnail?: string\n}\n"]}

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

@@ -27,7 +27,7 @@ let DataOocMutation = class DataOocMutation {
         const { domain, user, tx } = context.state;
         const repository = tx.getRepository(data_ooc_1.DataOoc);
         const dataOoc = await repository.findOne({
-            where: { domain, id }
+            where: { domain: { id: domain.id }, id }
         });
         const state = patch.state || dataOoc.state;
         const history = dataOoc.history || [];