@things-factory/dataset 6.1.60 → 6.1.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/dataset",
-  "version": "6.1.60",
+  "version": "6.1.62",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -40,15 +40,15 @@
     "@things-factory/aws-base": "^6.1.48",
     "@things-factory/board-service": "^6.1.55",
     "@things-factory/env": "^6.1.48",
-    "@things-factory/organization": "^6.1.59",
+    "@things-factory/organization": "^6.1.61",
     "@things-factory/scheduler-client": "^6.1.48",
     "@things-factory/shell": "^6.1.48",
     "@things-factory/work-shift": "^6.1.48",
-    "@things-factory/worklist": "^6.1.59",
+    "@things-factory/worklist": "^6.1.61",
     "cron-parser": "^4.3.0",
     "moment-timezone": "^0.5.40",
     "simple-statistics": "^7.8.3",
     "statistics": "^3.3.0"
   },
-  "gitHead": "c90c79d97ae32422d8cc76023c75b5cd690647ce"
+  "gitHead": "13f97793b42d7c14b2648facf53d3c70be084e76"
 }

package/server/controllers/create-data-sample.ts

@@ -12,6 +12,7 @@ import { NewDataSample } from '../service/data-sample/data-sample-type'
 import { DataSet } from '../service/data-set/data-set'
 import { DataUseCase } from './data-use-case'
 import { Activity } from '@things-factory/worklist'
+import { Attachment, createAttachment } from '@things-factory/attachment-base'
 
 import { issue } from '@things-factory/worklist/dist-server/controllers/activity-instance/issue'
 
@@ -103,6 +104,64 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
     }
   })
 
+  /* 
+    pre-processing for file attachment.
+    currently only support type of [FileUpload].
+    If [FileUpload[]] type needed, add 'files' type for dataset
+  */
+
+  const data = dataSample.data
+  const attachments = []
+
+  for (let dataItem of dataItems) {
+    if (dataItem.type == 'file') {
+      const tag = dataItem.tag
+      const filesArray = data[tag]
+
+      if (tag && filesArray && filesArray.length > 0) {
+        let pathsArray = []
+
+        for (let files of filesArray) {
+          let paths = []
+
+          for (let file of files) {
+            if (file) {
+              const attachment = await createAttachment(
+                null,
+                {
+                  attachment: {
+                    file: file.file,
+                    refType: DataSample.name
+                  }
+                },
+                context
+              )
+
+              const fetched = await tx.getRepository(Attachment).findOneBy({ id: attachment.id })
+              if (fetched) {
+                attachments.push(fetched)
+                paths.push({
+                  id: fetched.id,
+                  mimetype: fetched.mimetype,
+                  name: fetched.name,
+                  fullpath: fetched.fullpath
+                })
+              } else {
+                throw `Failed to save file(${attachment.name})`
+              }
+            } else {
+              paths.push(null)
+            }
+          }
+
+          pathsArray.push(paths)
+        }
+
+        data[tag] = pathsArray
+      }
+    }
+  }
+
   const result = await tx.getRepository(DataSample).save({
     ...old,
     name: dataSet.name,
@@ -124,6 +183,12 @@ export async function createDataSample(dataSample: NewDataSample, context: Resol
     updater: user
   })
 
+  /* post-process for for file attachment. */
+  if (attachments.length > 0) {
+    attachments.forEach(attachment => (attachment.refId = result.id))
+    tx.getRepository(Attachment).save(attachments)
+  }
+
   if (ooc || oos) {
     const dataOoc = await tx.getRepository(DataOoc).save({
       ...result,