@izara_project/izara-core-generate-service-code 1.0.46 → 1.0.48

package/src/generators/fromObjectSchema/relationship/update/complete/sns-in-sqs/template.ejs

@@ -34,13 +34,10 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#<%- queueName %>QueueSetting#>
+  #<#/<%- queueName %>QueueSetting#>
 
 
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
 <%_ function firstLetterLowerCase(str) {
   return str.charAt(0).toLowerCase() + str.slice(1)
 } _%>

package/src/generators/fromObjectSchema/relationship/update/complete/sns-out/template.ejs

@@ -1,10 +1,8 @@
 ##--------- [Create Topic Out]
-  Out<%- firstLetterUpperCase(queueName) %>:
+  Out<%- queueName %>:
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message out"
-      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- firstLetterUpperCase(queueName) %>_Out
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_Out
 
-  <%_ function firstLetterUpperCase(text) {
-    return text.charAt(0).toUpperCase() + text.slice(1)
-  } _%>
+  

package/src/generators/fromObjectSchema/textTag/systemText/systemText.js

@@ -68,10 +68,10 @@ function createSourceSystemText(
           serviceTag: getLocalConfig('iz_serviceTag')
         };
         const systemTextObjectSchemas = {
-          nameSpace: `${coreUtils.createObjTypeConcat(_izContext, objType, '|')}|description`, // for each objectType
-          systemTextTag: `${fieldName}|${coreUtils.createObjTypeConcat(_izContext, objType, '|')}`, // for each fieldName
-          openHook: `//(<${coreUtils.createObjTypeConcat(_izContext, objType, '|')}${fieldName}Hook>)`,
-          closeHook: `//(</${coreUtils.createObjTypeConcat(_izContext, objType, '|')}${fieldName}Hook>)`
+          nameSpace: `${coreUtils.createObjTypeConcat(_izContext, objType, '_')}_description`, // for each objectType
+          systemTextTag: `${fieldName}_${coreUtils.createObjTypeConcat(_izContext, objType, '_')}`, // for each fieldName
+          openHook: `//(<${coreUtils.createObjTypeConcat(_izContext, objType, '_')}${fieldName}Hook>)`,
+          closeHook: `//(</${coreUtils.createObjTypeConcat(_izContext, objType, '_')}${fieldName}Hook>)`
         };
         createSourceArray.push(systemTextObjectSchemas);
       }
@@ -85,10 +85,10 @@ function createSourceSystemText(
         serviceTag: getLocalConfig('iz_serviceTag')
       };
       const systemTextFlowSchemas = {
-        nameSpace: `${coreUtils.createFlowTypeConcat(_izContext, flowType, '|')}`, // for each flowType
-        systemTextTag: `errors|${coreUtils.createFlowTypeConcat(_izContext, flowType, '|')}`,
-        openHook: `//(<${coreUtils.createFlowTypeConcat(_izContext, flowType, '|')}Hook>)`,
-        closeHook: `//(</${coreUtils.createFlowTypeConcat(_izContext, flowType, '|')}Hook>)`
+        nameSpace: `${coreUtils.createFlowTypeConcat(_izContext, flowType, '_')}`, // for each flowType
+        systemTextTag: `errors_${coreUtils.createFlowTypeConcat(_izContext, flowType, '_')}`,
+        openHook: `//(<${coreUtils.createFlowTypeConcat(_izContext, flowType, '_')}Hook>)`,
+        closeHook: `//(</${coreUtils.createFlowTypeConcat(_izContext, flowType, '_')}Hook>)`
       };
       createSourceArray.push(systemTextFlowSchemas);
     }
