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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.56",
+  "version": "1.0.58",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -762,7 +762,7 @@ function collectGetData(_izContext, getResults, objectSchema, returnSystemFields
 }
 
 
-async function createUpdateDataDetail(_izContext, objectSchema, settings = { bucketName: consts.OBJECT_SCHEMA_BUCKET_NAME }) {
+async function createUpdateDataDetail(_izContext, objectSchema, settings = { bucketName: process.env.iz_serviceSchemaBucketName }) {
   let getGraphDataDetails = {};
   let getDynamoDbDataDetails = {};
   let allUpdateDataDetail = {};
@@ -826,7 +826,7 @@ async function createUpdateDataDetail(_izContext, objectSchema, settings = { buc
   return allUpdateDataDetail
 }
 
-async function createDataDetailsLib(_izContext, objectSchemas, settings = { bucketName: consts.OBJECT_SCHEMA_BUCKET_NAME }) {
+async function createDataDetailsLib(_izContext, objectSchemas, settings = { bucketName: process.env.iz_serviceSchemaBucketName }) {
   _izContext.logger.debug("Lib: createDataDetailsLib:", { objectSchemas: objectSchemas });
   /**
    * TODO: crate DataDetail now will get parent objectSchema if have extendObjType
@@ -857,7 +857,7 @@ async function createDataDetailsLib(_izContext, objectSchemas, settings = { buck
               [eachStorageResourceTag]: {
                 storageType: consts.STORAGE_TYPES.dynamoDB,
                 tableName: storageResources[eachStorageResourceTag].tableName,
-                serviceTag: process.env.iz_serviceTag,
+                serviceTag: storageResources[eachStorageResourceTag].serviceTag || process.env.iz_serviceTag,
                 fieldNames: [keyFieldName]
               }
             });
@@ -894,34 +894,10 @@ async function createDataDetailsLib(_izContext, objectSchemas, settings = { buck
     }; // end loop storageResourceTags
   }; // end loop
 
-  if (objectSchemas.hasOwnProperty("extendObjType")) {
-    if (objectSchemas.extendObjType.serviceTag !== process.env.iz_serviceTag) {
-      let parentObjectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, objectSchemas.extendObjType, settings.bucketName);
-      _izContext.logger.debug("parentObjectSchema", parentObjectSchema);
-      for (const [fieldName, fieldNameSetting] of Object.entries(parentObjectSchema.fieldNames)) {
-        for (let eachParentStorageResourceTag of fieldNameSetting.storageResourceTags) {
-          let parentStorageResourceTag = objectSchemas.extendObjType.serviceTag + eachParentStorageResourceTag
-          if (storageResources[eachParentStorageResourceTag].storageType === consts.STORAGE_TYPES.dynamoDB) {
-            if (!createDataDetails.hasOwnProperty(parentStorageResourceTag)) {
-              createDataDetails[parentStorageResourceTag] = {
-                storageType: consts.STORAGE_TYPES.dynamoDB,
-                tableName: storageResources[eachParentStorageResourceTag].tableName,
-                serviceTag: objectSchemas.extendObjType.serviceTag,
-                fieldNames: [fieldName]
-              }
-            } else {
-              createDataDetails[parentStorageResourceTag].fieldNames.push(fieldName)
-            }
-          }
-        }
-      }
-    }
-  }
-
   return createDataDetails;
 };
 
-async function createDeleteDataDetail(_izContext, objectSchema, settings = { bucketName: consts.OBJECT_SCHEMA_BUCKET_NAME }) {
+async function createDeleteDataDetail(_izContext, objectSchema, settings = { bucketName: process.env.iz_serviceSchemaBucketName }) {
   let deleteDynamoDataDetail = {};
   let deleteGraphDataDetail = {};
   let allDeleteDataDetail = {};

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

@@ -180,8 +180,8 @@ module.exports.createMain = async (
           });
           _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].randomOnCreate == false ||
+          objectSchemas.fieldNames[identifier.fieldName].randomOnCreate == null) {
 
           if ((objectSchemas.fieldNames[identifier.fieldName].requiredOnCreate == true) &&
             (objectSchemas.fieldNames[identifier.fieldName].canUpdate == false)) {
@@ -197,8 +197,7 @@ module.exports.createMain = async (
             }
           }
         };
-      }
-      if (objectSchemas.fieldNames[identifier.fieldName].hasOwnProperty("hashOnCreate")) {
+      } else if (objectSchemas.fieldNames[identifier.fieldName].hasOwnProperty("hashOnCreate")) {
         if (objectSchemas.fieldNames[identifier.fieldName].hashOnCreate.length &&
           objectSchemas.fieldNames[identifier.fieldName].hashOnCreate.length > 0) {
           for (const fieldName of objectSchemas.fieldNames[identifier.fieldName].hashOnCreate) {
@@ -226,7 +225,7 @@ module.exports.createMain = async (
     _izContext.logger.debug("requestParams is:", requestParams);
 
     // check settingObjSchemas
-    for (let [keyFieldNames, valueFieldNames] of Object.entries(objectSchemas.fieldNames)) {
+    for (const [keyFieldNames, valueFieldNames] of Object.entries(objectSchemas.fieldNames)) {
 
       if (valueFieldNames.hasOwnProperty("randomOnCreate") && valueFieldNames.randomOnCreate === true) {
         listOfRequiredOnCreate.push(keyFieldNames)
@@ -288,7 +287,7 @@ module.exports.createMain = async (
       for (let [storageTag, createDataDetail] of Object.entries(createDataDetails)) {
         //(<beforeCreate>)
         //(</beforeCreate>)
-        if (createDataDetail.storageType == consts.STORAGE_TYPES.dynamoDB) {
+        if (createDataDetail.storageType == consts.STORAGE_TYPES.dynamoDB && createDataDetail.serviceTag === process.env.iz_serviceTag) {
           //(<beforeCreateRecordDynamo>)
           //(</beforeCreateRecordDynamo>)
           _izContext.logger.debug("::::::DynamoDB::::::", { storageTag, objInstanceFull });

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

@@ -103,6 +103,7 @@ module.exports.getMain = async (
 
     const returnSystemFieldsName = requestParams.additionalRequest?.setting?.returnSystemFieldsName || false;
     const throwWhenNotFoundSomeRecord = requestParams.additionalRequest?.setting?.throwWhenNotFoundSomeRecord || true;
+    const returnVersionedData = requestParams.additionalRequest?.setting?.returnVersionedData || true
 
     //(<beforeQuery>)
     //(</beforeQuery>)
@@ -151,10 +152,11 @@ module.exports.getMain = async (
             let graphServiceName = await getGraphServiceTagWithCache(_izContext, getDataDetail.graphServiceTag);
 
 
-            let versionedDataLabels = [];
-            if (getDataDetail.versionedDatas && Object.keys(getDataDetail.versionedDatas).length) {
-              // have versionedData
-              versionedDataLabels = Object.keys(getDataDetail.versionedDatas);
+            if (!returnVersionedData) {
+              if (getDataDetail.versionedDatas && Object.keys(getDataDetail.versionedDatas).length) {
+                // have versionedData
+                versionedDataLabels = Object.keys(getDataDetail.versionedDatas);
+              }
             }
 
 

package/src/reStructure/TemplateData/EndpointPerService/yaml/data.js

@@ -117,27 +117,9 @@ async function createParamForCreateSource(_izContext, allObjSchemas, action, han
     createIamRole(
       { [RESOURCE_CLASSES.sns]: SNS_RESOURCE.publish },
       [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createObjectComplete) + "_Out")
-      ]
-    ),
-
-    createIamRole(
-      { [RESOURCE_CLASSES.sns]: SNS_RESOURCE.publish },
-      [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.updateNodeComplete) + "_Out")
-      ]
-    ),
-    createIamRole(
-      { [RESOURCE_CLASSES.sns]: SNS_RESOURCE.publish },
-      [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.deleteNodeComplete) + "_Out")
-      ]
-    ),
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.sns]: SNS_RESOURCE.publish
-      },
-      [
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createObjectComplete) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.updateNodeComplete) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.deleteNodeComplete) + "_Out"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.getNodeComplete) + "_Out")
       ]
     )
@@ -174,7 +156,7 @@ async function createParamForCreateSource(_izContext, allObjSchemas, action, han
     }
   }
 
-  if (parentTables) {
+  if (parentTables.length > 0) {
     additionalResourcePermission.push(
       createIamRole(
         {

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

@@ -73,7 +73,9 @@ module.exports.confirmNewReserved = async (
     // confirmUsage
     let confirmUsageMessage = {
       userId: userId,
+      //(<optionalLimitTag>)
       limitTag: consts.LIMIT_TAG.uploadData,
+      //(</optionalLimitTag>)
       uniqueIdentify: uniqueIdentify,
     }
 
@@ -111,7 +113,7 @@ module.exports.confirmNewReserved = async (
     }
 
     let sendMessageToUpdateEndpoint = {
-      Message: JSON.stringify(sendMessageToUpdateImportBatchStatus),
+      Message: JSON.stringify(sendMessageToUpdateStatus),
       TopicArn: await snsSharedLib.snsTopicArn(_izContext, "Update_In")
     };
     _izContext.logger.debug("sendMessageToUpdateEndpoint", sendMessageToUpdateEndpoint);

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

@@ -77,7 +77,8 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
         ]
       },
       [
-        resourceNames(RESOURCE_CLASSES.dynamoDbTable, "WebSocketTask")
+        resourceNames(RESOURCE_CLASSES.dynamoDbTable, "WebSocketTask"),
+        resourceNames(RESOURCE_CLASSES.dynamoDbTable, "UserUploadRecords")
       ]
     ),
     createIamRole(

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

@@ -28,6 +28,7 @@ const hash = require('@izara_project/izara-shared-core').objectHash;
 const consts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
 const { postToConnection } = require('../../../../libs/source/GenerateCodeLibs');
 const createObject = require('./CreateObjectS3_Main');
+const { createFlowTypeConcat } = require("@izara_project/izara-core-library-service-schemas").utils
 module.exports.main = middleware.wrap(async (event, context, callback) => {
 
   event._izContext.logger.debug('Event:', event);
@@ -44,14 +45,17 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
           console.log("event in route webSocket", event);
           let eventParams = JSON.parse(event.body)
 
-          await dynamodbSharedLib.putItem(
-            event._izContext,
-            await dynamodbSharedLib.tableName(event._izContext, "WebSocketTask"),
-            {
-              taskKey: correlationId,
-              connectionId: connectionId,
-            }
-          )
+          //(<createIdentifiersFlow>)
+            let identifiers
+          //(</createIdentifiersFlow>)
+
+           await dynamodbSharedLib.putItem(event._izContext,
+              await dynamodbSharedLib.tableName(event._izContext, "WebSocketTask"),
+              {
+                taskKey: `${createFlowTypeConcat(event._izContext, { flowTag: "<%- route %>", serviceTag: process.env.iz_serviceTag })}${identifiers}`,
+                connectionId: connectionId,
+              }
+            )
 
           let callingFlow = eventParams?.callingFlow ? eventParams.callingFlow : {};
           await createObject.createObject(

package/src/reStructure/TemplateData/flowSchema/components/upload/createObject/mainFunction/data.js

@@ -38,26 +38,12 @@ async function data(_izContext, flowSchema, srcPath) {
 
 async function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createObjectS3)
-  let objectSchema = await getObjectSchema.getObjectSchemaCombineFieldNamesWithCache(_izContext, flowSchema.objType)
   let objectType = flowSchema.objType.objectType
-  let createdFieldNames = [];
-  let statusFieldNames = [];
-  for (const [fieldNames, fieldSettings] of Object.entries(objectSchema.fieldNames)) {
-    if (fieldSettings.hasOwnProperty("requiredOnCreate") && fieldSettings.requiredOnCreate === true) {
-      createdFieldNames.push(fieldNames);
-    }
-
-    if (fieldSettings.hasOwnProperty("statusField") && fieldSettings.statusField === true) {
-      statusFieldNames.push(fieldNames)
-    }
-  }
 
   return {
     templatePath: templatePath,
     templateData: {
       flowTag: flowSchema.flowTag,
-      createdFieldNames: createdFieldNames,
-      statusFieldNames: statusFieldNames,
       objectType
     },
     setting: {

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

@@ -33,8 +33,8 @@ const sns = externalRequest.sns
 const utils = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Utils')
 const NoRetryError = require('@izara_project/izara-core-library-core').NoRetryError
 const { v4: uuidv4 } = require('uuid')
-const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
 const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
+const { consts } = require('@izara_project/izara-middleware');
 
 //(<optionalRequired>)
 //(</optionalRequired>)
@@ -67,6 +67,8 @@ module.exports.createObject = async (
     _izContext.logger.debug("WebSocketInvoke requestParams", requestParams)
     _izContext.logger.debug("WebSocketInvoke callingFlowConfig", callingFlowConfig)
 
+    let connectionId = _izContext.correlationIds.get(consts.CONNECTION_ID)
+
     let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
       flowTag: "<%- flowTag %>",
       serviceTag: process.env.iz_serviceTag
@@ -74,30 +76,34 @@ module.exports.createObject = async (
 
     _izContext.logger.debug("getFlowSchema", flowSchema)
 
-    let userId = _izContext.correlationIds.get(coreConsts.BASE_USER_ID)
-    let submittedByUserId = _izContext.correlationIds.get(coreConsts.TARGET_ID);
-
-    if (!flowSchema) {
-      throw new NoRetryError(`flowTag not found ${requestParams.flowTag}`)
+    let getUserFromTableUserUploadRecord = await dynamodbSharedLib.getItem(_izContext,
+    await dynamodbSharedLib.tableName(_izContext, "UserUploadRecords"),
+    {
+      connectionId: connectionId
     }
+  )
 
-    if (flowSchema.uploadS3 === true) {
-      if (!flowSchema.hasOwnProperty("objType")) {
-        throw new NoRetryError(`flowTag has uploadS3 setting should have objType in flowSchema`)
-      }
-    };
+  const { userId, submittedByUserId } = getUserFromTableUserUploadRecord
+  _izContext.correlationIds.set(consts.BASE_USER_ID, userId)
+  _izContext.correlationIds.set(consts.TARGET_ID, submittedByUserId)
+
+  if (!flowSchema) {
+      throw new NoRetryError(`flowTag not found ${requestParams.action}`)
+    }
 
     // get objectType
     let objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(_izContext, flowSchema.objType)
     _izContext.logger.debug("objectSchema in flowSchema mainFunction", objectSchema)
 
-    _izContext.correlationIds.get(coreConsts.X_CORRELATION_ID)
+  if (!objectSchema) {
+    throw new NoRetryError(`${flowSchema.objType.objectType} not found`)
+  }
 
     //(<beforeCreateHook>)
     //(</beforeCreateHook>)
     // create message Object to create Endpoint
     let messageObject = {
-      objectType: <%- objectType %>
+      objectType: "<%- objectType %>",
       fieldNames: {
         //(<fieldNamesHook>)
         //(</fieldNamesHook>)

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/createPresignUrl/mainFunction/data.js

@@ -37,10 +37,12 @@ function data(_izContext, flowSchema, srcPath) {
 function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createPresignUrl)
   let bucketName = flowSchema.bucketName
+  let flowTag = flowSchema.flowTag
   return {
     templatePath: templatePath,
     templateData: {
-      bucketName
+      bucketName,
+      flowTag
     },
     setting: {
       saveFileName: `${functionName}_Main`,

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

@@ -37,6 +37,10 @@ const hash = require('@izara_project/izara-shared-core').objectHash;
 const utils = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Utils');
 const coreConsts = require('@izara_project/izara-core-library-core/src/Consts');
 const { EXTERNAL_SERVICE_NAME } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
+const { createFlowTypeConcat } = require("@izara_project/izara-core-library-service-schemas").utils
+//(<optionalRequired>)
+//(</optionalRequired>)
+
 /**
  * description of function.
  * @param {Object} _izContext
@@ -80,9 +84,9 @@ module.exports.createPresignUrl = async (
     let getResult = await lambda.invokeSync(_izContext,
       await lambdaSharedLib.lambdaFunctionName(_izContext, "GetHdrInv"),
       {
-        objectType: objType.objectType
-        //(<identifiers>)
-        //(</identifiers>)
+        objectType: objType.objectType,
+        //(<identifiersForGetData>)
+        //(</identifiersForGetData>)
       }
     )
     _izContext.logger.debug("getResult", getResult);
@@ -99,10 +103,9 @@ module.exports.createPresignUrl = async (
 
     await dynamodbSharedLib.putItem(_izContext,
       await dynamodbSharedLib.tableName(_izContext, "ReservedDataMain"),
-      {
-        //(<createReservedDataMain>)
-        //(</createReservedDataMain>)
-      }
+      //(<createReservedDataMain>)
+      {}
+      //(</createReservedDataMain>)
     );
 
     if (passStatus === false) { // if passStatus false post message to client
@@ -115,8 +118,8 @@ module.exports.createPresignUrl = async (
       let updateStatusField = {
         objInstanceFull: {
           identifiers: {
-            //(<identifiers>)
-            //(</identifiers>)
+            //(<identifiersForUpdateStatus>)
+            //(</identifiersForUpdateStatus>)
           },
           fields: {
             //(<fields>)
@@ -128,7 +131,7 @@ module.exports.createPresignUrl = async (
 
       let sendMessageToUpdateEndpoint = {
         Message: JSON.stringify(updateStatusField),
-        TopicArn: await snsSharedLib.snsTopicArn(_izContext, `Update_In`)
+        TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, `Update_In`)
       }
       _izContext.logger.debug("sendMessageToUpdateEndpoint", sendMessageToUpdateEndpoint);
 
@@ -142,7 +145,7 @@ module.exports.createPresignUrl = async (
 
       let sendMessageToCancelReserved = {
         Message: JSON.stringify(cancelReservedMsg),
-        TopicArn: await snsSharedLib.snsTopicArn(_izContext, 'CancelUsage_In', EXTERNAL_SERVICE_NAME.accountLimits)
+        TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, 'CancelUsage_In', EXTERNAL_SERVICE_NAME.accountLimits)
       };
 
       _izContext.logger.debug("sendMessageToCancelReserved", sendMessageToCancelReserved);
@@ -157,6 +160,7 @@ module.exports.createPresignUrl = async (
           connectionId: connectionId
         }
       )
+      return "reserved not pass"
     }
 
     //(<createKeyForUploadFile>)
@@ -198,14 +202,15 @@ module.exports.createPresignUrl = async (
       let messageObject = {
         objInstanceFull: {
           identifiers: {
-            importBatchId: importBatchId
+          //(<identifiersForUpdateTable>)
+          //(</identifiersForUpdateTable>)
           },
           fields: {
             importBatchStatus: "waitingToUpload",
-            expiryTimestamp: (startTime + (createPresignUrlParam.expires * 1000))
+            expiryTimestamp: (getResult.startTime + (createPresignUrlParam.expires * 1000))
           }
         },
-        objectType: objType,objectType
+        objectType: objType.objectType
       }
 
       messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
@@ -222,15 +227,20 @@ module.exports.createPresignUrl = async (
 
       let sendMessageToUpdateEndpoint = {
         Message: JSON.stringify(messageObject),
-        TopicArn: await snsSharedLib.snsTopicArn(_izContext, "Update_In")
+        TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "Update_In")
       }
       _izContext.logger.debug("sendMessageToUpdateEndpoint", sendMessageToUpdateEndpoint);
       await sns.publishAsync(_izContext, sendMessageToUpdateEndpoint);
 
+
+      //(<createIdentifiersFlow>)
+        let identifiers
+      //(</createIdentifiersFlow>)
+
       await dynamodbSharedLib.updateItem(_izContext,
         await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
         {
-          taskKey: correlationId,
+          taskKey: `${createFlowTypeConcat(_izContext, { flowTag: "<%- flowTag %>", serviceTag: process.env.iz_serviceTag })}${identifiers}`,
           connectionId: connectionId
         },
         {

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

@@ -58,17 +58,16 @@ module.exports.reservedLimit = async (
       callingFlowConfig
     });
 
+    let connectionId = _izContext.correlationIds.get(coreConsts.CONNECTION_ID)
+
     //(<beforeReserved>)
     //(</beforeReserved>)
 
-    let connectionId = _izContext.correlationIds.get(coreConsts.CONNECTION_ID)
-    //* hard code
-    // _izContext['userId'] = 'this-is-uuid-for-user-superUserA'
 
     // get static
     let payloadBeforeInvokeStaticLimit = {
       userId: _izContext.correlationIds.get(coreConsts.BASE_USER_ID),
-      targetUserId: _izContext.correlationIds.get(coreConsts.TARGET_ID),
+      targetId: _izContext.correlationIds.get(coreConsts.TARGET_ID),
       //(<additionalPropertiesStaticLimit>)
       //(</additionalPropertiesStaticLimit>)
     }
@@ -88,13 +87,11 @@ module.exports.reservedLimit = async (
 
     let sendMsgReservedDynamic = {
       userId: _izContext.correlationIds.get(coreConsts.BASE_USER_ID),
-      targetUserId: _izContext.correlationIds.get(coreConsts.TARGET_ID)
+      targetId: _izContext.correlationIds.get(coreConsts.TARGET_ID),
       //(<additionalPropertiesReservedDynamic>)
       //(</additionalPropertiesReservedDynamic>)
     }
 
-    const reservedDataId = `${consts.ACCOUNTLIMIT_TAG.reservedDynamic}_${userId}_${consts.LIMIT_TAG.uploadData}`
-
     let callingFlowProperties = {
       //(<baseCallingFlowProperties>)
       //(</baseCallingFlowProperties>)
@@ -108,9 +105,9 @@ module.exports.reservedLimit = async (
         callingFlowSharedLib.addParentCallingFlowConfig(
           callingFlowConfig,
           callingFlowSharedLib.createCallingFlowConfig(
-            //(<callingFlowProperties>)
+            //(<callingFlowPropertiesIfHaveCallingFlowConfig>)
             await lambdaSharedLib.lambdaFunctionName(_izContext, "ReservedLimitCompleteHdrSqs"),
-            //(</callingFlowProperties>)
+            //(</callingFlowPropertiesIfHaveCallingFlowConfig>)
             callingFlowProperties
           )
         )
@@ -119,9 +116,9 @@ module.exports.reservedLimit = async (
       sendMsgReservedDynamic = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
         sendMsgReservedDynamic,
         callingFlowSharedLib.createCallingFlowConfig(
-          //(<callingFlowProperties>)
+          //(<callingFlowPropertiesIfNotHaveCallingFlowConfig>)
           await lambdaSharedLib.lambdaFunctionName(_izContext, "ReservedLimitCompleteHdrSqs"),
-          //(</callingFlowProperties>)
+          //(</callingFlowPropertiesIfNotHaveCallingFlowConfig>)
           callingFlowProperties
         )
       );
@@ -142,7 +139,7 @@ module.exports.reservedLimit = async (
 
     let sendMessageToReservedDynamic = {
       Message: JSON.stringify(sendMsgReservedDynamic),
-      TopicArn: await snsSharedLib.snsTopicArn(_izContext, "ReservedDynamicUsage_In", consts.EXTERNAL_SERVICE_NAME.accountLimits)
+      TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "ReservedDynamicUsage_In", consts.EXTERNAL_SERVICE_NAME.accountLimits)
     };
     _izContext.logger.debug("sendMessageToReservedDynamic", sendMessageToReservedDynamic);
     await sns.publishAsync(_izContext, sendMessageToReservedDynamic);

package/src/reStructure/TemplateData/flowSchema/components/upload/processFile/functionYml/HdrS3/template.ejs

@@ -3,9 +3,6 @@
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:
-    - sqs:
-        arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %>
-        batchSize: 10
     - s3:
         bucket: <%- bucketName %>
         event: s3:ObjectCreated:*

package/src/reStructure/TemplateData/flowSchema/components/upload/relate/S3/data.js

@@ -36,10 +36,13 @@ function data(_izContext, flowSchema, srcPath) {
 
 function createSourceParams(_izContext, flowSchema, srcPath) {
   let bucketName = flowSchema.bucketName
+  let resourceName = bucketName.split("-").join("")
+
   return {
     templatePath: templatePath,
     templateData: {
-      bucketName
+      bucketName,
+      resourceName
     },
     setting: {
       initialData: 'Resources:\n',

package/src/reStructure/TemplateData/flowSchema/components/upload/relate/S3/template.ejs

@@ -1,4 +1,4 @@
-  <%- bucketName %>:
+  <%- resourceName %>:
     Type: AWS::S3::Bucket
     DependsOn:
       - SNSInProcessAfterUploadS3Policy

package/src/reStructure/TemplateData/flowSchema/components/upload/relate/libs/template.ejs

@@ -22,10 +22,7 @@ const lambda = externalRequest.lambda;
 const lambdaSharedLib = require('@izara_project/izara-core-library-lambda')
 const { ApiGatewayManagementApiClient, PostToConnectionCommand } = require("@aws-sdk/client-apigatewaymanagementapi");
 const hash = require('@izara_project/izara-shared-core').objectHash;
-<% if (uploadS3) { %>
-  const csv = require('csv-parser');
-  const streamifier = require('streamifier');
-<% } %>
+
 const { NoRetryError,inMemoryCacheLib } = require('@izara_project/izara-core-library-core');
 
 const client = new ApiGatewayManagementApiClient({
@@ -74,43 +71,6 @@ const processStaticLimitWithCache = inMemoryCacheLib(
   }
 )
 
-<% if (uploadS3) { %>
-/**
- *
- * @param {Object} _izContext
- * @param {Object} data - S3 data
- * @returns
- */
-async function isValidCsv(_izContext, data) {
-  _izContext.logger.debug("function checkValidCsv", { data })
-  let errorCheckCsv = [];
-  let validCsv = true;
-  let rowCount = 0;
-  let columnCount = null;
-
-  streamifier.createReadStream(data.Body).pipe(csv()).on('data', (row) => {
-    rowCount++;
-    if (columnCount === null) {
-      columnCount = Object.keys(row).length
-    } else if (Object.keys(row).length !== columnCount) {
-      validCsv = false
-      errorCheckCsv.push(`Row ${rowCount} has inconsistent columns: ${JSON.stringify(row)}`)
-    }
-  })
-    .on('end', () => {
-      if (rowCount === 0) {
-        errorCheckCsv.push("csv file not have data row")
-      } else {
-        _izContext.logger.debug("validCsv")
-      }
-    })
-    .on('error', (error) => {
-      errorCheckCsv.push(`error:: ${error}`)
-    })
-
-  return [validCsv, errorCheckCsv]
-}
-<% } %>
 
 /**
  *
@@ -133,10 +93,7 @@ function getNestObject(_izContext, nestedObj, paths) {
 
 module.exports = {
   postToConnection,
-  getDataFromInvokeFunction,
-  getDataFromInvokeFunctionWithCache,
-  getNestObject,
-  <% if (uploadS3) { %>
-    isValidCsv,
-  <% } %>
+  processStaticLimit,
+  processStaticLimitWithCache,
+  getNestObject
 }