@izara_project/izara-core-generate-service-code 1.0.52 → 1.0.53

package/src/{generators/fromFlowSchema/events/s3/upload/createObject/handler/handler.js → codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3Legacy/upload/createObject/handler/data.js}

@@ -46,9 +46,7 @@ function createParamsForCreateSource(_izContext, flowSchema, appPath) {
     templateData: {
       functionName,
       handlerType,
-      route,
-      upperFunctionName: upperCase(functionName),
-      upperHandlerType: upperCase(handlerType)
+      route
     },
     setting: {
       savePath: path.join(

package/src/{generators/fromFlowSchema/events/s3 → codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3Legacy}/upload/createObject/handler/template.ejs

@@ -25,7 +25,7 @@ const { postToConnection } = webSocket;
 import { utils } from "@izara_project/izara-core-library-service-schemas";
 const { createFlowTypeConcat } = utils
 
-import createObject from './CreateObjectS3_Main.js';
+import <%= functionName %> from './<%= functionName %>_Main.js';
 
 export const main = middleware.wrap(async (event, context) => {
 
@@ -56,7 +56,7 @@ export const main = middleware.wrap(async (event, context) => {
           )
 
           let callingFlow = eventParams?.callingFlow ? eventParams.callingFlow : {};
-          await createObject(
+          await <%= functionName %>(
             event._izContext,
             eventParams,
             callingFlowSharedLib.addCallingFlowToPassOnProperties(callingFlow)

package/src/{generators/fromFlowSchema/events/s3/upload/createObject/mainFunction/main.js → codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3Legacy/upload/createObject/mainFunction/data.js}

@@ -45,8 +45,7 @@ function createParamsForCreateSource(_izContext, flowSchema, appPath) {
     templatePath: templatePath,
     templateData: {
       flowTag: flowSchema.flowTag,
-      objectType,
-      upperObjectType: upperCase(objectType)
+      objectType
     },
     setting: {
       savePath: path.join(

package/src/codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3Legacy/upload/createObject/mainFunction/template.ejs

@@ -0,0 +1,131 @@
+/*
+Copyright (C) 2020 Sven Mason <http: //izara.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program. If not, see
+<http: //www.gnu.org/licenses />.
+*/
+
+
+
+import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
+import { consts } from '@izara_project/izara-middleware';
+
+import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
+import snsSharedLib from '@izara_project/izara-core-library-sns';
+import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
+
+import { sns } from '@izara_project/izara-core-library-external-request';
+
+import { NoRetryError } from '@izara_project/izara-core-library-core';
+import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
+const { TOPIC_NAME_GENERATE_CODE } = generateCodeConsts;
+
+//(<optionalRequired>)
+//(</optionalRequired>)
+
+/**
+ *
+ *
+ * description of function.
+ * @param {Object} _izContext
+ * @param {CorrelationIds} _izContext.correlationIds - property of _izContext
+ * @param {Logger} _izContext.logger - property of _izContext
+ * @param {Object} requestParams - request params
+ * @param {Object} requestParams.identifiers - identifiers for get data
+ * @param {Object} requestParams.additionalRequest - additionalRequest
+ *
+ *
+ * @returns {object} description of return value
+ */
+
+export default async function <%= functionName %>(
+  _izContext,
+  requestParams,
+  callingFlowConfig = {},
+  //(<additionalParams>)
+  //(</additionalParams>)
+) {
+
+  try {
+    _izContext.logger.debug("WebSocketInvoke _izContext", _izContext)
+    _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
+    })
+
+    _izContext.logger.debug("getFlowSchema", flowSchema)
+
+    let getUserFromTableUserUploadRecord = await dynamodbSharedLib.getItem(_izContext,
+      await dynamodbSharedLib.tableName(_izContext, "UserUploadRecords"),
+      {
+        connectionId: connectionId
+      }
+    )
+
+    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)
+
+    if (!objectSchema) {
+      throw new NoRetryError(`${flowSchema.objType.objectType} not found`)
+    }
+
+    //(<beforeCreateHook>)
+    //(</beforeCreateHook>)
+    // create message Object to create Endpoint
+    let messageObject = {
+      objectType: "<%- objectType %>",
+      fieldNames: {
+        //(<fieldNamesHook>)
+        //(</fieldNamesHook>)
+      }
+    }
+    // create callingFlow
+    messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
+      messageObject,
+      callingFlowSharedLib.addParentCallingFlowConfig(
+        callingFlowConfig,
+        callingFlowSharedLib.createCallingFlowConfig(
+          await lambdaSharedLib.lambdaFunctionName(_izContext, TOPIC_NAME_GENERATE_CODE.createNodeComplete), {}
+        )
+      )
+    )
+
+    // send message to Create endpoint
+    let sendMessageToCreateEndpoint = {
+      Message: JSON.stringify(messageObject),
+      TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "Create_In")
+    }
+    _izContext.logger.debug("sendMessageToCreateEndpoint", sendMessageToCreateEndpoint);
+    await sns.publishAsync(_izContext, sendMessageToCreateEndpoint);
+
+  } catch (err) {
+    _izContext.logger.error('error WebSocketInvoke: ', err)
+    throw (err)
+  }
+}

package/src/{generators/fromFlowSchema/events/s3/upload/createObjectComplete/functionYaml/yaml.js → codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3Legacy/upload/createObjectComplete/functionYaml/data.js}

@@ -94,38 +94,21 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
     )
   );
 
-  const resourceLocation = path.join(
-    SOURCE_PATH.resourceLocationWebSocket,
-    flowSchema.flowTag,
-    'source/'
-  );
-
-  const functionNameConfig = upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.createObjectS3Complete)) +
-  upperCase(shortNameHandler(handlerType));
-
-  const roleName = SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role;
-  const upperFunctionName = upperCase(functionName);
-  const upperHandlerType = upperCase(handlerType);
-  const upperFunctionNameConfig = upperCase(functionNameConfig);
-  const upperRoleName = upperCase(roleName);
-  const handlerPath = path.join(resourceLocation, `${functionName}_${upperHandlerType}.main`);
-  const handlerPathUpperFunctionName = path.join(resourceLocation, `${upperFunctionName}_${upperHandlerType}.main`);
-
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation,
+      resourceLocation: path.join(
+        SOURCE_PATH.resourceLocationWebSocket,
+        flowSchema.flowTag,
+        'source/'
+      ),
       functionName: functionName,
       handlerType: handlerType,
       additionalResourcePermission: additionalResourcePermission,
-      functionNameConfig,
-      roleName,
-      upperFunctionName,
-      upperHandlerType,
-      upperFunctionNameConfig,
-      upperRoleName,
-      handlerPath,
-      handlerPathUpperFunctionName
+      functionNameConfig:
+        upperCase(SHORT_FUNCTION_NAME(FUNCTION_NAME.createObjectS3Complete)) +
+        upperCase(shortNameHandler(handlerType)),
+      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/{generators/fromFlowSchema/events/s3 → codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3Legacy}/upload/createObjectComplete/functionYaml/template.ejs

@@ -1,13 +1,17 @@
-<%- functionNameConfig %>:
-  handler: <%- handlerPath %>
-  name: ${self:custom.iz_resourcePrefix}<%- functionName %><%- upperHandlerType %>
+<%_ const join = require('path').join; _%>
+<%- 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 %><%- upperHandlerType %>
+        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 framework upper v.2.69.1
         - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
         - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
+<%_ function firstLetterUpperCase(text){
+  return text.charAt(0).toUpperCase() + text.slice(1)
+} _%>

package/src/{generators/fromFlowSchema/events/s3/upload/createObjectComplete/handler/handler.js → codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3Legacy/upload/createObjectComplete/handler/data.js}

@@ -47,9 +47,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
     templatePath: templatePath,
     templateData: {
       functionName,
-      handlerType,
-      upperFunctionName: upperCase(functionName),
-      upperHandlerType: upperCase(handlerType)
+      handlerType
     },
     setting: {
       savePath: path.join(

package/src/{generators/fromFlowSchema/events/s3/upload/createObjectComplete/mainFunction/main.js → codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3Legacy/upload/createObjectComplete/mainFunction/data.js}

@@ -45,8 +45,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      functionName,
-      upperFunctionName: upperCase(functionName)
+      functionName
     },
     setting: {
       savePath: path.join(

package/src/{generators/fromFlowSchema/events/s3 → codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3Legacy}/upload/createObjectComplete/sns-sqs/template.ejs

@@ -38,9 +38,12 @@
             Action: "SQS:SendMessage"
       Queues:
         - Ref: <%- queueName %>
-  #<#<%- queueName %>QueueSetting#>
-  #<#/<%- queueName %>QueueSetting#>
+  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#/<%- firstLetterUpperCase(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/fromFlowSchema/events/s3/upload/preSignUrl/createPreSignUrl/functionYaml/yaml.js → codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3Legacy/upload/preSignUrl/createPreSignUrl/functionYaml/data.js}

@@ -57,7 +57,7 @@ const templatePath = path.join(__dirname, 'template.ejs');
  */
 
 function createSourceParams(_izContext, flowSchema, appPath) {
-  let functionName = upperCase(FUNCTION_NAME.createPresignUrl);
+  let functionName = upperCase(FUNCTION_NAME.createPreSignUrl);
   let handlerType = upperCase(HANDLER.hdrSqs);
   let additionalResourcePermission = defaultIamRolePerAction();
 
@@ -111,39 +111,21 @@ function createSourceParams(_izContext, flowSchema, appPath) {
     )
   );
 
-  functionNameConfig = functionName + upperCase(handlerType);
-
-  const resourceLocation = path.join(
-    SOURCE_PATH.resourceLocationWebSocket,
-    flowSchema.flowTag,
-    'source/'
-  );
-
-  functionNameConfig = functionName + upperCase(shortNameHandler(handlerType));
-  const roleName = SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role;
-  const upperFunctionName = upperCase(functionName);
-  const upperHandlerType = upperCase(handlerType);
-  const upperFunctionNameConfig = upperCase(functionNameConfig);
-  const upperRoleName = upperCase(roleName);
-  const handlerPath = path.join(resourceLocation, `${functionName}_${upperHandlerType}.main`);
-  const handlerPathUpperFunctionName = path.join(resourceLocation, `${upperFunctionName}_${upperHandlerType}.main`);
-
   return {
     templatePath: templatePath,
     templateData: {
       functionName,
       handlerType,
-      functionNameConfig,
-      resourceLocation,
+      functionNameConfig: functionName + upperCase(handlerType),
+      resourceLocation: path.join(
+        SOURCE_PATH.resourceLocationWebSocket,
+        flowSchema.flowTag,
+        'source/'
+      ),
       additionalResourcePermission,
-      functionNameConfig,
-      roleName,
-      upperFunctionName,
-      upperHandlerType,
-      upperFunctionNameConfig,
-      upperRoleName,
-      handlerPath,
-      handlerPathUpperFunctionName
+      functionNameConfig:
+        functionName + upperCase(shortNameHandler(handlerType)),
+      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
     },
     setting: {
       saveFileName: SAVE_FILE_NAME.flowSchemaYaml,

package/src/codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3Legacy/upload/preSignUrl/createPreSignUrl/functionYaml/template.ejs

@@ -0,0 +1,18 @@
+<%_ const join = require('path').join; _%>
+<%- 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
+        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}]}}}
+
+<%_ function firstLetterUpperCase(text){
+  return text.charAt(0).toUpperCase() + text.slice(1)
+} _%>

package/src/{generators/fromFlowSchema/events/s3/upload/preSignUrl/createPreSignUrl/handler/handler.js → codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3Legacy/upload/preSignUrl/createPreSignUrl/handler/data.js}

@@ -37,16 +37,14 @@ const templatePath = path.join(__dirname, 'template.ejs');
  */
 
 function createSourceParams(_izContext, flowSchema, appPath) {
-  let functionName = upperCase(FUNCTION_NAME.createPresignUrl);
+  let functionName = upperCase(FUNCTION_NAME.createPreSignUrl);
   let handlerType = upperCase(HANDLER.hdrSqs);
 
   return {
     templatePath: templatePath,
     templateData: {
       functionName,
-      handlerType,
-      upperFunctionName: upperCase(functionName),
-      upperHandlerType: upperCase(handlerType)
+      handlerType
     },
     setting: {
       saveFileName: `${functionName}_${handlerType}`,

package/src/{generators/fromFlowSchema/events/s3 → codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3Legacy}/upload/preSignUrl/createPreSignUrl/handler/template.ejs

@@ -22,7 +22,7 @@ import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record
 import Logger from '@izara_project/izara-core-library-logger';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 
-import createPresignUrl from './CreatePresignUrl_Main.js';
+import <%= functionName %> from './<%= functionName %>_Main.js';
 
 // validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
@@ -79,7 +79,7 @@ export const main = middleware.wrap(async (event, context) => {
       // validate message (and MessageAttributes)
       await recordHandlerSharedLib.validateRecord(
         record, // one record will send to mainFunction
-        "CreatePresignUrlHdrSqs", // queue name that need to retry or send to dlq
+        "<%= functionName %><%= handlerType %>", // 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
       );
@@ -96,8 +96,8 @@ export const main = middleware.wrap(async (event, context) => {
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
       let recordPromise = recordHandlerSharedLib.recordHandler(
         record, // one record will send to mainFunction
-        createPresignUrl, // mainFunction that need to invoke.
-        "CreatePresignUrlHdrSqs", // queue name that need to retry or send to dlq
+        <%= functionName %>, // mainFunction that need to invoke.
+        "<%= functionName %><%= handlerType %>", // queue name that need to retry or send to dlq
         passOnProperties, // all parameters that mainFunction needed.
       );
       record._izContext.logger.debug('after recordPromise in handler');
@@ -117,7 +117,7 @@ export const main = middleware.wrap(async (event, context) => {
     Logger.debug('after Promise.all(recordPromises) in handler');
 
   } catch (err) {
-    Logger.error('Unhandled Error, ReservedImageLimitCompleteHdrSqs: ', err);
+    Logger.error('Unhandled Error, <%= functionName %><%= handlerType %>: ', err);
     throw (err);
   }
 });

package/src/{generators/fromFlowSchema/events/s3/upload/preSignUrl/createPreSignUrl/mainFunction/main.js → codeGenerators/app/src/generatedCode/Flow/FlowSchemas/templates/s3Legacy/upload/preSignUrl/createPreSignUrl/mainFunction/data.js}

@@ -37,15 +37,14 @@ const templatePath = path.join(__dirname, 'template.ejs');
  */
 
 function createSourceParams(_izContext, flowSchema, appPath) {
-  let functionName = upperCase(FUNCTION_NAME.createPresignUrl);
+  let functionName = upperCase(FUNCTION_NAME.createPreSignUrl);
   let bucketName = flowSchema.bucketName;
   let flowTag = flowSchema.flowTag;
   return {
     templatePath: templatePath,
     templateData: {
       bucketName,
-      flowTag,
-      upperFlowTag: upperCase(flowTag)
+      flowTag
     },
     setting: {
       saveFileName: `${functionName}_Main`,