@izara_project/izara-market-library-service-schemas 1.0.72 → 1.0.73

package/package.json

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

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

@@ -102,10 +102,21 @@ module.exports.getMain = async (
     });
 
     const errorsFound = [];
+    let returnSystemFieldsName = false;
+    let throwWhenNotFoundSomeRecord = true;
+    let returnVersionedData = true;
 
-    const returnSystemFieldsName = requestParams.additionalParams?.setting?.returnSystemFieldsName ?? false;
-    const throwWhenNotFoundSomeRecord = requestParams.additionalParams?.setting?.throwWhenNotFoundSomeRecord ?? true;
-    const returnVersionedData = requestParams.additionalParams?.setting?.returnVersionedData ?? true
+    if (requestParams.additionalParams.hasOwnProperty("settings")) {
+      if (requestParams.additionalParams.settings.hasOwnProperty("returnSystemFieldsName") && requestParams.additionalParams.settings.returnSystemFieldsName === true) {
+        returnSystemFieldsName = true;
+      }
+      if (requestParams.additionalParams.settings.hasOwnProperty("throwWhenNotFoundSomeRecord") && requestParams.additionalParams.settings.throwWhenNotFoundSomeRecord === false) {
+        throwWhenNotFoundSomeRecord = false;
+      }
+      if (requestParams.additionalParams.settings.hasOwnProperty("returnVersionedData") && requestParams.additionalParams.settings.returnVersionedData === false) {
+        returnVersionedData = false;
+      }
+    };
 
     //(<beforeQuery>)
     //(</beforeQuery>)

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

@@ -88,8 +88,17 @@ module.exports.updateMain = async (
       callingFlowConfig
     });
 
-    const returnSystemFieldsName = requestParams?.additionalParams?.settings?.returnSystemFieldsName ?? false;
-    const returnOldData = requestParams?.additionalParams?.settings?.returnOldData ?? false;
+    let returnSystemFieldsName = false;
+    let returnOldData = false;
+
+    if (requestParams.additionalParams.hasOwnProperty("settings")) {
+      if (requestParams.additionalParams.settings.hasOwnProperty("returnSystemFieldsName") && requestParams.additionalParams.settings.returnSystemFieldsName === true) {
+        returnSystemFieldsName = true;
+      }
+      if (requestParams.additionalParams.settings.hasOwnProperty("returnOldData") && requestParams.additionalParams.settings.returnOldData === true) {
+        returnOldData = true;
+      }
+    };
 
     let errorsFound = [];
 

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

