@izara_project/izara-market-library-service-schemas 1.0.28 → 1.0.30

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

@@ -6,9 +6,6 @@
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
-        filterPatterns: #**** need to update serverless framwork upper v.2.69.1
-        - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>"]}}} # functionName of callingFlow
-        - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role
     #<#<%- functionName %><%- handlerType %>IamRole#>
     #<#/<%- functionName %><%- handlerType %>IamRole#>

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

@@ -22,7 +22,7 @@ const path = require('path');
 const templatePath = path.join(__dirname, "./template.ejs")
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../../../MainLibs/src/Utils")
 
-const { HANDLER, SOURCE_PATH } = require('../../../../../../../../MainLibs/src/Consts');
+const { HANDLER, SOURCE_PATH, FUNCTION_NAME } = require('../../../../../../../../MainLibs/src/Consts');
 
 /**
  * receive objectSchema
@@ -36,7 +36,7 @@ function data(_izContext, srcPath) {
 }
 
 function createSourceParams(_izContext, srcPath) {
-  let functionName = "ReservedLimitComplete";
+  let functionName = upperCase(FUNCTION_NAME.reservedLimit);
   let handlerType = upperCase(HANDLER.hdrSqs);
 
   return {

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

@@ -17,56 +17,51 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-// const AWS = require('aws-sdk');
-// const sqs = new AWS.SQS({ apiVersion: '2012-11-05' });
-
 const izara = require("@izara_project/izara-middleware");
 const middleware = izara.middlewareHandler;
+const izaraShared = require('@izara_project/izara-shared');
 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 Logger = require('@izara_project/izara-core-library-logger');
 
-const reservedLimitComplete = require('./ReservedLimitComplete_Main');
+const reservedLimit = require('./ReservedLimit_Main');
 
-// validate event properties in body.Message of sqs event
-middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
+middleware.setServiceSchema(recordHandlerSharedLib.baseValidatorSchema());
 
-// set schema for record.body.Message
 let perRecordsValidatorSchema = {
   type: "object",
-  required: [
-    'returnMessage',
-    'errorsFound',
-    'passStatus'
-  ],
+  required: ["objType", "objInstanceFull"],
   properties: {
-    returnMessage: {
-      type: "object"
-    },
-    errorsFound: {
-      type: "array"
+    objType: {
+      type: "object",
+      required: ["objectType", "serviceTag"],
+      properties: {
+        objectType: {
+          type: "string",
+          pattern: "^[a-zA-Z0-9_-]+$"
+        },
+        serviceTag: {
+          type: "string",
+          pattern: "^[a-zA-Z0-9_-]+$"
+        }
+      },
     },
-    passStatus: {
-      type: 'boolean'
+    objInstaceFull: {
+      type: "object",
+      properties: {
+        identifiers: {
+          type: "object",
+          minProperties: 1
+        },
+        fields: {
+          type: "object"
+        }
+      }
     }
   }
 };
 
-// set schema for record.body.MessageAttributes
-// const messageAttributeValidatorSchema = {
-//   type: "object",
-//   required: ['msgAtrrParam1', 'msgAtrrParam2'],
-//   properties: {
-//     msgAtrrParam1: {
-//       type: "string"
-//     },
-//     msgAtrrParam2: {
-//       type: "object"
-//     }
-//   }
-// };
-
-perRecordsValidatorSchema = callingFlowSharedLib.addOptionalPassBackPropertiesToValidatorSchema(perRecordsValidatorSchema)
+perRecordsValidatorSchema = callingFlowSharedLib.addOptionalPassBackPropertiesToValidatorSchema(perRecordsValidatorSchema);
 
 module.exports.main = middleware.wrap(async (event, context, callback) => {
 
@@ -80,26 +75,26 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       let passOnProperties = []
       record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
 
-      // validate message (and MessageAttributes)
+      //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
+        "GetPresignUrlHdrSqs", // 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
       );
 
       // add argument (to invoke lambda) to passOnProperties[]
-      passOnProperties.push(record.body.Message.returnMessage)
-      passOnProperties.push(record.body.Message.errorsFound)
-      passOnProperties.push(record.body.Message.passStatus)
-      passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message))
+      passOnProperties.push(record.body.Message.objType)
+      passOnProperties.push(record.body.Message.objInstanceFull)
+      passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message)) // is Ok PassBackProperties
+      // passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message)) // is Ok callinfFlow
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
 
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
       let recordPromise = recordHandlerSharedLib.recordHandler(
         record, // one record will send to mainFunction
-        reservedLimitComplete.reservedLimitComplete, // mainFunction that need to invoke.
-        "ReservedLimitCompleteHdrSqs", // queue name that need to retry or send to dlq
+        reservedLimit.reservedLimit, // mainFunction that need to invoke.
+        "GetPresignUrlHdrSqs", // queue name that need to retry or send to dlq
         passOnProperties, // all parameters that mainFunction needed.
       );
       record._izContext.logger.debug('after recordPromise in handler');
@@ -111,7 +106,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // --- main await all promises
       await Promise.all(recordPromises); // await all promises
 
-      return event.Records // return all for local test
+      return event.Records // return all for local testing
 
     } catch {
       Logger.debug('Promise.all(recordPromises) in handler threw error (at least one record did no resolve)');
@@ -119,7 +114,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
     Logger.debug('after Promise.all(recordPromises) in handler');
 
   } catch (err) {
-    Logger.error('Unhandled Error, ReservedImageLimitCompleteHdrSqs: ', err);
+    Logger.error('Unhandled Error, updateNodeCompleteHdrSqs: ', err);
     throw (err);
   }
 });

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

@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const path = require('path');
 
 const templatePath = path.join(__dirname, "./template.ejs")
-
-const { SOURCE_PATH } = require('../../../../../../../../MainLibs/src/Consts');
+const { firstLetterUpperCase: upperCase } = require('../../../../../../../../MainLibs/src/Utils')
+const { SOURCE_PATH, FUNCTION_NAME } = require('../../../../../../../../MainLibs/src/Consts');
 
 /**
  * receive objectSchema
@@ -30,18 +30,15 @@ const { SOURCE_PATH } = require('../../../../../../../../MainLibs/src/Consts');
  * @return {{ templatePath, templateData, setting } }
  */
 
