@things-factory/dataset 5.0.0-alpha.40 → 5.0.0-alpha.41

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

@@ -155,6 +155,10 @@ __decorate([
     (0, type_graphql_1.Field)({ nullable: true }),
     __metadata("design:type", String)
 ], DataSet.prototype, "reportView", void 0);
+__decorate([
+    (0, type_graphql_1.Field)({ nullable: true }),
+    __metadata("design:type", String)
+], DataSet.prototype, "reportTemplate", void 0);
 __decorate([
     (0, typeorm_1.Column)({
         nullable: true

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

@@ -1 +1 @@
-{"version":3,"file":"data-set.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"data-set.js","sourceRoot":"","sources":["../../../server/service/data-set/data-set.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "5.0.0-alpha.40",
+  "version": "5.0.0-alpha.41",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,22 +24,23 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@operato/app": "1.0.0-beta.7",
-    "@operato/data-grist": "1.0.0-beta.7",
-    "@operato/dataset": "1.0.0-beta.7",
-    "@operato/graphql": "1.0.0-beta.7",
-    "@operato/i18n": "1.0.0-beta.7",
-    "@operato/layout": "1.0.0-beta.7",
-    "@operato/shell": "1.0.0-beta.7",
-    "@operato/styles": "1.0.0-beta.7",
-    "@operato/utils": "1.0.0-beta.7",
-    "@things-factory/auth-base": "^5.0.0-alpha.40",
-    "@things-factory/board-service": "^5.0.0-alpha.40",
-    "@things-factory/env": "^5.0.0-alpha.40",
-    "@things-factory/shell": "^5.0.0-alpha.40",
-    "@things-factory/work-shift": "^5.0.0-alpha.40",
+    "@operato/app": "1.0.0-beta.9",
+    "@operato/data-grist": "1.0.0-beta.9",
+    "@operato/dataset": "1.0.0-beta.9",
+    "@operato/graphql": "1.0.0-beta.9",
+    "@operato/i18n": "1.0.0-beta.9",
+    "@operato/layout": "1.0.0-beta.9",
+    "@operato/shell": "1.0.0-beta.9",
+    "@operato/styles": "1.0.0-beta.9",
+    "@operato/utils": "1.0.0-beta.9",
+    "@things-factory/auth-base": "^5.0.0-alpha.41",
+    "@things-factory/aws-base": "^5.0.0-alpha.41",
+    "@things-factory/board-service": "^5.0.0-alpha.41",
+    "@things-factory/env": "^5.0.0-alpha.41",
+    "@things-factory/shell": "^5.0.0-alpha.41",
+    "@things-factory/work-shift": "^5.0.0-alpha.41",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.34"
   },
-  "gitHead": "c64462e85c9b744250f5649d28c0ec4bd56a1b38"
+  "gitHead": "f9ba0b3b997862b3d01c5b25338ce221d71f4fd7"
 }

package/server/controllers/jasper-report.ts

@@ -0,0 +1,130 @@
+import FormData from 'form-data'
+import fetch from 'node-fetch'
+
+import { STORAGE } from '@things-factory/attachment-base'
+import { AthenaController } from '@things-factory/aws-base'
+import { config } from '@things-factory/env'
+
+const dataReportConfig = config.get('dataReport')
+const { jasper: { endpoint: { protocol, host, port }, datasource: { database } } } = dataReportConfig
+
+/** author: ywnam123 */
+function transformValuesToRows(queryResult) {
+  var parseData = []
+    let index = 1
+    for (let i = 0; i < queryResult.Items.length; i++) {
+      var j = 0
+      const data = JSON.parse(queryResult.Items[i].data)
+      const spec = JSON.parse(queryResult.Items[i].spec)
+
+      for (let key in data) {
+        if (Array.isArray(data[key])) {
+          for (j = 0; j < data[key].length; j++) {
+            for (let specKey in spec) {
+              if (key === specKey) {
+                parseData.push({
+                  item: spec[specKey].name,
+                  index: index + j,
+                  value: String(data[key][j])
+                })
+              }
+            }
+          }
+        } else {
+          parseData.push({
+            item: key,
+            index,
+            value: String(data[key])
+          })
+        }
+      }
+      if (j !== 0) {
+        index = index + j
+      } else {
+        index = index + 1
+      }
+    }
+}
+
+/** @todo considering trasformation in lambda, as massive dataset */
+function pivotData(rows) {
+  var parseData = []
+  let index = 1
+  for (let i = 0; i < rows.length; i++) {
+    var j = 0
+    const data = JSON.parse(rows[i].data)
+    const spec = JSON.parse(rows[i].spec)
+
+    for (let key in data) {
+      /** @todo rule to display or not, about unspecified spec */
+      const value = data[key]
+      !(spec[key]?.hidden) && parseData.push({
+        item: spec[key]?.name || key,
+        index,
+        value: Array.isArray(value) ? value.join(', ') : value
+      })
+    }
+    if (j !== 0) {
+      index = index + j
+    } else {
+      index = index + 1
+    }
+  }
+
+  return parseData
+}
+
+const athenaClient = new AthenaController()
+async function queryAthena(params) {
+  const queryData = {
+    sql: `select data, spec, from_unixtime(collected_at/1000/1000) collected_at 
+    from ${params['table']} 
+    where domain='${params['domain']}' 
+    and datasetid = '${params['dataSetId']}'
+    and workdate >= '${params['fromWorkDate']}'
+    and workdate <= '${params['toWorkDate']}'
+    and workshift = '${params['workShift'] || 'NA'}'
+    order by collected_at`,
+    db: database
+  }
+  // and json_extract_scalar(data, '$.dauid') = 'A8032AD81730'
+
+  return await athenaClient.query(queryData)
+}
+export async function renderJasperReport(context: any) { 
+  const { state: { domain }, query } = context
+  const template = await STORAGE.readFile(query['template'] || 'dynamic_header_sample.jrxml', 'utf-8')
+  let templateType = 'crosstab'
+  let parsedData = []
+
+  query['domain'] = domain?.subdomain
+  const queryResult = await queryAthena(query)
+  const rows = queryResult.Items
+
+  if (templateType === 'crosstab') {
+    parsedData = pivotData(rows)
+  } else {
+    /** unused */
+    for (let i = 0; i < rows.length; i++) {
+      const data = JSON.parse(rows[i].data)
+      for (let key in data) {
+        if (Array.isArray(data[key])) {
+          data[key] = data[key].toString()
+        }
+      }
+      parsedData.push(data)
+    }
+  }
+
+  const formData = new FormData()
+  formData.append('template', template)
+  formData.append('jsonString', JSON.stringify(parsedData))
+
+  const reportUrl = `${protocol || 'http'}://${host}:${port}/rest/report/show_html`
+  const response = await fetch(reportUrl, {
+    method: 'POST',
+    body: formData
+  })
+
+  return await response.text()
+}

package/server/routes.ts

@@ -3,6 +3,7 @@ import { getConnection } from 'typeorm'
 import { User } from '@things-factory/auth-base'
 
 import { createDataSample } from './controllers/create-data-sample'
+import { renderJasperReport } from './controllers/jasper-report'
 import { DataSensor } from './service/data-sensor/data-sensor'
 
 const debug = require('debug')('things-factory:dataset:routes')
@@ -87,4 +88,7 @@ process.on('bootstrap-module-domain-private-route' as any, (app, domainPrivateRo
   /*
    * can add domain private routes to application (auth required, tenancy required)
    */
+  domainPrivateRouter.get('/data-report/jasper', async (context, next) => {
+    context.body = await renderJasperReport(context)
+  })
 })

package/server/service/data-set/data-set-mutation.ts

@@ -3,6 +3,7 @@ import { EntityManager, In } from 'typeorm'
 import uuid from 'uuid/v4'
 
 import { Domain } from '@things-factory/shell'
+import { createAttachment, deleteAttachmentsByRef } from '@things-factory/attachment-base'
 
 import { DataItem } from '../data-item/data-item'
 import { DataSet } from './data-set'
@@ -16,12 +17,16 @@ export class DataSetMutation {
   async createDataSet(@Arg('dataSet') dataSet: NewDataSet, @Ctx() context: any): Promise<DataSet> {
     const { domain, user, tx } = context.state
 
-    return await tx.getRepository(DataSet).save({
+    const result = await tx.getRepository(DataSet).save({
       ...dataSet,
       domain,
       creator: user,
       updater: user
     })
+
+    await this._createAttachment(context, dataSet.reportTemplate, { refId: result.id, cuFlag: '+' })
+
+    return result
   }
 
   @Directive('@privilege(category: "data-set", privilege: "mutation", domainOwnerGranted: true)')
@@ -35,11 +40,15 @@ export class DataSetMutation {
       where: { domain, id }
     })
 
-    return await repository.save({
+    const result = await repository.save({
       ...dataSet,
       ...patch,
       updater: user
     })
+
+    await this._createAttachment(context, dataSet.reportTemplate, { refId: result.id, cuFlag: 'M' })
+
+    return result
   }
 
   @Directive('@privilege(category: "data-set", privilege: "mutation", domainOwnerGranted: true)')
@@ -57,6 +66,7 @@ export class DataSetMutation {
     const dataSetRepo = tx.getRepository(DataSet)
 
     if (_createRecords.length > 0) {
+      const cuFlag = '+'
       for (let i = 0; i < _createRecords.length; i++) {
         const newRecord = _createRecords[i]
 
@@ -67,11 +77,14 @@ export class DataSetMutation {
           updater: user
         })
 
-        results.push({ ...result, cuFlag: '+' })
+        await this._createAttachment(context, newRecord.reportTemplate, { refId: result.id, cuFlag })
+
+        results.push({ ...result, cuFlag })
       }
     }
 
     if (_updateRecords.length > 0) {
+      const cuFlag = 'M'
       for (let i = 0; i < _updateRecords.length; i++) {
         const newRecord = _updateRecords[i]
         const dataSet = await dataSetRepo.findOne(newRecord.id)
@@ -82,7 +95,9 @@ export class DataSetMutation {
           updater: user
         })
 
-        results.push({ ...result, cuFlag: 'M' })
+        await this._createAttachment(context, newRecord.reportTemplate, { refId: result.id, cuFlag })
+
+        results.push({ ...result, cuFlag })
       }
     }
 
@@ -96,6 +111,7 @@ export class DataSetMutation {
     const { domain, tx } = context.state
 
     await tx.getRepository(DataSet).delete({ domain, id })
+    await deleteAttachmentsByRef(null, { refBys: [`report-${id}`] }, context)
     return true
   }
 
@@ -110,6 +126,8 @@ export class DataSetMutation {
       id: In(ids)
     })
 
+    await deleteAttachmentsByRef(null, { refBys: ids.map(id => `report-${id}`) } , context)
+
     return true
   }
 
@@ -203,4 +221,23 @@ export class DataSetMutation {
       return dataSet
     })
   }
+
+
+  async _createAttachment(context, attachment, { refId, cuFlag }) {
+    if (attachment) {
+      const attachmentRef = 'report-' + refId
+      cuFlag == 'M' && await deleteAttachmentsByRef(null, { refBys: [attachmentRef] }, context)
+      await createAttachment(
+        null,
+        {
+          attachment: {
+            file: attachment,
+            refBy: attachmentRef
+          }
+        },
+        context
+      )
+    }
+  }
 }