@@ -57,16 +57,18 @@ const templatePath = path.join(__dirname, "./template.ejs")
  * @return {{ templatePath, templateData, setting } }
  */
 async function data(_izContext, allObjSchemas, srcPath) {
-  let createSourceSet = new Set();
-  console.debug('templatePath:::', templatePath)
+  let createSourceParams = [];
+  // console.debug('templatePath:::', templatePath)
   for (const action of Object.values(ACTIONS)) {
     const defaultHandlers = DEFAULT_HANDLER_PER_ACTION[action]
     for (const defaultHandler of defaultHandlers) {
       const createSourceParam = await createParamForCreateSource(_izContext, allObjSchemas, action, defaultHandler, srcPath)
-      createSourceParam && createSourceSet.add(createSourceParam)
+      if (createSourceParam && !createSourceParams.includes(createSourceParam)) {
+        createSourceParams.push(createSourceParam)
+      }
     }
   }
-  return [...createSourceSet];
+  return createSourceParams;
 }
 
 async function createParamForCreateSource(_izContext, allObjSchemas, action, handler, srcPath) {

package/src/reStructure/TemplateData/EndpointPerService/yaml/template.ejs

@@ -2,12 +2,16 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(action)}_${firstLetterUpperCase(handlerType)}.main`) %>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(action) %><%- firstLetterUpperCase(handlerType) %>
-  events:
+  role: <%- firstLetterUpperCase(roleName) _%>Role
+  #<#<%- firstLetterUpperCase(action) %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
+  #<#/<%- firstLetterUpperCase(action) %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
   <%_ if (handlerType === "hdrDsq" || handlerType === "hdrSqs") { _%>
+  events:
     - sqs:
         arn: <%- event %>
         batchSize: 10
   <%_ } else if (handlerType === "hdrApi") { _%>
+  events:
     <%_ resourceApis.forEach(resourceApi => { _%>
     - httpApi:
         path: /<%- serviceTag %>/<%- resourceApi.event %>/<%- action %>
@@ -23,9 +27,6 @@
         #<#/<%- firstLetterUpperCase(resourceApi.event) _%><%- firstLetterUpperCase(handlerType) %>UserLevelAuthorizer#>
           <%_ }) _%>
   <%_ } _%>
-  role: <%- firstLetterUpperCase(roleName) _%>Role
-    #<#<%- firstLetterUpperCase(action) %><%- firstLetterUpperCase(handlerType) %>IamRole#>
-    #<#/<%- firstLetterUpperCase(action) %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/externalService/snsTopicSubscriptions/data.js

@@ -48,32 +48,46 @@ const createExternalSnsSubscriptions = async (_izContext, allObjSchemas, allRelS
   const snsServiceConfigArray = [];
 
   const snsServiceConfigUpdateRelationshipComplete = await snsSubScriptionUpdateRelationshipComplete(_izContext, allRelSchemas)
-  snsServiceConfigUpdateRelationshipComplete && snsServiceConfigArray.push(snsServiceConfigUpdateRelationshipComplete)
+  if (snsServiceConfigUpdateRelationshipComplete) {
+    snsServiceConfigArray.push(snsServiceConfigUpdateRelationshipComplete)
+  };
 
   const snsServiceConfigCreateRelationshipComplete = await snsSubscriptionCreateRelationshipComplete(_izContext, allRelSchemas)
-  snsServiceConfigCreateRelationshipComplete && snsServiceConfigArray.push(snsServiceConfigCreateRelationshipComplete)
+  if (snsServiceConfigCreateRelationshipComplete) {
+    snsServiceConfigArray.push(snsServiceConfigCreateRelationshipComplete)
+  };
 
   const snsServiceConfigDeleteRelationshipComplete = await snsSubscriptionDeleteRelationshipComplete(_izContext, allRelSchemas)
-  snsServiceConfigDeleteRelationshipComplete && snsServiceConfigArray.push(snsServiceConfigDeleteRelationshipComplete);
-
+  if (snsServiceConfigDeleteRelationshipComplete) {
+    snsServiceConfigArray.push(snsServiceConfigDeleteRelationshipComplete);
+  };
   const snsServiceConfigUpdateNodeComplete = await snsSubscriptionOutUpdateNodeComplete(_izContext, allObjSchemas)
-  snsServiceConfigUpdateNodeComplete && snsServiceConfigArray.push(snsServiceConfigUpdateNodeComplete)
+  if (snsServiceConfigUpdateNodeComplete) {
+    snsServiceConfigArray.push(snsServiceConfigUpdateNodeComplete)
+  };
 
   const snsServiceConfigCreateNodeComplete = await snsSubscriptionCreateNodeComplete(_izContext, allObjSchemas)
-  snsServiceConfigCreateNodeComplete && snsServiceConfigArray.push(snsServiceConfigCreateNodeComplete);
+  if (snsServiceConfigCreateNodeComplete) {
+    snsServiceConfigArray.push(snsServiceConfigCreateNodeComplete)
+  };
 
   const snsServiceConfigDeleteNodeComplete = await snsSubscriptionDeleteNodeComplete(_izContext, allObjSchemas)
-  snsServiceConfigDeleteNodeComplete && snsServiceConfigArray.push(snsServiceConfigDeleteNodeComplete);
+  if (snsServiceConfigDeleteNodeComplete) {
+    snsServiceConfigArray.push(snsServiceConfigDeleteNodeComplete);
+  }
 
   if (allLocalFlowSchemas) {
     for (const localFlowSchema of allLocalFlowSchemas) {
       for (const event of localFlowSchema.event) {
         if (event.includes("s3")) {
           const snsServiceConfigForReservedDynamicUsage = await snsSubscriptionReservedLimitCompleteForReservedDynamicUsage(_izContext);
-          snsServiceConfigForReservedDynamicUsage && snsServiceConfigArray.push(snsServiceConfigForReservedDynamicUsage);
-
+          if (snsServiceConfigForReservedDynamicUsage) {
+            snsServiceConfigArray.push(snsServiceConfigForReservedDynamicUsage);
+          }
           const snsServiceConfigForConfirmReserved = await snsSubscriptionConfirmReserved(_izContext);
-          snsServiceConfigForConfirmReserved && snsServiceConfigArray.push(snsServiceConfigForConfirmReserved);
+          if (snsServiceConfigForConfirmReserved) {
+            snsServiceConfigArray.push(snsServiceConfigForConfirmReserved);
+          }
         }
       }
     }

package/src/reStructure/TemplateData/findData/findDataYaml/data.js

@@ -141,7 +141,7 @@ async function data(_izContext, objectSchemas, srcPath, settings) {
   )
 
   // console.log("additionalResourcePermission", additionalResourcePermission)
-  console.log("findData template generated")
+  // console.log("findData template generated")
   return {
     templatePath: templatePath,
     templateData: {

package/src/reStructure/TemplateData/findData/findDataYaml/template.ejs

@@ -2,13 +2,13 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+  role: <%- roleName %>Role
+  #<#<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
+  #<#/<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
   events:
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
-  role: <%- roleName %>Role
-    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
-    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/flowSchema/CreateRecordComplete/functionYaml/template.ejs

@@ -2,6 +2,9 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
+  role: <%- roleName %>Role
   events:
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %>
@@ -9,9 +12,6 @@
         filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-  role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

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

@@ -2,6 +2,9 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+  role: <%- roleName %>Role
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
@@ -9,9 +12,6 @@
         filterPatterns: #**** need to update serverless framework 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#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

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

@@ -2,16 +2,16 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
-  events:
-    - websocket:
-        route: $default
-    - websocket:
-        route: <%- route %>
-        # authorizer: ${self:custom.iz_authorizerAppLevel}
-      # identifierResource: 'route.request.header.Auth'
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
+  events:
+  - websocket:
+      route: $default
+  - websocket:
+      route: <%- route %>
+      # authorizer: ${self:custom.iz_authorizerAppLevel}
+    # identifierResource: 'route.request.header.Auth'
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

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

@@ -2,6 +2,9 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+  role: <%- roleName %>Role
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
@@ -9,9 +12,6 @@
         filterPatterns: #**** need to update serverless framework upper v.2.69.1
         - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
         - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-  role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

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

@@ -2,6 +2,9 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+  role: <%- roleName %>Role
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
@@ -9,9 +12,7 @@
         filterPatterns: #**** need to update serverless framework 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#>
+
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

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

@@ -2,13 +2,13 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
+  role: <%- roleName %>Role
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- functionName %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
-  role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

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

@@ -2,6 +2,9 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+  role: <%- roleName %>Role
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - s3:
         bucket: <%- bucketName %>
@@ -13,9 +16,7 @@
             - prefix: uploads/
             - suffix: .csv
         forceDeploy: true
-  role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/flowSchema/components/websocket/connect/functionYaml/template.ejs

@@ -2,6 +2,9 @@
 <%- firstLetterUpperCase(functionName) -%>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}.main`) %>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
