@izara_project/izara-market-library-service-schemas 1.0.59 → 1.0.62

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.59",
+  "version": "1.0.62",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -24,11 +24,11 @@
     "@izara_project/izara-core-library-core": "^1.0.20",
     "@izara_project/izara-core-library-external-request": "^1.0.20",
     "@izara_project/izara-core-library-logger": "^1.0.7",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.84",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.90",
     "@izara_project/izara-core-library-sns": "^1.0.6",
     "@izara_project/izara-core-library-sqs": "^1.0.4",
     "@izara_project/izara-shared": "^1.0.126",
-    "@izara_project/izara-shared-service-schemas": "^1.0.26",
+    "@izara_project/izara-shared-service-schemas": "^1.0.29",
     "@izara_project/izara-shared-core": "^1.0.2",
     "ejs": "^3.1.10",
     "js-beautify": "^1.15.4",

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -72,7 +72,7 @@ function validateSchemaMiddleware(
   middleware,
   // objectType,
   action,
-  bucketName = consts.OBJECT_SCHEMA_BUCKET_NAME
+  bucketName = process.env.iz_serviceSchemaBucketName
   // setting = {}
 ) {
 
@@ -108,7 +108,7 @@ async function validateSchemaPerRecord(
   lambdaFunctionName,
   objType,
   action,
-  setting = { bucketName: consts.OBJECT_SCHEMA_BUCKET_NAME, specificFieldNames: [] }
+  setting = { bucketName: process.env.iz_serviceSchemaBucketName, specificFieldNames: [] }
 ) {
   try {
     record._izContext.logger.debug("validateSchemaPerRecord: ",
@@ -350,7 +350,7 @@ async function messageToDlq(record, messageFailError, queueUrl) {
  * @param {Object} _izContext
  * @param {Object} objectSchema
  */
-async function createGetDataDetails(_izContext, objectSchema, settings = { bucketName: consts.OBJECT_SCHEMA_BUCKET_NAME }) {
+async function createGetDataDetails(_izContext, objectSchema, settings = { bucketName: process.env.iz_serviceSchemaBucketName }) {
 
   // group versionedData per storageTag
   // or should group versionedData per graph serviceTag
@@ -546,7 +546,7 @@ async function createGetDataDetails(_izContext, objectSchema, settings = { bucke
  * @param {Object} objectSchema
  * @param {Object} reqIdentifiers       - input identifier from calling function
  */
-async function generateDynamoDbIdentifiers(_izContext, objectSchema, reqIdentifiers, bucketName = consts.OBJECT_SCHEMA_BUCKET_NAME) {
+async function generateDynamoDbIdentifiers(_izContext, objectSchema, reqIdentifiers, bucketName = process.env.iz_serviceSchemaBucketName) {
 
   // start create identifiers for dynamo
   let dynamoIdentifiers = {};
@@ -617,7 +617,7 @@ const generateDynamoDbIdentifiersWithCache = inMemoryCacheLib(
  * @param {Object} dynamoStorageResource
  * @param {Object} reqIdentifiers
  */
-async function dynamoDbIdentifiersByStorageResource(_izContext, objectSchema, dynamoStorageResource, reqIdentifiers, bucketName = consts.OBJECT_SCHEMA_BUCKET_NAME) {
+async function dynamoDbIdentifiersByStorageResource(_izContext, objectSchema, dynamoStorageResource, reqIdentifiers, bucketName = process.env.iz_serviceSchemaBucketName) {
 
   let dynamoIdentifiers = await generateDynamoDbIdentifiersWithCache(_izContext, objectSchema, reqIdentifiers, bucketName)
 

package/src/MainLibs/src/Consts.js

@@ -30,7 +30,7 @@ const { getGraphServiceNameFromGraphServerTagWithCache, getGraphServiceTagWithCa
 
 const DEFAULT_HANDLER_PER_ACTION = {
   [ACTIONS.create]: [HANDLER.hdrApi, HANDLER.hdrSqs, HANDLER.hdrInv],
-  [ACTIONS.update]: [HANDLER.hdrApi, HANDLER.hdrSqs],
+  [ACTIONS.update]: [HANDLER.hdrApi, HANDLER.hdrSqs, HANDLER.hdrInv],
   [ACTIONS.get]: [HANDLER.hdrApi, HANDLER.hdrInv],
   [ACTIONS.delete]: [HANDLER.hdrApi, HANDLER.hdrSqs]
 }
@@ -566,6 +566,7 @@ const FLOW_SCHEMA_EVENT_TYPE = {
 }
 
 module.exports = {
+  STORAGE_TYPES,
   ACTIONS,
   DEFAULT_HANDLER_PER_ACTION,
   RESOURCE_CLASSES,

package/src/reStructure/TemplateData/EndpointPerService/mainFunction/create/template.ejs

@@ -169,40 +169,23 @@ module.exports.createMain = async (
       const identifier = objectSchemas.identifiers[0];
       _izContext.logger.debug(":::::case single identifier:::::", identifier);
 
-      if (objectSchemas.fieldNames[identifier.fieldName].hasOwnProperty("randomOnCreate")) {
-        if ((objectSchemas.fieldNames[identifier.fieldName].randomOnCreate == true)) {
-          Object.assign(requestParams.fieldNames, {
-            [identifier.fieldName]: hash({
-              fieldNames: identifier, //
-              uniqueRequestId: _izContext.uniqueRequestId,
-              callingFlowConfig: callingFlowConfig
-            })
-          });
-          _izContext.logger.debug("Assign requestParams", requestParams)
-
-        } else if (objectSchemas.fieldNames[identifier.fieldName].randomOnCreate == false ||
-          objectSchemas.fieldNames[identifier.fieldName].randomOnCreate == null) {
-
-          if ((objectSchemas.fieldNames[identifier.fieldName].requiredOnCreate == true) &&
-            (objectSchemas.fieldNames[identifier.fieldName].canUpdate == false)) {
-            // check Fns have receive
-
-            if (requestParams.fieldNames.hasOwnProperty([identifier.fieldName])) {
-              _izContext.logger.debug("identifier is exist:", {
-                [identifier.fieldName]: requestParams.fieldNames[identifier.fieldName]
-              });
-
-            } else {
-              errorsFound.push("[invalid]requestParams not have data fieldNames of requiredOnCreate");
-            }
-          }
-        };
+      if (objectSchemas.fieldNames[identifier.fieldName].hasOwnProperty("randomOnCreate") && (objectSchemas.fieldNames[identifier.fieldName].randomOnCreate == true)) {
+        Object.assign(requestParams.fieldNames, {
+          [identifier.fieldName]: hash({
+            fieldNames: identifier, //
+            uniqueRequestId: _izContext.uniqueRequestId,
+            callingFlowConfig: callingFlowConfig
+          })
+        });
+        _izContext.logger.debug("Assign requestParams", requestParams)
       } else if (objectSchemas.fieldNames[identifier.fieldName].hasOwnProperty("hashOnCreate")) {
         let hashFieldName = {}
         if (objectSchemas.fieldNames[identifier.fieldName].hashOnCreate.length &&
           objectSchemas.fieldNames[identifier.fieldName].hashOnCreate.length > 0) {
           for (const fieldName of objectSchemas.fieldNames[identifier.fieldName].hashOnCreate) {
-            Object.assign(hashFieldName, { [fieldName]: requestParams.fieldNames[fieldName] })
+            Object.assign(hashFieldName, {
+              [fieldName]: requestParams.fieldNames[fieldName]
+            })
           }
 
           Object.assign(
@@ -225,6 +208,22 @@ module.exports.createMain = async (
           }
           )
         }
+      } else if (objectSchemas.fieldNames[identifier.fieldName].hasOwnProperty("randomOnCreate") && objectSchemas.fieldNames[identifier.fieldName].randomOnCreate == false ||
+        objectSchemas.fieldNames[identifier.fieldName].randomOnCreate == null) {
+
+        if ((objectSchemas.fieldNames[identifier.fieldName].requiredOnCreate == true) &&
+          (objectSchemas.fieldNames[identifier.fieldName].canUpdate == false)) {
+          // check Fns have receive
+
+          if (requestParams.fieldNames.hasOwnProperty([identifier.fieldName])) {
+            _izContext.logger.debug("identifier is exist:", {
+              [identifier.fieldName]: requestParams.fieldNames[identifier.fieldName]
+            });
+
+          } else {
+            errorsFound.push("[invalid]requestParams not have data fieldNames of requiredOnCreate");
+          }
+        }
       } else {
         if ((objectSchemas.fieldNames[identifier.fieldName].requiredOnCreate === false) &&
           (objectSchemas.fieldNames[identifier.fieldName].optionalOnCreate === false) &&
@@ -365,46 +364,11 @@ module.exports.createMain = async (
           _izContext.logger.debug("FIRST", listOfObjectForCreates)
 
         }
-
-        if (objectSchema.hasOwnProperty("extendObjType")) {
-          if (createDataDetail.storageType === consts.STORAGE_TYPES.dynamoDB &&
-            createDataDetail.tableName.includes(`${firstLetterUpperCase(objectSchema.extendObjType.objectType)}Records`) &&
-            createDataDetail.serviceTag !== process.env.iz_serviceTag
-          ) {
-            let objInstanceFullForParentDynamoDb = lodash.cloneDeep(objInstanceFull)
-            Object.assign(objInstanceFullForParentDynamoDb.fields, createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail))
-            _izContext.logger.debug("objInstanceFull before create item in dynamoDB in parent", objInstanceFullForParentDynamoDb)
-
-            Object.assign(objInstanceFullForParentDynamoDb.fields, { [`${objectSchema.extendObjType.objectType}HandlerServiceTag`]: process.env.iz_serviceTag })
-
-            let identifiersForCreateData = await dynamoDbIdentifiersByStorageResource(
-              _izContext,
-              objectSchema,
-              createDataDetails,
-              objInstanceFullForParentDynamoDb.identifiers
-            )
-            _izContext.logger.debug("identifiersForCreateData", identifiersForCreateData);
-
-            await dynamodbSharedLib.putItem(
-              _izContext,
-              await dynamodbSharedLib.tableName(
-                _izContext,
-                createDataDetail.tableName,
-                createDataDetail.serviceTag
-              ),
-              {
-                ...identifiersForCreateData,
-                ...objInstanceFullForParentDynamoDb.fields
-              }
-            );
-          }
-        }
       };
       _izContext.logger.debug("[1]listOfObjectForCreates:::", listOfObjectForCreates);
     };
 
     function createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail) {
-      _izContext.logger.debug("createObjInstanceFullFieldsByStorageTag : ", { storageTag, createDataDetail })
       let fields = {};
       for (let fieldName of Object.keys(requestParams.fieldNames)) {
         if ((createDataDetails[storageTag].fieldNames.includes(fieldName)) &&
@@ -418,7 +382,6 @@ module.exports.createMain = async (
           }
         }
       }
-      _izContext.logger.debug({ fields })
       return fields
     }
     /// step save awaitingMultipleStep of storageType graph ...........................................................

package/src/reStructure/TemplateData/EndpointPerService/mainFunction/get/template.ejs

@@ -103,9 +103,9 @@ module.exports.getMain = async (
 
     const errorsFound = [];
 
-    const returnSystemFieldsName = requestParams.additionalRequest?.setting?.returnSystemFieldsName ?? false;
-    const throwWhenNotFoundSomeRecord = requestParams.additionalRequest?.setting?.throwWhenNotFoundSomeRecord ?? true;
-    const returnVersionedData = requestParams.additionalRequest?.setting?.returnVersionedData ?? true
+    const returnSystemFieldsName = requestParams.additionalParams?.setting?.returnSystemFieldsName ?? false;
+    const throwWhenNotFoundSomeRecord = requestParams.additionalParams?.setting?.throwWhenNotFoundSomeRecord ?? true;
+    const returnVersionedData = requestParams.additionalParams?.setting?.returnVersionedData ?? true
 
     //(<beforeQuery>)
     //(</beforeQuery>)
@@ -154,7 +154,7 @@ module.exports.getMain = async (
             let graphServiceName = await getGraphServiceTagWithCache(_izContext, getDataDetail.graphServiceTag);
 
             let versionedDataLabels = [];
-            if (!returnVersionedData) {
+            if (returnVersionedData) {
               if (getDataDetail.versionedDatas && Object.keys(getDataDetail.versionedDatas).length) {
                 // have versionedData
                 versionedDataLabels = Object.keys(getDataDetail.versionedDatas);
@@ -231,7 +231,6 @@ module.exports.getMain = async (
             let dataFromDynamoDb = await dynamodbSharedLib.getItem(
               _izContext,
               await dynamodbSharedLib.tableName(_izContext, getDataDetail.tableName, getDataDetail.serviceTag),
-              await dynamodbSharedLib.tableName(_izContext, getDataDetail.tableName, getDataDetail.serviceTag),
               identifiersForGetData
             );
 

package/src/reStructure/TemplateData/EndpointPerService/mainFunction/update/template.ejs

@@ -17,12 +17,11 @@ along with this program. If not, see
 */
 
 'use strict';
-
+const lodash = require('lodash')
 // ==================== Shared Core Utilities ====================
 const hash = require('@izara_project/izara-shared-core').objectHash;
 const coreConsts = require('@izara_project/izara-core-library-core/src/Consts');
 
-
 // ==================== Core Service Schemas ====================
 const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
 const consts = require('@izara_project/izara-core-library-service-schemas/src/Consts');
@@ -89,6 +88,9 @@ module.exports.updateMain = async (
       callingFlowConfig
     });
 
+    const returnSystemFieldsName = requestParams.additionalParams.settings.returnSystemFieldsName ?? false;
+    const returnOldData = requestParams.additionalParams.settings.returnOldData ?? false;
+
     let errorsFound = [];
 
     const objType = createObjType(requestParams.objectType);
@@ -130,7 +132,7 @@ module.exports.updateMain = async (
     let updateDataDetails = await createUpdateDataDetail(
       _izContext,
       objectSchema,
-      );
+    );
 
     _izContext.logger.debug("updateDataDetails", updateDataDetails);
 
@@ -217,6 +219,24 @@ module.exports.updateMain = async (
 
     let awaitingStepIds = [];
 
+    function createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, updateDataDetail) {
+      let fields = {};
+      for (let fieldName of Object.keys(requestParams.objInstanceFull.fields)) {
+        console.log("updateDataDetail[storageTag]", updateDataDetails[storageTag])
+        if ((updateDataDetails[storageTag].fieldNames.includes(fieldName)) &&
+          (updateDataDetail.fieldNames.includes(fieldName))) {
+          if (!identifiers.hasOwnProperty(fieldName)) {
+            if (!fields.hasOwnProperty(fieldName)) {
+              Object.assign(fields, {
+                [fieldName]: requestParams.objInstanceFull.fields[fieldName]
+              })
+            }
+          }
+        }
+      }
+      return fields
+    }
+
     // start update data
     await Promise.all(
       Object.entries(updateDataDetails).map(
@@ -224,6 +244,9 @@ module.exports.updateMain = async (
           if (updateDataDetail.storageType === consts.STORAGE_TYPES.graph) {
             // let graphServiceName = await getGraphServiceTagWithCache(_izContext, getDataDetail.graphServiceTag)
 
+            //(<beforeUpdateGraph>)
+            //(</beforeUpdateGraph>)
+
             awaitingStepIds.push( // createAwaitingStepId if updateGraph
               asyncFlowSharedLib.createAwaitingStepId(
                 hash({
@@ -257,10 +280,14 @@ module.exports.updateMain = async (
               objType: objType,
               objInstanceFull: {
                 identifiers: identifiers,
-                fields: fields,
+                fields: createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, updateDataDetail),
               },
               versionedDataIds: versionedDataIds,
-              originTimestamp
+              originTimestamp,
+              settings: {
+                returnSystemFieldsName: returnSystemFieldsName,
+                returnOldData: returnOldData
+              }
             }
 
             updateNodeParams = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
@@ -281,7 +308,7 @@ module.exports.updateMain = async (
             let updateNodeMessageBody = {
               Message: JSON.stringify(updateNodeParams),
               MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-              TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GRAPH_HANDLER.inUpdateNode, storageTag,)
+              TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GRAPH_HANDLER.inUpdateNode, storageTag)
             }
 
             _izContext.logger.debug('request param before send to topic InUpdateNode:::', updateNodeMessageBody);
@@ -298,10 +325,10 @@ module.exports.updateMain = async (
               identifiers
             )
 
-            let fieldForUpdateTableDynamo = createFieldForUpdateDynamoDb(_izContext, objectSchema, updateDataDetail, fields)
+            // let fieldForUpdateTableDynamo = createFieldForUpdateDynamoDb(_izContext, objectSchema, updateDataDetail, fields)
 
             _izContext.logger.debug("identifiersForUpdateData", identifiersForUpdateData)
-            _izContext.logger.debug("fieldForUpdateTableDynamo", fieldForUpdateTableDynamo)
+            // _izContext.logger.debug("fieldForUpdateTableDynamo", fieldForUpdateTableDynamo)
 
             //(<beforeUpdateDynamoDb>)
             //(</beforeUpdateDynamoDb>)
@@ -310,7 +337,7 @@ module.exports.updateMain = async (
               _izContext,
               await dynamodbSharedLib.tableName(_izContext, updateDataDetail.tableName, updateDataDetail.serviceTag),
               identifiersForUpdateData,
-              fieldForUpdateTableDynamo,
+              createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, updateDataDetail),
               {
                 returnValues: "ALL_NEW"
               }
@@ -343,28 +370,6 @@ module.exports.updateMain = async (
               }
             }
           }
-          if (objectSchema.hasOwnProperty("extendObjType")) {
-            if (updateDataDetail.storageType === consts.STORAGE_TYPES.dynamoDB && updateDataDetail.serviceTag !== process.env.iz_serviceTag) {
-
-              let fieldForUpdateTableDynamo = createFieldForUpdateDynamoDb(_izContext, objectSchema, updateDataDetail, fields)
-
-
-              let identifiersForUpdateData = await dynamoDbIdentifiersByStorageResource(
-                _izContext,
-                objectSchema,
-                updateDataDetail,
-                identifiers
-              )
-              _izContext.logger.debug("identifiersForUpdateData", identifiersForUpdateData);
-
-              await dynamodbSharedLib.updateItem(
-                _izContext,
-                await dynamodbSharedLib.tableName(_izContext, updateDataDetail.tableName, updateDataDetail.serviceTag),
-                identifiersForUpdateData,
-                fieldForUpdateTableDynamo
-              );
-            }
-          }
         }
       )
     )

package/src/reStructure/TemplateData/flowSchema/components/upload/confirmReserved/mainFunction/template.ejs

@@ -81,7 +81,7 @@ module.exports.confirmNewReserved = async (
 
     let sendMessageToConfirmUsage = {
       Message: JSON.stringify(confirmUsageMessage),
-      TopicArn: await snsSharedLib.snsTopicArn(_izContext, 'ConfirmUsage_In', consts.EXTERNAL_SERVICE_NAME.accountLimits)
+      TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, 'ConfirmUsage_In', consts.EXTERNAL_SERVICE_NAME.accountLimits)
     };
     _izContext.logger.debug("sendMessageToConfirmUsage", sendMessageToConfirmUsage);
     await sns.publishAsync(_izContext, sendMessageToConfirmUsage);
@@ -114,7 +114,7 @@ module.exports.confirmNewReserved = async (
 
     let sendMessageToUpdateEndpoint = {
       Message: JSON.stringify(sendMessageToUpdateStatus),
-      TopicArn: await snsSharedLib.snsTopicArn(_izContext, "Update_In")
+      TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "Update_In")
     };
     _izContext.logger.debug("sendMessageToUpdateEndpoint", sendMessageToUpdateEndpoint);
     await sns.publishAsync(_izContext, sendMessageToUpdateEndpoint);

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/createPresignUrl/mainFunction/template.ejs

@@ -126,7 +126,7 @@ module.exports.createPresignUrl = async (
             //(</fields>)
           }
         },
-        objType: objType.objectType
+        objectType: objType.objectType
       }
 
       let sendMessageToUpdateEndpoint = {
@@ -152,14 +152,22 @@ module.exports.createPresignUrl = async (
       await sns.publishAsync(_izContext, sendMessageToCancelReserved);
 
       await postToConnection({ message: "reserved has reach limit" }, connectionId)
+
+      //(<createIdentifiersForDeleteTask>)
+      let identifiers
+      //(</createIdentifiersForDeleteTask>)
       // after post message delete websocket task
       await dynamodbSharedLib.deleteItem(_izContext,
         await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
         {
-          taskKey: correlationId,
+          taskKey: `${createFlowTypeConcat(_izContext, { flowTag: "<%- flowTag %>", serviceTag: process.env.iz_serviceTag })}${identifiers}`,
           connectionId: connectionId
         }
       )
+
+      //(<afterCancelReservedLimit>)
+      //(</afterCancelReservedLimit>)
+
       return "reserved not pass"
     }
 
@@ -181,8 +189,8 @@ module.exports.createPresignUrl = async (
         ["eq", "$x-amz-meta-importBatchId", importBatchId]
       //(</conditionCreateUrlLink>)
       ],
-      fields: {},
-      expires: 86400
+      Fields: {},
+      Expires: 86400
     };
     _izContext.logger.debug('createPresignUrlParam', createPresignUrlParam);
 
@@ -207,7 +215,7 @@ module.exports.createPresignUrl = async (
           },
           fields: {
             importBatchStatus: "waitingToUpload",
-            expiryTimestamp: (getResult.startTime + (createPresignUrlParam.expires * 1000))
+            expiryTimestamp: (getResult.fields.startTime + (createPresignUrlParam.Expires * 1000))
           }
         },
         objectType: objType.objectType
@@ -232,11 +240,9 @@ module.exports.createPresignUrl = async (
       _izContext.logger.debug("sendMessageToUpdateEndpoint", sendMessageToUpdateEndpoint);
       await sns.publishAsync(_izContext, sendMessageToUpdateEndpoint);
 
-
-      //(<createIdentifiersFlow>)
+      //(<createIdentifierFlow>)
         let identifiers
-      //(</createIdentifiersFlow>)
-
+      //(</createIdentifierFlow>)
       await dynamodbSharedLib.updateItem(_izContext,
         await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
         {
@@ -248,6 +254,10 @@ module.exports.createPresignUrl = async (
         }
       )
     }
+
+    //(<mainFunctionHookCode>)
+    //(</mainFunctionHookCode>)
+
   } catch (err) {
     _izContext.logger.error('error createPresignUrl: ', err)
     throw (err)

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/reservedLimit/functionYaml/data.js

@@ -21,7 +21,7 @@ const path = require('path');
 
 const templatePath = path.join(__dirname, "./template.ejs")
 
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../../../MainLibs/src/Utils")
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase, getLocalConfig } = require("../../../../../../../../MainLibs/src/Utils");
 const {
   HANDLER,
   defaultIamRolePerAction,
@@ -59,6 +59,7 @@ async function data(_izContext, flowSchema, srcPath) {
 }
 
 async function createSourceParams(_izContext, flowSchema, srcPath) {
+  let iz_serviceSchemaBucketName = getLocalConfig(path.join(srcPath, "../"), "iz_serviceSchemaBucketName")
   let functionName = upperCase(FUNCTION_NAME.reservedLimit);
   let handlerType = upperCase(HANDLER.hdrSqs);
   let additionalResourcePermission = defaultIamRolePerAction();
@@ -87,7 +88,7 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
 
   additionalResourcePermission.push(awaitingMultipleStepsRole())
 
-  let objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, flowSchema.objType)
+  let objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, flowSchema.objType, iz_serviceSchemaBucketName)
 
   for (const storageResource of Object.values(objectSchema.storageResources)) {
     if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {

package/src/reStructure/TemplateData/flowSchema/externalTopic/Process/handler/template.ejs

@@ -57,9 +57,6 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
     // loop each record and send to mainFunction
     await Promise.all(event.Records.map(async record => { // promise.all for map() function
 
-      record = recordHandlerSharedLib.reformatDsqMessage(record._izContext, record);
-      record._izContext.logger.debug('record LambdaFunctionHdrDsq after reform', record);
-
       let passOnProperties = []
       record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
 

package/src/reStructure/TemplateData/flowSchema/register/complete/mainFunction/template.ejs

@@ -20,7 +20,6 @@ along with this program. If not, see
 
 const hash = require('@izara_project/izara-shared-core').objectHash;
 const { getObjectSchema, identifiersObject } = require('@izara_project/izara-core-library-service-schemas');
-
 const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
 const snsSharedLib = require('@izara_project/izara-core-library-sns');
 const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
@@ -62,9 +61,8 @@ module.exports.registerCompleteMain = async (
     _izContext.logger.debug("WebSocketInvoke requestParams", requestParams)
     _izContext.logger.debug("WebSocketInvoke callingFlowConfig", callingFlowConfig)
 
-    let connectionId = _izContext.correlationIds.get(consts.CONNECTION_ID);
 
-    if (!topicArn){
+    if (!topicArn) {
       throw new NoRetryError("invalid not have topicArn to get flowSchema")
     }
 
@@ -78,7 +76,24 @@ module.exports.registerCompleteMain = async (
       throw new NoRetryError("not have flowSchema in S3")
     }
 
-    let correlationId = _izContext.correlationIds.get(consts.X_CORRELATION_ID);
+    let identifiersTask = ""
+
+    if (!requestParams.identifiersTask && flowSchema.objType) {
+
+      identifiersTask = await identifiersObject.identifiersConcatFromIdentifiers(_izContext, flowSchema.objType, requestParams)
+      _izContext.logger.debug("identifiersTask from request params", identifiersTask)
+
+      Object.assign(requestParams, {
+        identifiersTask: identifiersTask
+      })
+    }
+
+    if (!requestParams.identifiersTask) {
+      _izContext.logger.warn("invalid identifiersTask")
+      return "invalid identifiersTask"
+      // throw new NoRetryError("invalid identifiersTask")
+    }
+
 
     const getResult = async (objType) => {
       const objectSchema = await getObjectSchema.getObjSchemaS3WithCache(
@@ -90,32 +105,29 @@ module.exports.registerCompleteMain = async (
 
       _izContext.logger.debug("==> objectSchema", objectSchema)
 
-      const result = await externalRequest.lambda.invokeSync(_izContext,
-        await lambdaSharedLib.lambdaFunctionName(_izContext, "GetHdrInv"),
+      // use object
+      let tasks = await dynamodbSharedLib.query(_izContext,
+        await dynamodbSharedLib.tableName(_izContext, "RegisterRecords"),
         {
-          identifiers: await identifiersObject.identifiersFromIdentifiersConcat(_izContext, objType, requestParams.identifiersTask),
-          objectType: objType.objectType
+          identifiersTask: identifiersTask
         }
       )
-      if (!result) {
-        await generatedCodeLibs.postToConnection({ message: "not have record" }, connectionId)
-      } else {
-        for (const [fieldName, fieldNameSetting] of Object.entries(objectSchema.fieldNames)) {
-          if (fieldNameSetting.hasOwnProperty("statusField") && fieldNameSetting.statusField === true) {
-            if (result.fields[fieldName] !== "complete" && result.fields[fieldName] !== "error") {
-              // if status is not complete or error will save data into table
-              await dynamodbSharedLib.putItem(_izContext,
-                await dynamodbSharedLib.tableName(_izContext, "RegisterRecords"),
-                {
-                  identifiersTask: requestParams.identifiersTask,
-                  connectionId: connectionId
-                }
-              )
-            } else {
-              await generatedCodeLibs.postToConnection({ message: result }, connectionId)
-            }
+
+      if (tasks.Items.length > 0) {
+        const result = await externalRequest.lambda.invokeSync(_izContext,
+          await lambdaSharedLib.lambdaFunctionName(_izContext, "GetHdrInv"),
+          {
+            identifiers: await identifiersObject.identifiersFromIdentifiersConcat(_izContext, objType, requestParams.identifiersTask),
+            objectType: objType.objectType
           }
-        }
+        )
+        await Promise.all(tasks.Items.map(async (task) => {
+          if (!result) {
+            await generatedCodeLibs.postToConnection({ message: "not have record" }, task.connectionId)
+          } else {
+            await generatedCodeLibs.postToConnection({ message: result }, task.connectionId)
+          }
+        }))
       }
     }
     // check statusType
@@ -126,7 +138,9 @@ module.exports.registerCompleteMain = async (
       case "storedCache":
         await getResult(flowSchema.objType);
         break;
-
+      case "triggerCache":
+        await getResult(flowSchema.objType)
+        break;
       case "none":
 
         let identifier = {};
@@ -154,15 +168,8 @@ module.exports.registerCompleteMain = async (
             await generatedCodeLibs.postToConnection({ message: task }, task.connectionId)
           }))
           await generatedCodeLibs.postToConnection({ message: tasks.Items[0] }, connectionId)
-        } else {
-          await dynamodbSharedLib.putItem(_izContext,
-            await dynamodbSharedLib.tableName(_izContext, "RegisterRecords"),
-            {
-              identifiersTask: hash(identifier),
-              connectionId: connectionId
-            }
-          )
         }
+
         break
       default:
         throw new NoRetryError(`statusType not found ${flowSchema.statusType}`)

package/src/reStructure/TemplateData/flowSchema/register/wbs/mainFunction/template.ejs

@@ -20,7 +20,7 @@ along with this program. If not, see
 
 const hash = require('@izara_project/izara-shared-core').objectHash;
 const { getObjectSchema, identifiersObject } = require('@izara_project/izara-core-library-service-schemas');
-
+const lodash = require('lodash')
 const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
 const snsSharedLib = require('@izara_project/izara-core-library-sns');
 const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
@@ -118,6 +118,9 @@ module.exports.registerMain = async (
       case "storedCache":
         await getResult(flowSchema.objType)
         break;
+      case "triggerCache":
+        await getResult(flowSchema.objType)
+        break;
       case "none":
         let identifier = {};
         if (requestParams.hasOwnProperty("identifiersField") && Array.isArray(requestParams.identifiersField)) {
@@ -128,7 +131,9 @@ module.exports.registerMain = async (
           }
           identifier = identifier;
         } else {
-          identifier = requestParams
+          let pureRequestParams = lodash.cloneDeep(requestParams);
+          delete pureRequestParams.flowTag
+          identifier = pureRequestParams
         }
 
         // get task before putItem

package/src/reStructure/TemplateData/perActionComplete/update/mainFunction/template.ejs

@@ -55,7 +55,7 @@ module.exports.updateNodeComplete = async (
     let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
       hash({
         objectType: returnValue.requestParams.objType.objectType,
-        serviceTag: returnValue.requestParams.objType.objectType,
+        serviceTag: returnValue.requestParams.objType.serviceTag,
         identifiers: returnValue.requestParams.objInstanceFull.identifiers,
         fields: returnValue.requestParams.objInstanceFull.fields
       }),
@@ -83,12 +83,12 @@ module.exports.updateNodeComplete = async (
 
           let updateCompleteMsg = {
             objType: {
-              objectType: returnValue.queryResult.objType.objectType,
-              serviceTag: returnValue.queryResult.objType.serviceTag
+              objectType: returnValue.requestParams.objType.objectType,
+              serviceTag: returnValue.requestParams.objType.serviceTag
             },
             objInstanceFull: {
-              identifiers: returnValue.queryResult.objInstanceFull.identifiers,
-              fields: returnValue.queryResult.objInstanceFull.fields
+              identifiers: returnValue.requestParams.objInstanceFull.identifiers,
+              fields: returnValue.requestParams.objInstanceFull.fields
             },
             status: status,
             errorsFound: errorsFound,

package/src/reStructure/TemplateData/propertyValueSchema/objectPropertyValueSchema/data.js

@@ -21,12 +21,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const path = require('path');
 const fs = require('fs');
+const lodash = require('lodash')
 const {
   SOURCE_PATH,
   fieldNameSetting,
   FIELD_NAME_TYPE,
   PROPERTY_VALUE_TAG,
-  SAVE_FILE_NAME
+  SAVE_FILE_NAME,
+  STORAGE_TYPES
 } = require('../../../../MainLibs/src/Consts');
 
 const templatePath = path.join(__dirname, "./templateObjectPropertyValueSchema.ejs");
@@ -66,7 +68,13 @@ async function data(_izContext, settings, srcPath) {
       };
 
       const storageResources = objectSchema.storageResources; // storageResource from main objectType
-      const storageResourceTag = Object.keys(storageResources); // storage ResourceTag from main objectType
+      let cloneDeepStorageResources = lodash.cloneDeep(storageResources)
+      for (let [storageResourceTag, storageResourceSetting] of Object.entries(cloneDeepStorageResources)) {
+        if (storageResourceSetting.storageType === STORAGE_TYPES.dynamoDB) {
+          delete cloneDeepStorageResources[storageResourceTag]
+        }
+      }
+      const storageResourceTags = Object.keys(cloneDeepStorageResources); // storage ResourceTag from main objectType
       const compositeKeyDeliminator = objectSchema.compositeKeyDeliminator;
 
       propertyValueObjectSchemas.push(
@@ -98,11 +106,11 @@ async function data(_izContext, settings, srcPath) {
 
       for (let propertyValueObjectSchema of propertyValueObjectSchemas) {
         Object.assign(propertyValueObjectSchema, {
-          storageResources: storageResources, // add storageResources
+          storageResources: cloneDeepStorageResources, // add storageResources
           compositeKeyDeliminator: compositeKeyDeliminator
         })
         for (let attributeTreeFieldName of Object.values(propertyValueObjectSchema.fieldNames)) {
-          Object.assign(attributeTreeFieldName, { storageResourceTags: storageResourceTag }) // add storageResourceTags for each fieldName
+          Object.assign(attributeTreeFieldName, { storageResourceTags: storageResourceTags }) // add storageResourceTags for each fieldName
         }
       };
       for (const propertyValueObjectSchema of propertyValueObjectSchemas) {

package/src/reStructure/TemplateData/propertyValueSchema/relationshipPropertyValueSchema/data.js

@@ -19,11 +19,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const path = require('path');
 const fs = require('fs');
+const lodash = require('lodash')
 const {
   SOURCE_PATH,
   PREFIX_RELATIONSHIP,
   PROPERTY_VALUE_TAG,
-  SAVE_FILE_NAME
+  SAVE_FILE_NAME,
+  STORAGE_TYPES
 } = require('../../../../MainLibs/src/Consts');
 
 const templatePath = path.join(__dirname, "./tempRelationship.ejs");
@@ -87,7 +89,14 @@ function createSourceParams(_izContext, objectSchema, settings, srcPath) {
   const attributeRelationships = [];
   // const objectType = objectSchema.objectType; // main objectType
   let propertyValue = settings.propertyValueTag
-  const storageResources = objectSchema.storageResources // storageResource from main objectType
+  const storageResources = objectSchema.storageResources; // storageResource from main objectType
+  let cloneDeepStorageResources = lodash.cloneDeep(storageResources)
+  for (let [storageResourceTag, storageResourceSetting] of Object.entries(cloneDeepStorageResources)) {
+    if (storageResourceSetting.storageType === STORAGE_TYPES.dynamoDB) {
+      delete cloneDeepStorageResources[storageResourceTag]
+    }
+  }
+
   const serviceTag = getLocalConfig(path.join(srcPath, "../"), "iz_serviceTag")
   attributeRelationships.push(
     { // has{objectType}propertyValue
@@ -105,7 +114,7 @@ function createSourceParams(_izContext, objectSchema, settings, srcPath) {
           linkType: "many",
           requiredOnCreate: true
         },
-        storageResources,
+        cloneDeepStorageResources,
         "from"
       )
     },
@@ -125,7 +134,7 @@ function createSourceParams(_izContext, objectSchema, settings, srcPath) {
           linkType: "many",
           requiredOnCreate: false
         },
-        storageResources,
+        cloneDeepStorageResources,
         "from"
       )
     },
@@ -145,7 +154,7 @@ function createSourceParams(_izContext, objectSchema, settings, srcPath) {
           linkType: "one",
           requiredOnCreate: false
         },
-        storageResources,
+        cloneDeepStorageResources,
         "from"
       )
     }