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

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
   }
 
@@ -169,10 +187,16 @@ export class DataSetMutation {
             name: dataItem.name,
             description: dataItem.description,
             sequence: dataItem.sequence,
-            task: dataItem.task,
-            connection: dataItem.connection,
-            params: dataItem.params,
-
+            tag: dataItem.tag,
+            active: dataItem.active,
+            type: dataItem.type,
+            quota: dataItem.quota,
+            spec: dataItem.spec,
+            unit: dataItem.unit,
+            options: dataItem.options,
+            hidden: dataItem.hidden,
+            // connection: dataItem.connection,
+            // params: dataItem.params,
             domain,
             creator: user,
             updater: user
@@ -203,4 +227,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?.path
+  }
 }

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,7 +27,23 @@ export default {
     {
       tagname: 'data-report-list-page',
       page: 'data-report-list'
-    }
+    },
+    {
+      tagname: 'jasper-report-samples-page',
+      page: 'jasper-report-samples'
+    },
+    {
+      tagname: 'jasper-report-samples-crosstab-page',
+      page: 'jasper-report-samples-crosstab'
+    },
+    {
+      tagname: 'jasper-report-oocs-page',
+      page: 'jasper-report-oocs'
+    },
+    {
+      tagname: 'data-report-embed-page',
+      page: 'data-report-embed'
+    },
   ],
   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": "시리얼번호",