+  role: <%- roleName %>Role
+  #<#<WebSocketConnectSetting#>
+  #<#/<WebSocketConnectSetting#>
   events:
     - websocket:
         route: $connect
@@ -9,10 +12,6 @@
         route: $disconnect
     - websocket:
         route: $default
-  role: <%- roleName %>Role
-#<#<WebSocketConnectIamRole#>
-#<#/<WebSocketConnectIamRole#>
-
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/flowSchema/eventBridge/functionYaml/template.ejs

@@ -2,6 +2,9 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${functionName}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionNameConfig) %>
+  role: <%- roleName %>Role
+  #<#<%- functionName %>FunctionSetting#>
+  #<#/<%- functionName %>FunctionSetting#>
   events:
     <%_ schedules.forEach((schedule) => { _%>
     - schedule:
@@ -10,9 +13,6 @@
         rate: <%- schedule.rate %>
         input: <%- JSON.stringify(schedule.input) %>
     <%_ }) _%>
-  role: <%- roleName %>Role
-  #<#<%- functionName %>IamRole#>
-  #<#/<%- functionName %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/flowSchema/externalTopic/Complete/functionYaml/template.ejs

@@ -2,6 +2,9 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
+  role: <%- roleName %>Role
   events:
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>
@@ -9,9 +12,6 @@
         filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-  role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

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