+

package/server/service/data-set/data-set-query.ts

@@ -4,6 +4,7 @@ import { getRepository } from 'typeorm'
 import { Role, User } from '@things-factory/auth-base'
 import { Board } from '@things-factory/board-service'
 import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
+import { Attachment } from '@things-factory/attachment-base'
 
 import { DataItem } from '../data-item/data-item'
 import { DataSample } from '../data-sample/data-sample'
@@ -52,6 +53,10 @@ export class DataSetQuery {
     })
     const roles = user.roles.filter(role => role.domainId === domain.id).map(role => role.id)
 
+    if (!roles.length) {
+      return { items: [], total: 0 }
+    }
+
     const queryBuilder = getQueryBuilderFromListParams({
       repository: getRepository(DataSet),
       params,
@@ -78,6 +83,10 @@ export class DataSetQuery {
     })
     const roles = user.roles.filter(role => role.domainId === domain.id).map(role => role.id)
 
+    if (!roles.length) {
+      return { items: [], total: 0 }
+    }
+
     const queryBuilder = getQueryBuilderFromListParams({
       repository: getRepository(DataSet),
       params,
@@ -183,4 +192,16 @@ export class DataSetQuery {
 
     return interval.prev().toDate()
   }
+
+  @FieldResolver(type => String)
+  async reportTemplate(@Root() dataset: DataSet): Promise<string | undefined> {
+    const attachment: Attachment = await getRepository(Attachment).findOne({
+      where: {
+        domain: dataset.domainId,
+        refBy: `report-${dataset.id}`
+      }
+    })
+
+    return attachment?.fullpath
+  }
 }

package/server/service/data-set/data-set-type.ts

@@ -1,4 +1,5 @@
 import { Field, ID, InputType, Int, ObjectType } from 'type-graphql'
+import { FileUpload, GraphQLUpload } from 'graphql-upload'
 
 import { ObjectRef, ScalarObject } from '@things-factory/shell'
 
@@ -53,6 +54,9 @@ export class NewDataSet {
 
   @Field({ nullable: true })
   reportView?: string
+
+  @Field(type => GraphQLUpload, { nullable: true })
+  reportTemplate?: FileUpload
 }
 
 @InputType()
@@ -108,6 +112,9 @@ export class DataSetPatch {
   @Field({ nullable: true })
   reportView?: string
 
+  @Field(type => GraphQLUpload, { nullable: true })
+  reportTemplate?: FileUpload
+
   @Field()
   cuFlag: string
 }

package/server/service/data-set/data-set.ts

@@ -143,6 +143,9 @@ export class DataSet {
   @Field({ nullable: true })
   reportView?: string
 
+  @Field({ nullable: true })
+  reportTemplate?: string
+
   @Column({
     nullable: true
   })

package/things-factory.config.js

@@ -27,6 +27,14 @@ export default {
     {
       tagname: 'data-report-list-page',
       page: 'data-report-list'
+    },
+    {
+      tagname: 'jasper-report-samples-page',
+      page: 'jasper-report-samples'
+    },
+    {
+      tagname: 'jasper-report-oocs-page',
+      page: 'jasper-report-oocs'
     }
   ],
   bootstrap

package/translations/en.json

@@ -27,6 +27,7 @@
   "field.quota": "sampling #",
   "field.raw-data": "raw data",
   "field.ref-by": "ref. by",
+  "field.report-template": "report template",
   "field.report-type": "report type",
   "field.report-view": "report view",
   "field.serial-no": "serial #",

package/translations/ko.json

@@ -27,6 +27,7 @@
   "field.quota": "샘플수",
   "field.raw-data": "데이타 원본",
   "field.ref-by": "참조아이템",
+  "field.report-template": "리포트용 템플릿",
   "field.report-type": "리포트용 화면종류",
   "field.report-view": "리포트용 화면",
   "field.serial-no": "시리얼번호",