@izara_project/izara-market-library-service-schemas 1.0.58 → 1.0.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.58",
+  "version": "1.0.60",
   "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/reStructure/TemplateData/EndpointPerService/mainFunction/create/template.ejs

@@ -169,49 +169,62 @@ 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)
+      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].randomOnCreate == false ||
-          objectSchemas.fieldNames[identifier.fieldName].randomOnCreate == null) {
+      } 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 ((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]
-              });
+          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 {
+            errorsFound.push("[invalid]requestParams not have data fieldNames of requiredOnCreate");
           }
-        };
+        }
       } 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(
-              requestParams.fieldNames, {
-              [identifier.fieldName]: hash({
-                [fieldName]: requestParams.fieldNames[fieldName]
-              })
-            }
-            )
+            Object.assign(hashFieldName, {
+              [fieldName]: requestParams.fieldNames[fieldName]
+            })
+          }
+
+          Object.assign(
+            requestParams.fieldNames, {
+            [identifier.fieldName]: hash(hashFieldName)
           }
+          )
+
         } else {
           errorsFound.push("[invalid] no data to hash for create")
         }
+      } else if (objectSchemas.fieldNames[identifier.fieldName].hasOwnProperty("optionalOnCreate")) {
+        if ((objectSchemas.fieldNames[identifier.fieldName].optionalOnCreate == true)) {
+          Object.assign(
+            requestParams.fieldNames, {
+            [identifier.fieldName]: hash({
+              //(<createIdentifiersOptionalOnCreate>)
+              //(</createIdentifiersOptionalOnCreate>)
+            })
+          }
+          )
+        }
       } else {
         if ((objectSchemas.fieldNames[identifier.fieldName].requiredOnCreate === false) &&
           (objectSchemas.fieldNames[identifier.fieldName].optionalOnCreate === false) &&
@@ -287,7 +300,7 @@ module.exports.createMain = async (
       for (let [storageTag, createDataDetail] of Object.entries(createDataDetails)) {
         //(<beforeCreate>)
         //(</beforeCreate>)
-        if (createDataDetail.storageType == consts.STORAGE_TYPES.dynamoDB && createDataDetail.serviceTag === process.env.iz_serviceTag) {
+        if (createDataDetail.storageType == consts.STORAGE_TYPES.dynamoDB) {
           //(<beforeCreateRecordDynamo>)
           //(</beforeCreateRecordDynamo>)
           _izContext.logger.debug("::::::DynamoDB::::::", { storageTag, objInstanceFull });
@@ -308,7 +321,8 @@ module.exports.createMain = async (
             _izContext,
             await dynamodbSharedLib.tableName(
               _izContext,
-              createDataDetail.tableName
+              createDataDetail.tableName,
+              createDataDetail.serviceTag
             ),
             {
               ...identifiersForCreateData,

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

@@ -154,88 +154,33 @@ module.exports.deleteMain = async (
       await sns.publishAsync(_izContext, messageParams);
 
       return deleteNodeCompleteMessage
-    };
+    } else {
 
-
-    for await (const [storageTag, deleteDataDetail] of Object.entries(deleteDataDetails)) {
-      if (deleteDataDetail.storageType === consts.STORAGE_TYPES.dynamoDB) {
-        _izContext.logger.debug("dynamoDb process")
-
-        let identifiersForDeleteData = await dynamoDbIdentifiersByStorageResource(
-          _izContext,
-          objectSchema,
-          deleteDataDetail,
-          requestParams.identifiers
-        )
-
-        _izContext.logger.debug("identifiersForDeleteData", identifiersForDeleteData)
-
-        // deleteItem in dynamo
-        await dynamodbSharedLib.deleteItem(_izContext,
-          await dynamodbSharedLib.tableName(_izContext, deleteDataDetail.tableName),
-          identifiersForDeleteData
-        );
-
-      } else if (deleteDataDetail.storageType === consts.STORAGE_TYPES.graph) {
-        _izContext.logger.debug("graph process")
-
-        let deleteNodeParams = {
-          objType: objType,
-          identifiers: requestParams.identifiers
-        }
-        deleteNodeParams = callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(
-          deleteNodeParams,
-          callingFlowSharedLib.addParentCallingFlowConfig(
-            callingFlowConfig,
-            callingFlowSharedLib.createCallingFlowConfig(
-              //(<callingFlowProperties>)
-              await lambdaSharedLib.lambdaFunctionName(_izContext, TOPIC_NAME_GENERATE_CODE.deleteNodeComplete), {}
-              //(</callingFlowProperties>)
-            )
-          )
-        )
-        _izContext.logger.debug("messageObject before send message: ", deleteNodeParams);
-
-        let messageAttributes;
-
-        let deleteNodeMessageBody = {
-          Message: JSON.stringify(deleteNodeParams),
-          MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-          TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GRAPH_HANDLER.inDeleteNode, storageTag)
-        }
-
-        _izContext.logger.debug("request message params before send to IndeleteNode::", deleteNodeMessageBody);
-
-        let resSns = await sns.publishAsync(_izContext, deleteNodeMessageBody)
-        _izContext.logger.debug('reSNS send to topic InDeleteNode finish', resSns)
-      }
-
-      if (objectSchema.hasOwnProperty("extendObjType")) {
-        if (deleteDataDetail.storageType === consts.STORAGE_TYPES.dynamoDB && deleteDataDetail.serviceTag !== process.env.iz_serviceTag) {
+      for await (const [storageTag, deleteDataDetail] of Object.entries(deleteDataDetails)) {
+        if (deleteDataDetail.storageType === consts.STORAGE_TYPES.dynamoDB) {
+          _izContext.logger.debug("dynamoDb process")
 
           let identifiersForDeleteData = await dynamoDbIdentifiersByStorageResource(
             _izContext,
             objectSchema,
             deleteDataDetail,
             requestParams.identifiers
-          )
-          _izContext.logger.debug("identifiersForDeleteData", identifiersForDeleteData);
+            )
 
-          await dynamodbSharedLib.deleteItem(
-            _izContext,
-            await dynamodbSharedLib.tableName(
-              _izContext,
-              deleteDataDetail.tableName,
-              deleteDataDetail.serviceTag
-            ),
+            _izContext.logger.debug("identifiersForDeleteData", identifiersForDeleteData)
+
+            // deleteItem in dynamo
+            await dynamodbSharedLib.deleteItem(_izContext,
+            await dynamodbSharedLib.tableName(_izContext, deleteDataDetail.tableName, deleteDataDetail.serviceTag),
             identifiersForDeleteData
-          );
+            );
+
+          }
         }
-      }
-    };
+      };
 
 
-  } catch (err) {
-    throw (err)
-  }
+      } catch (err) {
+        throw (err)
+      }
 }

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

@@ -101,9 +101,11 @@ module.exports.getMain = async (
       callingFlowConfig
     });
 
-    const returnSystemFieldsName = requestParams.additionalRequest?.setting?.returnSystemFieldsName || false;
-    const throwWhenNotFoundSomeRecord = requestParams.additionalRequest?.setting?.throwWhenNotFoundSomeRecord || true;
-    const returnVersionedData = requestParams.additionalRequest?.setting?.returnVersionedData || true
+    const errorsFound = [];
+
+    const returnSystemFieldsName = requestParams.additionalRequest?.setting?.returnSystemFieldsName ?? false;
+    const throwWhenNotFoundSomeRecord = requestParams.additionalRequest?.setting?.throwWhenNotFoundSomeRecord ?? true;
+    const returnVersionedData = requestParams.additionalRequest?.setting?.returnVersionedData ?? true
 
     //(<beforeQuery>)
     //(</beforeQuery>)
@@ -151,8 +153,8 @@ module.exports.getMain = async (
             // get data from graph
             let graphServiceName = await getGraphServiceTagWithCache(_izContext, getDataDetail.graphServiceTag);
 
-
-            if (!returnVersionedData) {
+            let versionedDataLabels = [];
+            if (returnVersionedData) {
               if (getDataDetail.versionedDatas && Object.keys(getDataDetail.versionedDatas).length) {
                 // have versionedData
                 versionedDataLabels = Object.keys(getDataDetail.versionedDatas);
@@ -228,7 +230,7 @@ module.exports.getMain = async (
 
             let dataFromDynamoDb = await dynamodbSharedLib.getItem(
               _izContext,
-              await dynamodbSharedLib.tableName(_izContext, getDataDetail.tableName),
+              await dynamodbSharedLib.tableName(_izContext, getDataDetail.tableName, getDataDetail.serviceTag),
               identifiersForGetData
             );
 
@@ -254,33 +256,6 @@ module.exports.getMain = async (
             getResults.push([dataFromDynamoDb, getDataDetail]);
 
           }
-
-          if (objectSchema.hasOwnProperty("extendObjType")) {
-            if (getDataDetail.storageType === consts.STORAGE_TYPES.dynamoDB && getDataDetail.serviceTag !== process.env.iz_serviceTag) {
-
-              let identifiersForGetData = await dynamoDbIdentifiersByStorageResource(
-                _izContext,
-                objectSchema,
-                getDataDetail,
-                requestParams.identifiers
-              )
-              _izContext.logger.debug("identifiersForGetData", identifiersForGetData);
-
-              let getParent = await dynamodbSharedLib.getItem(
-                _izContext,
-                await dynamodbSharedLib.tableName(
-                  _izContext,
-                  getDataDetail.tableName,
-                  getDataDetail.serviceTag
-                ),
-                identifiersForGetData
-              );
-
-              getResults.push([getParent, getDataDetail]);
-            }
-
-
-          }
         })
     );
 

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

@@ -308,7 +308,7 @@ module.exports.updateMain = async (
 
             let updateItem = await dynamodbSharedLib.updateItem(
               _izContext,
-              await dynamodbSharedLib.tableName(_izContext, updateDataDetail.tableName),
+              await dynamodbSharedLib.tableName(_izContext, updateDataDetail.tableName, updateDataDetail.serviceTag),
               identifiersForUpdateData,
               fieldForUpdateTableDynamo,
               {
@@ -324,7 +324,7 @@ module.exports.updateMain = async (
               }
 
               if (callingFlowConfig[callingFlowSharedLib.consts.CALLINGFLOWPROPERTIES_PROPERTYNAME]) {
-                _izContext.logger.debug("HAVE CALLINGFLOW");
+                _izContext.logger.debug("HAVE CALLING FLOW");
 
                 messageObject = callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(callingFlowConfig, messageObject);
                 let messageAttributes = callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(callingFlowConfig, {});

package/src/reStructure/TemplateData/externalService/lambdaRole/template.ejs

@@ -54,6 +54,8 @@ module.exports.generatedLambdaRole = async () => {
       ]
     },
     <%_ }) %>
+    //(<additionalRole>)
+    //(</additionalRole>)
   ]
    return externalLambdaRole
 }

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/functionYaml/data.js

@@ -120,7 +120,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
       functionNameConfig: functionName + upperCase(handlerType),
       resourceLocation: path.join(SOURCE_PATH.resourceLocationWebSocket, flowSchema.flowTag, "source/"),
       additionalResourcePermission,
-      functionNameConfig: upperCase("ReservedLimitComp") + upperCase(shortNameHandler(handlerType)),
+      functionNameConfig: functionName + upperCase(shortNameHandler(handlerType)),
       roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
     },
     setting: {

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

@@ -83,7 +83,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // validate message (and MessageAttributes)
       await recordHandlerSharedLib.validateRecord(
         record, // one record will send to mainFunction
-        "ReservedLimitCompleteHdrSqs", // queue name that need to retry or send to dlq
+        "CreatePresignUrlHdrSqs", // queue name that need to retry or send to dlq
         perRecordsValidatorSchema, // schema for record.Message
         // messageAttributeValidatorSchema  // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
       );
@@ -101,7 +101,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       let recordPromise = recordHandlerSharedLib.recordHandler(
         record, // one record will send to mainFunction
         createPresignUrl.createPresignUrl, // mainFunction that need to invoke.
-        "ReservedLimitCompleteHdrSqs", // queue name that need to retry or send to dlq
+        "CreatePresignUrlHdrSqs", // queue name that need to retry or send to dlq
         passOnProperties, // all parameters that mainFunction needed.
       );
       record._izContext.logger.debug('after recordPromise in handler');

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

@@ -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"
     }
 
@@ -167,7 +175,7 @@ module.exports.createPresignUrl = async (
       const Key = `${fileName}.${importType}`
     //(</createKeyForUploadFile>)
 
-    const maximumSize = fileSize * 1048576 // convert to byte unit for restrict
+    const maximumSize = getResult.fields.fileSize * 1048576 // convert to byte unit for restrict
     _izContext.logger.debug("maximumSize", maximumSize);
 
     // create PresignUrl
@@ -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
@@ -218,7 +226,7 @@ module.exports.createPresignUrl = async (
         callingFlowSharedLib.addParentCallingFlowConfig(
           returnMessage, // resive parent callingFlowConfig.
           callingFlowSharedLib.createCallingFlowConfig( // calling flow own service
-            await lambdaSharedLib.lambdaFunctionName(_izContext, `WebSocketTaskComplete`), {}
+            await lambdaSharedLib.lambdaFunctionName(_izContext, `WebSocketComplete`), {}
           )
         )
       );
@@ -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

@@ -37,12 +37,15 @@ const {
   externalResourceSns,
   externalResourceName,
   SOURCE_GENERATE_IAM_ROLE,
-  FUNCTION_NAME
+  FUNCTION_NAME,
+  DYNAMO_RESOURCE
 } = require('../../../../../../../../MainLibs/src/Consts');
 
 const {
   TOPIC_NAME_GENERATE_CODE
 } = require('../../../../../../../../GenerateCodeLibs/src/Consts');
+const { STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
+const getObjectSchema = require('@izara_project/izara-core-library-service-schemas').getObjectSchema
 
 /**
  * receive objectSchema
@@ -51,15 +54,15 @@ const {
  * @return {{ templatePath, templateData, setting } }
  */
 
-function data(_izContext, flowSchema, srcPath) {
-  return [createSourceParams(_izContext, flowSchema, srcPath)]
+async function data(_izContext, flowSchema, srcPath) {
+  return [await createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, flowSchema, srcPath) {
+async function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.reservedLimit);
   let handlerType = upperCase(HANDLER.hdrSqs);
   let additionalResourcePermission = defaultIamRolePerAction();
-
+  let tableNames = [];
   additionalResourcePermission.push(
     createIamRole(
       {
@@ -72,16 +75,37 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
         [RESOURCE_CLASSES.sns]: [
           SNS_RESOURCE.publish,
           SNS_RESOURCE.subscribe
-        ]
+        ],
       },
       [
         resourceNames(RESOURCE_CLASSES.sqs, functionName + handlerType),
         resourceNames(RESOURCE_CLASSES.sqs, functionName + handlerType + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, TOPIC_NAME_GENERATE_CODE.outCreateNodeComplete)
+        resourceNames(RESOURCE_CLASSES.sns, TOPIC_NAME_GENERATE_CODE.outCreateNodeComplete),
       ]
     )
   )
 
+  additionalResourcePermission.push(awaitingMultipleStepsRole())
+
+  let objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, flowSchema.objType)
+
+  for (const storageResource of Object.values(objectSchema.storageResources)) {
+    if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
+      tableNames.push(storageResource.tableName)
+    }
+  }
+
+  additionalResourcePermission.push(
+    createIamRole(
+      {
+        [RESOURCE_CLASSES.dynamoDbTable]: Object.values(DYNAMO_RESOURCE)
+      },
+      tableNames.map(tableName =>
+        resourceNames(RESOURCE_CLASSES.dynamoDbTable, tableName)
+      )
+    )
+  )
+
   return {
     templatePath: templatePath,
     templateData: {

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

@@ -28,6 +28,8 @@ const consts = require('@izara_project/izara-market-library-service-schemas/src/
 const coreConsts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
 const hash = require('@izara_project/izara-shared-core').objectHash;
 const importDataLibs = require('../../../../libs/source/GenerateCodeLibs');
+const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
+
 /**
  * description of function.
  * @param {Object} _izContext
@@ -66,8 +68,6 @@ module.exports.reservedLimit = async (
 
     // get static
     let payloadBeforeInvokeStaticLimit = {
-      userId: _izContext.correlationIds.get(coreConsts.BASE_USER_ID),
-      targetId: _izContext.correlationIds.get(coreConsts.TARGET_ID),
       //(<additionalPropertiesStaticLimit>)
       //(</additionalPropertiesStaticLimit>)
     }
@@ -81,13 +81,14 @@ module.exports.reservedLimit = async (
 
     if (res.passStatus === false) {
       importDataLibs.postToConnection({ message: "static limit over" }, connectionId)
+      //(<afterFailReservedStaticLimit>)
+      return
+      //(</afterFailReservedStaticLimit>)
     }
 
     // reservedDynamic
 
     let sendMsgReservedDynamic = {
-      userId: _izContext.correlationIds.get(coreConsts.BASE_USER_ID),
-      targetId: _izContext.correlationIds.get(coreConsts.TARGET_ID),
       //(<additionalPropertiesReservedDynamic>)
       //(</additionalPropertiesReservedDynamic>)
     }

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

@@ -24,15 +24,29 @@ const izara = require("@izara_project/izara-middleware");
 const middleware = izara.middlewareHandler;
 const recordHandlerSharedLib = require("@izara_project/izara-core-library-record-handler")
 const Logger = require('@izara_project/izara-core-library-logger');
-
+const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const <%- functionName %> = require('./<%- functionName %>_Main')
 
+middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
+  {
+    type: "object",
+    required: ['body', 'messageAttributes'],
+    properties: {
+      body: {
+        type: 'object',
+      },
+      messageAttributes: {
+        type: 'object'
+      }
+    }
+  }
+));
+
 // validate event properties in body.Message of sqs event
 let perRecordsValidatorSchema = {
   //(<validatorSchema>)
   //(</validatorSchema>)
 }
-middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
 module.exports.main = middleware.wrap(async (event, context, callback) => {
 
@@ -43,6 +57,9 @@ 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);
 
@@ -58,6 +75,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       passOnProperties.push(record.body.Message)
       //(<additionalParams>)
       //(</additionalParams>)
+      passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message));
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
 
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)

package/src/reStructure/TemplateData/flowSchema/generateTemplateData.js

@@ -203,7 +203,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
           // const webSocketCreateObjectStordCache = createWebSocketCreateObjectStoredCache(_izContext, saveFilePath);
 
-          const reservedLimitFunctionYaml = createReservedLimitFunctionYaml(_izContext, flowSchema, saveFilePath);
+          const reservedLimitFunctionYaml = await createReservedLimitFunctionYaml(_izContext, flowSchema, saveFilePath);
           const reservedLimitHandlerFunction = createReservedLimitHandler(_izContext, flowSchema, saveFilePath);
           const reservedLimitMainFunction = await createReservedLimitMainFunction(_izContext, flowSchema, saveFilePath);
           const reservedLimitQueueName = createReservedLimitQueueName(_izContext, saveFilePath);

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/handler/template.ejs

@@ -24,7 +24,7 @@ const izara = require("@izara_project/izara-middleware");
 const middleware = izara.middlewareHandler;
 const recordHandlerSharedLib = require("@izara_project/izara-core-library-record-handler")
 const Logger = require('@izara_project/izara-core-library-logger');
-
+const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const <%- functionName %> = require('./<%- functionName %>_Main')
 
 // validate event properties in body.Message of sqs event

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/mainFunction/template.ejs

@@ -37,6 +37,8 @@ const { v4: uuidv4 } = require('uuid')
 const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
 const consts = require("@izara_project/izara-middleware").consts
 const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
+const { createFlowTypeConcat } = require("@izara_project/izara-core-library-service-schemas").utils
+
 //(<optionalRequire>)
 //(</optionalRequire>)
 /**
@@ -73,25 +75,34 @@ module.exports.<%- functionName %> = async (
       throw new NoRetryError('not have TopicArn for get FlowSchemas')
     }
 
-    let topicName = topicArn.spilt(":")[5].split("_")
+    let topicName = topicArn.split(":")[5].split("_")
+    let flowTag = topicName[2]
 
     let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
-      flowTag: topicName[2],
+      flowTag: flowTag,
       serviceTag: topicName[0]
     })
 
+    if (!flowSchema) {
+      if (requestParams.hasOwnProperty("flowTag")) {
+        flowTag = requestParams.flowTag;
+        flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
+          flowTag: flowTag,
+          serviceTag: process.env.iz_serviceTag
+        })
+      } else {
+        throw new NoRetryError("Could not find flowSchema from topicArn or requestParams.flowTag")
+      }
+    }
+
     //(<createIdentifiersFlow>)
       let identifiers
     //(</createIdentifiersFlow>)
 
-    if (!flowSchema) {
-      throw new NoRetryError("not have flowSchema in S3")
-    }
-
     let wbsTasks;
     let taskKey;
     if (flowSchema.statusType === "statusField" || flowSchema.statusType === "storedCache" || flowSchema.statusType === "triggerCache") {
-      taskKey = `${createFlowTypeConcat(_izContext,{flowTag: topicName[2],serviceTag: topicName[0]})}${identifiers}`
+      taskKey = `${createFlowTypeConcat(_izContext,{flowTag: flowTag, serviceTag: topicName[0]})}${identifiers}`
       wbsTasks = await dynamodbSharedLib.query(
         _izContext,
         await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
@@ -100,7 +111,7 @@ module.exports.<%- functionName %> = async (
         }
       )
     } else if (flowSchema.statusType === "none") {
-      taskKey = `${createFlowTypeConcat(_izContext,{flowTag: topicName[2],serviceTag: topicName[0]})}${correlationId}`
+      taskKey = `${createFlowTypeConcat(_izContext,{flowTag: flowTag, serviceTag: topicName[0]})}${correlationId}`
       wbsTasks = await dynamodbSharedLib.query(
         _izContext,
         await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
@@ -108,22 +119,22 @@ module.exports.<%- functionName %> = async (
           taskKey: taskKey
         }
       )
-      }
+    }
 
     if (wbsTasks.Items.length) {
-      await Promise.all(wbsTasks.Items.map(async ({ connectionId }) => {
-        await postToConnection(
-          {
-            message: requestParams
-          },
-          connectionId
-        )
+      await Promise.all(wbsTasks.Items.map(async (wbsTask) => {
+        let postMessage = { message: requestParams }
+
+        //(<beforePostMessage>)
+        //(</beforePostMessage>)
+
+        await postToConnection(postMessage, wbsTask.connectionId)
 
         await dynamodbSharedLib.deleteItem(_izContext,
           await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
           {
-            taskKey: taskKey,
-            connectionId: connectionId
+            taskKey: wbsTask.taskKey,
+            connectionId: wbsTask.connectionId
           }
         )
       }))

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,17 +83,20 @@ 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
+            errorsFound: errorsFound,
           };
 
+          //(<additionalProperties>)
+          //(</additionalProperties>)
+
           updateCompleteMsg = callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(passBackProperties, updateCompleteMsg);
           _izContext.logger.debug("after addCallingFlow to SnsResponseMessageObject", updateCompleteMsg);
 

package/src/reStructure/TemplateData/resourceYaml/filterGenerateResource/data.js

@@ -36,6 +36,8 @@ const { NoRetryError } = require("@izara_project/izara-core-library-core");
 
 async function filterCreateResourceYaml(_izContext, createSourceParams, objSchemaPath) {
   let tableNamesToFilter = new Set();
+  let ownServiceTag = getLocalConfig(path.join(objSchemaPath, "../../"), "iz_serviceTag")
+
   const allLocalFlowSchema = await getObjectSchema.getAllLocalFlowSchemas(_izContext, objSchemaPath);
   await Promise.all(allLocalFlowSchema.records.map(async (flowSchema) => {
     if (flowSchema.statusType === "storedCache") {
@@ -48,9 +50,16 @@ async function filterCreateResourceYaml(_izContext, createSourceParams, objSchem
   const allLocalObjSchema = await getObjectSchema.getAllLocalObjectSchemasWithHierarchy(_izContext, objSchemaPath);
   await Promise.all(allLocalObjSchema.records.map(async (objSchema) => {
     if (objSchema.hasOwnProperty("extendObjType")) {
-      tableNamesToFilter.add(...await getParentTableFromObjSchema(_izContext, objSchema, objSchemaPath))
+      for (const storageResource of Object.values(objSchema.storageResources)) {
+        if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
+          if (storageResource?.serviceTag !== ownServiceTag) {
+            tableNamesToFilter.add(storageResource.tableName)
+          }
+        }
+      }
     }
   }))
+
   let filteredCreateSourceParams = createSourceParams.filter(
     (result) => !tableNamesToFilter.has(result.templateData.tableName)
   )
@@ -75,17 +84,3 @@ async function getStoredCacheTableFromFlowSchema(_izContext, flowSchema, objSche
   }
   return tableNameStoredCache;
 }
-
-async function getParentTableFromObjSchema(_izContext, objSchema, objSchemaPath) {
-  let parentTableNames = new Set();
-  let ownServiceTag = getLocalConfig(path.join(objSchemaPath, "../../"), "iz_serviceTag")
-  for (const storageResource of Object.values(objSchema.storageResources)) {
-    if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
-      if (storageResource.serviceTag && storageResource.serviceTag !== ownServiceTag) {
-        parentTableNames.add(storageResource.tableName)
-      }
-    }
-  }
-
-  return parentTableNames
-}