@@ -2,6 +2,9 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+  role: <%- roleName %>Role
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>
@@ -9,9 +12,6 @@
         filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-  role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComplete/functionYaml/template.ejs

@@ -2,6 +2,9 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+  role: <%- roleName %>Role
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>
@@ -9,9 +12,7 @@
         filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-  role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComponent/functionYaml/template.ejs

@@ -2,6 +2,9 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+  role: <%- roleName %>Role
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>
@@ -9,9 +12,7 @@
         filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-  role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/FlowSchemaComponent/functionYaml/template.ejs

@@ -2,14 +2,14 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+  role: <%- roleName %>Role
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - websocket:
         route: <%- route %>
         # authorizer: ${self:custom.iz_authorizerAppLevel}
       # identifierResource: 'route.request.header.Auth'
-  role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/FlowSchemaComponent/handler/template.ejs

@@ -51,7 +51,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
           let eventParams = JSON.parse(event.body)
 
           //(<createIdentifiersFlow>)
-          let identifiers
+          let identifiers = ""
           //(</createIdentifiersFlow>)
 
           let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(

package/src/reStructure/TemplateData/flowSchema/flowStep/functionYaml/template.ejs

@@ -2,6 +2,9 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+  role: <%- roleName %>Role
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>
@@ -9,9 +12,6 @@
         filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-  role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

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

@@ -186,7 +186,8 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     if (allLocalFlowSchemas.records.length) {
       createSourceParams.push(
         ...webSocketResource,
-        ...webSocketCompleteComponent
+        ...webSocketCompleteComponent,
+        ...userUploadRecordTable
       )
     }
 
@@ -299,7 +300,6 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
             ...processAfterUploadResources,
             ...confirmAfterUploadResources,
             ...snsTopicOutFlowSchemaUploadS3,
-            ...userUploadRecordTable
           );
 
         } else if (event.includes("extTopic")) {

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Api/functionYaml/template.ejs

@@ -2,6 +2,9 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`) %>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
+  role: <%- firstLetterUpperCase(roleName) _%>Role
+  #<#<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
+  #<#/<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>FunctionSetting#>
   events:
     - httpApi:
         path: /<%- serviceTag %>/<%- firstLetterLowerCase(functionName) %>/<%- functionName %>
@@ -15,9 +18,8 @@
         authorizer: authorizerServiceSchema
         #<#<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>UserLevelAuthorizer#>
         #<#/<%- firstLetterUpperCase(functionName) _%><%- firstLetterUpperCase(handlerType) %>UserLevelAuthorizer#>
-  role: <%- firstLetterUpperCase(roleName) _%>Role
-    #<#<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>IamRole#>
-    #<#/<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+
+
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Inv/functionYaml/template.ejs

@@ -3,8 +3,8 @@
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

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

@@ -2,6 +2,9 @@
 <%- firstLetterUpperCase(functionNameConfig) %>:
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}Complete_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>Complete<%- firstLetterUpperCase(handlerType) %>
+  role: <%- roleName %>Role
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   events:
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
@@ -9,9 +12,8 @@
         filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-  role: <%- roleName %>Role
-  #<#<%- functionName %><%- handlerType %>IamRole#>
-  #<#/<%- functionName %><%- handlerType %>IamRole#>
+
+
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

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

@@ -7,9 +7,10 @@
           route: <%- functionName %>
           # authorizer: ${self:custom.iz_authorizerAppLevel}
           # identifierResource: 'route.request.header.Auth'
+  #<#<%- functionName %><%- handlerType %>FunctionSetting#>
+  #<#/<%- functionName %><%- handlerType %>FunctionSetting#>
   role: <%- roleName %>Role
-  #<#<%- functionName %><%- handlerType %>IamRole#>
-  #<#/<%- functionName %><%- handlerType %>IamRole#>
+
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>