@things-factory/integration-base 6.1.116 → 6.1.118

package/helps/integration/task/oracle-procedure.ko.md

@@ -58,6 +58,12 @@ END;
 
 ![procedure example1](./assets/../../../../assets/images/oracle-procedure-example1.png 'procedure example1')
 
+
+### 접근자 [accessor](../concept/data-accessor.md)
+
+설정 방법은 [JSONATA 도큐먼트](http://docs.jsonata.org/overview.html)를 따른다.
+
+
 ### 값
 
 파라미터가 입력(IN)일 경우, 해당 값을 지정한다. 
@@ -65,6 +71,7 @@ END;
 
 위의 예어서 id의 입력 값을 ID라고 지정되어 있다면, ID 태스크에서 반환되는 값을 입력 값으로 지정한다.
 
+
 ### 최대 크기
 
 파라미터 타입이 String이나 Buffer 일 경우, 최대 크기를 지정한다. 다른 타입의 경우 값을 지정하지 않고 무시한다.

package/helps/integration/task/oracle-procedure.md

@@ -60,6 +60,12 @@ An example call specification is as follows
 
 ![procedure example1](./assets/../../../../assets/images/oracle-procedure-example1.png 'procedure example1')
 
+
+# Accessor [accessor](../concept/data-accessor.md)
+
+- Set when you want to propagate only a part of the data object of the source component or the transformed data.
+- The setting method follows [JSONATA document](http://docs.jsonata.org/overview.html).
+
 ### Value(for Input)
 
 If the parameter is an input (IN), specify its value. 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/integration-base",
-  "version": "6.1.116",
+  "version": "6.1.118",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -26,12 +26,12 @@
   },
   "dependencies": {
     "@apollo/client": "^3.6.9",
-    "@things-factory/api": "^6.1.116",
-    "@things-factory/auth-base": "^6.1.116",
+    "@things-factory/api": "^6.1.118",
+    "@things-factory/auth-base": "^6.1.118",
     "@things-factory/env": "^6.1.116",
-    "@things-factory/oauth2-client": "^6.1.116",
-    "@things-factory/scheduler-client": "^6.1.116",
-    "@things-factory/shell": "^6.1.116",
+    "@things-factory/oauth2-client": "^6.1.118",
+    "@things-factory/scheduler-client": "^6.1.118",
+    "@things-factory/shell": "^6.1.118",
     "async-mqtt": "^2.5.0",
     "chance": "^1.1.11",
     "cross-fetch": "^3.0.4",
@@ -46,5 +46,5 @@
   "devDependencies": {
     "@types/cron": "^2.0.1"
   },
-  "gitHead": "4477d162a7008239bfd5f31dcfa879f59a2ad2ce"
+  "gitHead": "ea96bacb831bdc751bd1962a9d73a7d8abf0e304"
 }

package/server/engine/task/oracle-procedure.ts

@@ -10,7 +10,14 @@ try {
   logger.error('oracledb module loading failed')
 }
 
-type ProcedureParameterType = { name: string; dir: string; type: string; val: any; maxSize: number }
+type ProcedureParameterType = {
+  name: string
+  dir: string
+  type: string
+  val?: any
+  accessor?: string
+  maxSize?: number
+}
 
 const TYPES = {
   Number: oracledb.NUMBER,
@@ -48,20 +55,28 @@ async function OracleProcedure(step, context) {
 
   const procedureParameters =
     parameters &&
-    parameters.reduce((sum, { name, val, dir, type, maxSize }) => {
+    parameters.reduce((sum, { name, val, dir, type, accessor, maxSize }) => {
       sum[name] = {
         dir: DIR[dir],
-        type: TYPES[type],
-        val: access(val, data),
-        maxSize
+        type: TYPES[type]
+      }
+
+      const calculated = val !== undefined ? val : accessor ? access(accessor, data) : undefined
+
+      if (calculated !== undefined) {
+        sum[name].val =
+          type == 'Date'
+            ? new Date(calculated)
+            : type == 'Number'
+            ? Number(calculated)
+            : type == 'String'
+            ? String(calculated)
+            : calculated
       }
 
-      // remove empty keys
-      Object.keys(sum[name]).forEach(key => {
-        if (!sum[name][key]) {
-          delete sum[name][key]
-        }
-      })
+      if (maxSize) {
+        sum[name].maxSize = maxSize
+      }
 
       return sum
     }, {})