-function data(_izContext, flowSchema, srcPath) {
-  return [createSourceParams(_izContext, flowSchema, srcPath)]
+function data(_izContext, srcPath) {
+  return [createSourceParams(_izContext, srcPath)]
 }
 
-function createSourceParams(_izContext, flowSchema, srcPath) {
-  let functionName = "ReservedLimitComplete"
-  let bucketName = flowSchema.bucketName
+function createSourceParams(_izContext, srcPath) {
+  let functionName = upperCase(FUNCTION_NAME.reservedLimit)
   return {
     templatePath: templatePath,
-    templateData: {
-      bucketName
-    },
+    templateData: {},
     setting: {
       saveFileName: `${functionName}_Main`,
       savePath: path.join(srcPath, SOURCE_PATH.webSocket),

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

@@ -17,237 +17,147 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
-const snsSharedLib = require('@izara_project/izara-core-library-sns');
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
-const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
+const snsSharedLib = require('@izara_project/izara-core-library-sns');
 
 const externalRequest = require('@izara_project/izara-core-library-external-request')
-const lambda = externalRequest.lambda;
 const sns = externalRequest.sns;
-
-const { S3Client } = require('@aws-sdk/client-s3');
-const client = new S3Client({ region: 'us-east-2' });
-const { createPresignedPost } = require('@aws-sdk/s3-presigned-post');
-const consts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
-
-const { postToConnection } = require("../../libs/source/ImportDataLib");
+const lambda = externalRequest.lambda
+const consts = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
+const coreConsts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
 const hash = require('object-hash');
-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 { getNestObject } = require("../../libs/source/ImportDataLib");
-const { EXTERNAL_SERVICE_NAME } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
+const importDataLibs = require('../../libs/source/ImportDataLib')
 /**
  * description of function.
  * @param {Object} _izContext
  * @param {CorrelationIds} _izContext.correlationIds - property of _izContext
  * @param {Logger} _izContext.logger - property of _izContext
- * @param {Logger} _izContext.logger - property of _izContext
- * @param {Object} returnMessage - limitValue or limitFound
- * @param {Array} errorsFound - array
- * @param {boolean} passStatus - true || false
- * @param {Object} passBackProperties - identifier
+ * @param {string} userId - from client
+ * @param {string} imageImportConfigId - from client
+ * @param {string} fileName - name of image
+ * @param {string} imageType - type of image
+ * @param {numeric} imageSize - size of image
  *
- * @returns {object} returnResponse
+ * @returns {object} return imageImportId
  */
-
-module.exports.reservedLimitComplete = async (
+module.exports.reservedLimit = async (
   _izContext,
-  returnMessage,
-  errorsFound,
-  passStatus,
-  passBackProperties
+  objType,
+  objInstaceFull,
+  callingFlowConfig = {}
 ) => {
 
   try {
 
-    _izContext.logger.debug('----- ReservedLimitComplete event params -----', {
-      returnMessage: returnMessage,
-      errorsFound: errorsFound,
-      passStatus: passStatus,
-      passBackProperties: passBackProperties
+    _izContext.logger.debug('----- reservedLimit event params ----- ', {
+      objType,
+      objInstaceFull,
+      callingFlowConfig
     });
-
-    const servicePendingId = passBackProperties.passBackProperties.identifier.servicePendingId; // importBatchId
-    const reservedDataId = passBackProperties.passBackProperties.identifier.reservedDataId;
-    const objType = passBackProperties.passBackProperties.objType
-
-    const correlationId = _izContext.correlationIds.get(consts.X_CORRELATION_ID)
-    const connectionId = _izContext.correlationIds.get(consts.CONNECTION_ID)
-
-    // getImportBatchMain from table
-    let importBatchMain = await lambda.invokeSync(_izContext,
-      await lambdaSharedLib.lambdaFunctionName(_izContext, "ImportBatchMainGetHdrInv"),
-      {
-        identifiers: {
-          importBatchId: servicePendingId
-        }
-      }
-    )
-    _izContext.logger.debug("importBatchMain", importBatchMain);
-
     const {
-      importBatchId
-    } = importBatchMain.identifiers
-
-    const {
-      importBatchStatus,
+      userId,
+      submittedByUserId,
       importConfigId,
+      importBatchStatus,
+      importType,
       fileName,
       fileSize,
-      importType,
-      startTime,
-      submittedByUserId,
-      userId
-    } = importBatchMain.fields
-
-    let uniqueIdentify = getNestObject(
-      _izContext,
-      returnMessage,
-      ['limitFound', 'runningTotal', 'uniqueIdentify', 'usedTimestampId']
-    );
-    _izContext.logger.debug("uniqueIdentify", uniqueIdentify);
-
-    await dynamodbSharedLib.putItem(_izContext,
-      await dynamodbSharedLib.tableName(_izContext, "ReservedDataMain"),
-      {
-        servicePendingId: importBatchId, // importBatchId
-        reservedDataId: reservedDataId,
-        reservedValue: fileSize,
-        uniqueIdentify: uniqueIdentify
-      }
-    );
-
-    if (passStatus === false) { // if passStatus false post message to client
-      // use correlationId to get connectionId and use connectionId to post message to client
-
-      _izContext.logger.debug("reserved has reach limit");
-
-      errorsFound.push("reserved has reach limit")
-      // update importBatchMainTable
-      let updateImportBatchMainMsg = {
-        objInstanceFull: {
-          identifiers: {
-            importBatchId: importBatchId
-          },
-          fields: {
-            importBatchStatus: "error",
-            errorsFound: errorsFound
-          }
-        }
-      }
-
-      let sendMessageToUpdateImportBatch = {
-        Message: JSON.stringify(updateImportBatchMainMsg),
-        TopicArn: await snsSharedLib.snsTopicArn(_izContext, `InImportBatchMainUpdate`)
-      }
-      _izContext.logger.debug("sendMessageToUpdateImportBatch", sendMessageToUpdateImportBatch);
-
-      // cancel reserved
-
-
-      let cancelReservedMsg = {
-        userId: userId,
-        limitTag: returnMessage.limitTag,
-        uniqueIdentify: uniqueIdentify
-      };
-
-      let sendMessageToCancelReserved = {
-        Message: JSON.stringify(cancelReservedMsg),
-        TopicArn: await snsSharedLib.snsTopicArn(_izContext, 'InCancelUsage', EXTERNAL_SERVICE_NAME.accountLimits)
-      };
-
-      _izContext.logger.debug("sendMessageToCancelReserved", sendMessageToCancelReserved);
-      await sns.publishAsync(_izContext, sendMessageToCancelReserved);
-
-      await postToConnection({ message: "reserved has reach limit" }, connectionId)
-      // after post message delete websocket task
-      await dynamodbSharedLib.deleteItem(_izContext,
-        await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
-        {
-          taskKey: correlationId,
-          connectionId: connectionId
-        }
-      )
+      startTime
+    } = objInstaceFull.fields
+    const {
+      importBatchId
+    } = objInstaceFull.identifiers
+
+    let connectionId = _izContext.correlationIds.get(coreConsts.CONNECTION_ID)
+    //* hard code
+    // _izContext['userId'] = 'this-is-uuid-for-user-superUserA'
+
+    // get static
+    let payloadBeforeInvokeStaticLimit = {
+      userId: userId,
+      limitTag: consts.LIMIT_TAG.uploadData,
+      value: fileSize,
+      rbacType: consts.RBAC_TYPE.appLevel,
+      targetUserId: submittedByUserId,
+      callingFlow: "BasDev",
+      callingFlowProperties: {}
     }
 
-    // store reservedDataId and servicePendingId in ReservedDataMain
-
+    let res = await importDataLibs.getDataFromInvokeFunctionWithCache(_izContext,
+      await lambdaSharedLib.lambdaFunctionName(_izContext, "StaticLimitProcessHdrInv", consts.EXTERNAL_SERVICE_NAME.accountLimits),
+      payloadBeforeInvokeStaticLimit
+    )
+    // let res = await lambda.invokeSync(_izContext,
+    //   await lambdaSharedLib.lambdaFunctionName(_izContext, "StaticLimitProcessHdrInv", consts.EXTERNAL_SERVICE_NAME.accountLimits),
+    //   payloadBeforeInvokeStaticLimit
+    // )
 
-    const Key = `${fileName}.${importType}`
+    _izContext.logger.debug("res::", res);
 
-    const maximumSize = fileSize * 1048576 // convert to byte unit for restrict
-    _izContext.logger.debug("maximumSize", maximumSize);
+    if (res.passStatus === false) {
+      importDataLibs.postToConnection({ message: "static limit over" }, connectionId)
+    }
 
-    // create PresignUrl
-    let createPresignUrlParam = {
-      Bucket: "<%- bucketName %>",
-      Key: Key,
-      Conditions: [
-        ["content-length-range", 0, maximumSize],
-        ["starts-with", "$Content-Type", "file/csv"],
-        ["eq", "$x-amz-meta-importBatchId", importBatchId]
-      ],
-      fields: {},
-      expires: 86400
-    };
-    _izContext.logger.debug('createPresignUrlParam', createPresignUrlParam);
 
-    const uploadUrl = await createPresignedPost(client, createPresignUrlParam);
+    // reservedDynamic
 
-    uploadUrl.fields['x-amz-meta-importBatchId'] = importBatchId;
-    uploadUrl.fields['Content-Type'] = `file/${importType}`;
+    let sendMsgReservedDynamic = {
+      userId: userId,
+      limitTag: consts.LIMIT_TAG.uploadData,
+      value: fileSize,
+      rbacType: consts.RBAC_TYPE.appLevel,
+      usedTimestamp: startTime,
+      targetUserId: submittedByUserId
+    }
 
-    _izContext.logger.debug('uploadUrlLimitSize: ', uploadUrl) // return as object type = {url, fields}
+    const reservedDataId = `${consts.ACCOUNTLIMIT_TAG.reservedDynamic}_${userId}_${consts.LIMIT_TAG.uploadData}`
 
-    // update to waiting to upload
-    if (importBatchStatus === "processing") {
+    let callingFlowProperties = {
+      identifier: {
+        servicePendingId: importBatchId,
+        reservedDataId: reservedDataId
+      },
+      importConfigId: importConfigId,
+      objType: objType
+    }
 
-      let updateImportBatchMainMsg = {
-        objInstanceFull: {
-          identifiers: {
-            importBatchId: importBatchId
-          },
-          fields: {
-            importBatchStatus: "waitingToUpload",
-            expiryTimestamp: (startTime + (createPresignUrlParam.expires * 1000))
-          }
-        }
-      }
+    _izContext.logger.debug("callingFlowProperties", callingFlowProperties);
 
-      updateImportBatchMainMsg = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
-        updateImportBatchMainMsg,
+    if (callingFlowConfig) {
+      sendMsgReservedDynamic = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
+        sendMsgReservedDynamic,
         callingFlowSharedLib.addParentCallingFlowConfig(
-          returnMessage, // resive parent callingFlowConfig.
-          callingFlowSharedLib.createCallingFlowConfig( // callinfflow own service
-            await lambdaSharedLib.lambdaFunctionName(_izContext, `WebSocketTaskComplete`), {}
+          callingFlowConfig,
+          callingFlowSharedLib.createCallingFlowConfig(
+            await lambdaSharedLib.lambdaFunctionName(_izContext, "ReservedLimitCompleteHdrSqs"),
+            callingFlowProperties
           )
         )
+      )
+    } else {
+      sendMsgReservedDynamic = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
+        sendMsgReservedDynamic,
+        callingFlowSharedLib.createCallingFlowConfig(
+          await lambdaSharedLib.lambdaFunctionName(_izContext, "ReservedLimitCompleteHdrSqs"),
+          callingFlowProperties
+        )
       );
+    }
 
-      _izContext.logger.debug("after add callingFlow", updateImportBatchMainMsg)
-
-      let sendMessageToUpdateImportBatch = {
-        Message: JSON.stringify(updateImportBatchMainMsg),
-        TopicArn: await snsSharedLib.snsTopicArn(_izContext, `In${objType.objectType}Update`)
-      }
-      _izContext.logger.debug("sendMessageToUpdateImportBatch", sendMessageToUpdateImportBatch);
-      await sns.publishAsync(_izContext, sendMessageToUpdateImportBatch);
-
-      await dynamodbSharedLib.updateItem(_izContext,
-        await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
-        {
-          taskKey: correlationId,
-          connectionId: connectionId
-        },
-        {
-          uploadUrl: uploadUrl
-        }
-      )
+    let sendMessageToReservedDynamic = {
+      Message: JSON.stringify(sendMsgReservedDynamic),
+      TopicArn: await snsSharedLib.snsTopicArn(_izContext, "InReservedDynamicUsage", consts.EXTERNAL_SERVICE_NAME.accountLimits)
+    };
+    _izContext.logger.debug("sendMessageToReservedDynamic", sendMessageToReservedDynamic);
+    await sns.publishAsync(_izContext, sendMessageToReservedDynamic);
+
+    return {
+      objType,
+      objInstaceFull,
     }
   } catch (err) {
-    _izContext.logger.error('error ReservedImageLimitComplete: ', err)
+    _izContext.logger.error('error GetSignedUrlAccountLimit: ', err);
     throw (err)
   }
 }

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/{getSignUrls → reservedLimit}/sqs/data.js

@@ -19,9 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const path = require("path")
 
-const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../../../../../../../MainLibs/src/Consts');
+const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME } = require('../../../../../../../../MainLibs/src/Consts');
 const { TOPIC_NAME_GENERATE_CODE } = require("../../../../../../../../GenerateCodeLibs/src/Consts");
-
+const { firstLetterUpperCase: upperCase } = require("../../../../../../../../MainLibs/src/Utils");
 const templatePath = path.join(__dirname, './template.ejs');
 
 
@@ -48,8 +48,8 @@ function data(_izContext, srcPath) {
 
   WebSocketSqsQueueNames.push(
     {
-      queueName: "GetPresignUrl",
-      subscription: TOPIC_NAME_GENERATE_CODE.createNodeComplete
+      queueName: upperCase(FUNCTION_NAME.reservedLimit),
+      subscription: "Out" + upperCase(FUNCTION_NAME.createObjectComplete)
     }
   )
 

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/{getSignUrls → reservedLimit}/sqs/template.ejs

@@ -1,9 +1,9 @@
 ##===== SNS Subscription
 ##===== [Topic In]
-  Subscription<%- subscription %>:
+  Subscription<%- queueName %>:
     Type: AWS::SNS::Subscription
     Properties:
-      TopicArn: !Ref Out<%- subscription %>
+      TopicArn: !Ref <%- subscription %>
       Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs"
       Protocol: "sqs"
 ##===== [Queue]

package/src/reStructure/TemplateData/flowSchema/components/upload/processFile/functionYml/HdrS3/data.js

@@ -34,7 +34,9 @@ const {
   shortNameHandler,
   FUNCTION_NAME,
   LAMBDA_RESOURCE,
-  SOURCE_GENERATE_IAM_ROLE
+  SOURCE_GENERATE_IAM_ROLE,
+  ACTIONS,
+  HANDLER
 } = require('../../../../../../../../MainLibs/src/Consts');
 
 const templatePath = path.join(__dirname, "./template.ejs")
@@ -75,8 +77,8 @@ function createSourceParam(_izContext, flowSchema, srcPath) {
         ]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sqs, functionName + handlerType),
-        resourceNames(RESOURCE_CLASSES.sqs, functionName + handlerType + "DLQ")
+        resourceNames(RESOURCE_CLASSES.sqs, functionName),
+        resourceNames(RESOURCE_CLASSES.sqs, functionName + "DLQ")
       ]
     ),
     createIamRole(
@@ -84,7 +86,7 @@ function createSourceParam(_izContext, flowSchema, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, "In" + functionName)
+        resourceNames(RESOURCE_CLASSES.sns, functionName + "_In")
       ]
     ),
     createIamRole(
@@ -93,8 +95,8 @@ function createSourceParam(_izContext, flowSchema, srcPath) {
         [RESOURCE_CLASSES.lambda]: [LAMBDA_RESOURCE.invokeFunction]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, "InImportBatchMainUpdate"),
-        resourceNames(RESOURCE_CLASSES.lambda, "ImportBatchMainGetHdrInv")
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(ACTIONS.update) + "_In"),
+        resourceNames(RESOURCE_CLASSES.lambda, upperCase(ACTIONS.get) + upperCase(HANDLER.hdrInv)),
       ]
     ),
     createIamRole(

package/src/reStructure/TemplateData/flowSchema/components/upload/processFile/queue/s3Template.ejs

@@ -3,7 +3,7 @@
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message in ProcessImageAfterUploadHdrSqs"
-      TopicName: ${self:custom.iz_resourcePrefix}In<%- queueName %>
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_In
 # ----- [Subscription]
   SNSSubscriptionIn<%- queueName %>:
     Type: AWS::SNS::Subscription

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

@@ -23,8 +23,11 @@ const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../../../../../../MainLibs/s
 const templatePath = path.join(__dirname, "./template.ejs")
 
 function data(_izContext, flowSchema, srcPath) {
-  // console.log("flowSchema", flowSchema)
-  if (flowSchema.createBucket === false) {
+  let createBucket = false
+  if (flowSchema.createBucket) {
+    createBucket = true
+  }
+  if (!createBucket) {
     return []
   } else {
     return [createSourceParams(_izContext, flowSchema, srcPath)]