@@ -105,10 +105,10 @@ function createSourceSystemText(
       if (relSchema[relTag].hasOwnProperty('fieldNames') && Object.keys(relSchema[relTag].fieldNames).length > 0) {
         for (const fieldName of Object.keys(relSchema[relTag].fieldNames)) {
           const systemTextRelSchemas = {
-            nameSpace: `${coreUtils.createRelTypeConcat(_izContext, relType, '|')}|description`,
-            systemTextTag: `${fieldName}_${coreUtils.createRelTypeConcat(_izContext, relType, '|')} `,
-            openHook: `//(<${coreUtils.createRelTypeConcat(_izContext, relType, '|')}${fieldName}Hook>)`,
-            closeHook: `//(</${coreUtils.createRelTypeConcat(_izContext, relType, '|')}${fieldName}Hook>)`
+            nameSpace: `${coreUtils.createRelTypeConcat(_izContext, relType, '_')}_description`,
+            systemTextTag: `${fieldName}_${coreUtils.createRelTypeConcat(_izContext, relType, '_')}`,
+            openHook: `//(<${coreUtils.createRelTypeConcat(_izContext, relType, '_')}${fieldName}Hook>)`,
+            closeHook: `//(</${coreUtils.createRelTypeConcat(_izContext, relType, '_')}${fieldName}Hook>)`
           }
           createSourceArray.push(systemTextRelSchemas);
         }
@@ -119,7 +119,7 @@ function createSourceSystemText(
   if (notificationSchemas.length > 0) {
     for (const notification of notificationSchemas) {
       const notificationSystemText = {
-        nameSpace: `sysNotification'|'${notification.notificationGrouping}`,
+        nameSpace: `sysNotification_${notification.notificationGrouping}`,
         systemTextTag: notification.notificationTag,
         openHook: `//(<${notification.notificationTag}Hook>)`,
         closeHook: `//(</${notification.notificationTag}Hook>)`

package/src/generators/fromPlugIn/afterFirstFlowStep/recievePlugIn/mainFunction/main.js

@@ -38,7 +38,8 @@ async function data(_izContext, data, appPath) {
       recieveType: data.recieveType,
       flowTag: flowType ? flowType.flowTag : null,
       serviceTag: flowType ? flowType.serviceTag : null,
-      functionName
+      functionName,
+      upperFunctionName: upperCase(functionName)
     },
     setting: {
       savePath: path.join(
@@ -52,7 +53,7 @@ async function data(_izContext, data, appPath) {
       fileExtension: '.js',
       isAppend: false
     }
-  }
+  };
 }
 
 export default data;

package/src/generators/fromPlugIn/afterFirstFlowStep/recievePlugIn/yaml/yaml.js

@@ -70,7 +70,9 @@ async function data(_izContext, data, appPath) {
       resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, `${data.flowTag}`, `${data.flowStepName}`, 'source/'),
       handlerType: upperCase(handlerType),
       lowerCase,
-      route: functionName
+      route: functionName,
+      upperFunctionNameConfig: upperCase(functionNameConfig),
+      upperRoleName: upperCase(roleName)
     },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.appYaml),

package/src/generators/fromPlugIn/byConfig/mainFunction/templateAwaitingStep.ejs

@@ -70,7 +70,7 @@ export default async function <%- functionName %>(
 
     const awaitingStepId = await asyncFlowSharedLib.createAwaitingStepId(
       returnValue.parentFlowId,
-      "<%- firstLetterUpperCase(flowStepName) %>"
+      "<%- upperFlowStepName %>"
     );
     _izContext.logger.debug('awaitingStepId:', awaitingStepId);
 
@@ -121,6 +121,3 @@ export default async function <%- functionName %>(
   }
 }
 
-<%_ function firstLetterUpperCase(text) {
-  return text.charAt(0).toUpperCase() + text.slice(1);
-} -%>

package/src/generators/fromPlugIn/byConfig/sns-sqs/queueNoTopic.ejs

@@ -32,12 +32,9 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>HdrSqs
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#<%- queueName %>QueueSetting#>
+  #<#/<%- queueName %>QueueSetting#>
 
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
 <%_ function firstLetterLowerCase(str) {
   return str.charAt(0).toLowerCase() + str.slice(1)
 } _%>

package/src/generators/fromPlugIn/byConfig/sns-sqs/snsSqs.js

@@ -34,16 +34,22 @@ function data(_izContext, data, appPath) {
     upperCase(data.flowStepName) +
     upperCase(data.handleLogic)
 
+  const upperQueueName = upperCase(queueName);
+
   return {
     templatePath: templatePathByHandler[data.handlerType],
-    templateData: { ...data, queueName },
+    templateData: {
+      ...data,
+      queueName,
+      upperQueueName
+    },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsInSqsYaml,
       fileExtension: '.yml',
       isAppend: true
     }
-  }
+  };
 }
 
 

package/src/generators/fromPlugIn/byConfig/sns-sqs/snsTemplate.ejs

@@ -47,12 +47,9 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>HdrSqs
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#<%- queueName %>QueueSetting#>
+  #<#/<%- queueName %>QueueSetting#>
 
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
 <%_ function firstLetterLowerCase(str) {
   return str.charAt(0).toLowerCase() + str.slice(1)
 } _%>

package/src/generators/fromPlugIn/byConfig/sns-sqs/sqsTemplate.ejs

@@ -32,12 +32,9 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>HdrDsq
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#<%- queueName %>QueueSetting#>
+  #<#/<%- queueName %>QueueSetting#>
 
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
 <%_ function firstLetterLowerCase(str) {
   return str.charAt(0).toLowerCase() + str.slice(1)
 } _%>

package/src/generators/fromPlugIn/firstFlowStep/mainFunction/templateByConfig/awaitingSteps.ejs

@@ -5,7 +5,7 @@ allAwaitingStepsId.push(
   {
     awaitingStepId: asyncFlowSharedLib.createAwaitingStepId(
       parentFlowId,
-      "<%- firstLetterUpperCase(flowStepName)%>"
+      "<%- upperFlowStepName %>"
     )
   }
 )
@@ -28,7 +28,7 @@ await asyncFlowSharedLib.createAwaitingMultipleStepsWithAdditionalAttributes(
         //(</createPendingStepIds>)
       <% } %>
      }),
-    "<%- firstLetterUpperCase(flowTag) %><%- firstLetterUpperCase(flowStepName)%><%- firstLetterUpperCase(handleLogic) %>"
+    "<%- upperFlowTag %><%- upperFlowStepName %><%- upperHandleLogic %>"
   )
 );
 
@@ -47,7 +47,7 @@ await asyncFlowSharedLib.createAwaitingMultipleStepsWithAdditionalAttributes(
       callingFlowConfig,
       callingFlowSharedLib.createCallingFlowConfig(
         //(<callingFlowProperties>)
-        await lambdaSharedLib.lambdaFunctionName(_izContext, "<%- firstLetterUpperCase(flowTag) %><%- firstLetterUpperCase(flowStepName) %><%- firstLetterUpperCase(handleLogic) %>"), {}
+        await lambdaSharedLib.lambdaFunctionName(_izContext, "<%- upperFlowTag %><%- upperFlowStepName %><%- upperHandleLogic %>"), {}
         //(</callingFlowProperties>)
       )
     )
@@ -55,6 +55,3 @@ await asyncFlowSharedLib.createAwaitingMultipleStepsWithAdditionalAttributes(
 
 
 
-<%_ function firstLetterUpperCase(text) {
-  return text.charAt(0).toUpperCase() + text.slice(1);
-} -%>

package/src/generators/fromPlugIn/firstFlowStep/queueNtopic/dsqTemplate.ejs

@@ -32,12 +32,9 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>HdrDsq
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#<%- queueName %>QueueSetting#>
+  #<#/<%- queueName %>QueueSetting#>
 
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
 <%_ function firstLetterLowerCase(str) {
   return str.charAt(0).toLowerCase() + str.slice(1)
 } _%>

package/src/generators/fromPlugIn/firstFlowStep/queueNtopic/queueNtopic.js

@@ -32,12 +32,16 @@ const templatePathByHandler = {
 };
 
 async function data(_izContext, data, appPath) {
+  console.log('data queue,topic ', data)
   if (data.eventFlow === 'extTopic') {
     data.handlerType = 'queueNoTopic';
   }
   return {
     templatePath: templatePathByHandler[data.handlerType],
-    templateData: { ...data },
+    templateData: {
+      ...data,
+      queueNameUpper: upperCase(data.queueName || '')
+    },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsInSqsYaml,

package/src/generators/fromPlugIn/firstFlowStep/queueNtopic/snsTemplate.ejs

@@ -1,36 +1,36 @@
 ##===== [Create topic in]
-  In<%- queueName %>:
+  In<%- topicName %>:
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message in"
-      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_In
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- topicName %>_In
 ##===== SNS Subscription [Topic In] =====##
-  SubscriptionIn<%- queueName %>:
+  SubscriptionIn<%- topicName %>:
     Type: AWS::SNS::Subscription
     Properties:
-      TopicArn: !Ref In<%- queueName %>
-      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs"
+      TopicArn: !Ref In<%- topicName %>
+      Endpoint: "arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>"
       Protocol: "sqs"
 ##===== [Queue]
-  <%- queueName %>HdrSqs:
+  <%- queueName %>:
     Type: "AWS::SQS::Queue"
     Properties:
-      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>
       RedrivePolicy:
         deadLetterTargetArn:
         # !GetAtt
           Fn::GetAtt:
-            - <%- queueName %>HdrSqsDLQ
+            - <%- queueName %>DLQ
             - Arn
         maxReceiveCount: 3
       VisibilityTimeout: 120
 ##==== [QueueDLQ]
-  <%- queueName %>HdrSqsDLQ:
+  <%- queueName %>DLQ:
     Type: AWS::SQS::Queue
     Properties:
-      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqsDLQ
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>DLQ
 ##==== [QueuePolicy]
-  <%- queueName %>HdrSqsPolicy:
+  <%- queueName %>Policy:
     Type: AWS::SQS::QueuePolicy
     Properties:
       PolicyDocument:
@@ -42,17 +42,14 @@
             Resource:
             # !GetAtt
               Fn::GetAtt:
-                - <%- queueName %>HdrSqs
+                - <%- queueName %>
                 - Arn
             Action: "SQS:SendMessage"
       Queues:
-        - Ref: <%- queueName %>HdrSqs
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+        - Ref: <%- queueName %>
+  #<#<%- queueNameUpper %>QueueSetting#>
+  #<#/<%- queueNameUpper %>QueueSetting#>
 
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
 <%_ function firstLetterLowerCase(str) {
   return str.charAt(0).toLowerCase() + str.slice(1)
 } _%>

package/src/generators/fromPlugIn/firstFlowStep/queueNtopic/sqsTemplate.ejs

@@ -32,12 +32,9 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>
-  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
-  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#<%- queueName %>QueueSetting#>
+  #<#/<%- queueName %>QueueSetting#>
 
-<%_ function firstLetterUpperCase(text){
-  return text.charAt(0).toUpperCase() + text.slice(1)
-} _%>
 <%_ function firstLetterLowerCase(str) {
   return str.charAt(0).toLowerCase() + str.slice(1)
 } _%>

package/src/generators/fromPlugIn/firstFlowStep/topicOut/topicOut.js

@@ -32,14 +32,17 @@ async function data(_izContext, data, appPath) {
 
   return {
     templatePath: templatePath,
-    templateData: { queueName },
+    templateData: {
+      queueName,
+      upperQueueName: upperCase(queueName)
+    },
     setting: {
       savePath: path.join(appPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
       isAppend: true
     }
-  }
+  };
 }
 
 export default data;