@izara_project/izara-market-library-service-schemas 1.0.29 → 1.0.31

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

@@ -38,33 +38,15 @@ function data(_izContext, flowSchema, srcPath) {
 function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createObjectS3)
   let handlerType = "HdrWbs"
-  let hook = false;
-  let hookFunctionName;
-  let isAsync = false;
-  if (flowSchema?.hook) {
-    for (const [hookName, hookProperties] of Object.entries(flowSchema.hook)) {
-      for (const hookFunction of hookProperties.functionList) {
-        if (hookName === FLOW_SCHEMA_HOOK_STATE.beforeCreate) {
-          if (hookFunction.event?.initialEvent && hookFunction.event.initialEvent === true) {
-            hook = true
-            hookFunctionName = hookFunction.name
-            if (hookFunction.event?.isAsync && hookFunction.event.isAsync === true) {
-              isAsync = true
-            }
-          }
-        }
-      }
-    }
-  }
+
   return {
     templatePath: templatePath,
     templateData: {
-      hook: hook,
-      hookFunctionName: hookFunctionName,
-      isAsync
+      functionName,
+      handlerType
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_${handlerType}`,
       fileExtension: ".js",
       isAppend: false

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

@@ -22,16 +22,12 @@ const middleware = izara.middlewareHandler;
 // const AWS = require('aws-sdk');
 // const api = new AWS.ApiGatewayManagementApi({ endpoint: process.env.iz_webSocketEndpoint });
 const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb')
-const callingFlowSharedLib = require('@izara_project/izara-core-calling-flow')
+const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow')
 const hash = require('object-hash')
 // const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
 const consts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
 const { postToConnection } = require("../../libs/source/ImportDataLib");
-<% if (hook) { _%>
-const <%- upperCase(hookFunctionName) %> = require("./FlowSchemaHook/HookLogicFunction/source/<%- upperCase(hookFunctionName) %>")
-<% } else { _%>
 const createObject = require('./CreateObjectS3_Main');
-<% } _%>
 module.exports.main = middleware.wrap(async (event, context, callback) => {
 
   event._izContext.logger.debug('Event:', event);
@@ -53,7 +49,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
         case '$default':
           console.log('Received unknown route:', route);
           break
-        case 'webSocket':
+        case 'uploadS3':
           console.log("event in route webSocket", event);
           let eventParams = JSON.parse(event.body)
 
@@ -67,25 +63,6 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
           )
 
           let callingFlow = eventParams?.callingFlow ? eventParams.callingFlow : {};
-          <% if (hook) { _%>
-            <% if (isAsync) { %>
-              await <%- upperCase(hookFunctionName) %>(
-                event._izContext,
-                eventParams,
-                callingFlowSharedLib.addCallingFlowToPassOnProperties(callingFlow)
-                //(<additionalParams>)
-                  //(</additionalParams>)
-                  )
-                <% } else { %>
-              <%- upperCase(hookFunctionName) %>(
-                event._izContext,
-                eventParams,
-                callingFlowSharedLib.addCallingFlowToPassOnProperties(callingFlow)
-                //(<additionalParams>)
-                //(</additionalParams>)
-              )
-              <% } _%>
-          <% } else { _%>
           await createObject.createObject(
             event._izContext,
             eventParams,
@@ -93,7 +70,6 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
             //(<additionalParams>)
             //(</additionalParams>)
           )
-          <% } _%>
 
           break
       }
@@ -112,8 +88,4 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
     await postToConnection({ message: err.message }, connId);
     return (izara.response.failure(err));
   }
-});
-<%_ const join = require('path').join _%>
-<%_ function upperCase (text) {
-  return text.charAt(0).toUpperCase() + text.slice(1)
-  } _%>
+});

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

@@ -44,7 +44,7 @@ async function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
     templatePath: templatePath,
     templateData: {},
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_Main`,
       fileExtension: ".js",
       isAppend: false

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

@@ -47,11 +47,11 @@ const {
  * @param {Object} objectSchemas
  * @return {{ templatePath, templateData, setting } }
  */
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createObjectS3Complete);
   let handlerType = upperCase(HANDLER.hdrSqs);
   let additionalResourcePermission = defaultIamRolePerAction();
@@ -67,8 +67,8 @@ function createSourceParams(_izContext, srcPath) {
         ]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, functionName + handlerType),
-        resourceNames(RESOURCE_CLASSES.sns, functionName + "DLQ")
+        resourceNames(RESOURCE_CLASSES.sqs, functionName + handlerType),
+        resourceNames(RESOURCE_CLASSES.sqs, functionName + handlerType + "DLQ")
       ]
     ),
     createIamRole(
@@ -98,7 +98,7 @@ function createSourceParams(_izContext, srcPath) {
   return {
     templatePath: templatePath,
     templateData: {
-      resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationWebSocket, flowSchema.flowTag, "source/"),
       functionName: functionName,
       handlerType: handlerType,
       additionalResourcePermission: additionalResourcePermission,

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

@@ -45,11 +45,11 @@ const {
  * @param {Object} objectSchemas
  * @return {{ templatePath, templateData, setting } }
  */
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createObjectS3Complete)
   let handlerType = upperCase(HANDLER.hdrSqs)
   return {
@@ -59,7 +59,7 @@ function createSourceParams(_izContext, srcPath) {
       handlerType,
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_${handlerType}`,
       fileExtension: ".js",
       isAppend: false

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

@@ -32,11 +32,11 @@ const { firstLetterUpperCase: upperCase } = require('../../../../../../../MainLi
  * @param {Object} objectSchemas
  * @return {{ templatePath, templateData, setting } }
  */
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
+function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createObjectS3Complete)
   return {
     templatePath: templatePath,
@@ -44,7 +44,7 @@ function createSourceParams(_izContext, srcPath) {
       functionName,
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_Main`,
       fileExtension: ".js",
       isAppend: false

package/src/reStructure/TemplateData/flowSchema/components/upload/createObjectComplete/sns-sqs/data.js

@@ -55,7 +55,7 @@ function createDataForDefaultSnsInSqs(_izContext, srcPath) {
   defaultSnsInSqsDataList.push(
     {
       queueName: upperCase(FUNCTION_NAME.createObjectS3Complete) + upperCase(HANDLER.hdrSqs),
-      subScription: upperCase(TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete)
+      subScription: "Out" + upperCase(FUNCTION_NAME.updateNodeComplete)
     }
   )
 

package/src/reStructure/TemplateData/flowSchema/components/upload/createObjectComplete/sns-sqs/template.ejs

@@ -1,4 +1,4 @@
-  Subscription<%- subScription-%>:
+  Subscription<%- queueName-%>:
     Type: AWS::SNS::Subscription
     Properties:
       TopicArn: !Ref <%- subScription %>

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

@@ -36,7 +36,11 @@ const {
   awaitingMultipleStepsRole,
   externalResourceSns,
   externalResourceName,
-  SOURCE_GENERATE_IAM_ROLE
+  DYNAMO_RESOURCE,
+  LAMBDA_RESOURCE,
+  SOURCE_GENERATE_IAM_ROLE,
+  FUNCTION_NAME,
+  ACTIONS
 } = require('../../../../../../../../MainLibs/src/Consts');
 
 const {
@@ -50,12 +54,12 @@ const {
  * @return {{ templatePath, templateData, setting } }
  */
 
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
-  let functionName = "GetPresignUrl";
+function createSourceParams(_izContext, flowSchema, srcPath) {
+  let functionName = upperCase(FUNCTION_NAME.createPresignUrl);
   let handlerType = upperCase(HANDLER.hdrSqs);
   let additionalResourcePermission = defaultIamRolePerAction();
 
@@ -67,16 +71,43 @@ function createSourceParams(_izContext, srcPath) {
           SQS_RESOURCE.sendMessage,
           SQS_RESOURCE.deleteMessage,
           SQS_RESOURCE.getQueueAttributes
-        ],
-        [RESOURCE_CLASSES.sns]: [
-          SNS_RESOURCE.publish,
-          SNS_RESOURCE.subscribe
         ]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sqs, "GetPresignUrl" + handlerType),
-        resourceNames(RESOURCE_CLASSES.sqs, "GetPresignUrl" + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, TOPIC_NAME_GENERATE_CODE.outCreateNodeComplete)
+        resourceNames(RESOURCE_CLASSES.sqs, functionName + handlerType),
+        resourceNames(RESOURCE_CLASSES.sqs, functionName + "DLQ"),
+      ]
+    ),
+    createIamRole(
+      {
+        [RESOURCE_CLASSES.dynamoDbTable]: [
+          DYNAMO_RESOURCE.query,
+          DYNAMO_RESOURCE.deleteItem,
+          DYNAMO_RESOURCE.updateItem,
+          DYNAMO_RESOURCE.putItem
+        ]
+      },
+      [
+        resourceNames(RESOURCE_CLASSES.dynamoDbTable, "WebSocketTask"),
+        resourceNames(RESOURCE_CLASSES.dynamoDbTable, "ReservedDataMain"),
+      ]
+    ),
+    createIamRole(
+      {
+        "execute-api": "ManageConnections"
+      },
+      [
+        resourceNames(RESOURCE_CLASSES.webSocket)
+      ]
+    ),
+    createIamRole(
+      {
+        [RESOURCE_CLASSES.lambda]: [LAMBDA_RESOURCE.invokeFunction],
+        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
+      },
+      [
+        resourceNames(RESOURCE_CLASSES.lambda, upperCase(ACTIONS.get) + upperCase(HANDLER.hdrInv)),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(ACTIONS.update) + "_In")
       ]
     )
   )
@@ -87,9 +118,9 @@ function createSourceParams(_izContext, srcPath) {
       functionName,
       handlerType,
       functionNameConfig: functionName + upperCase(handlerType),
-      resourceLocation: SOURCE_PATH.resourceLocationWebSocket,
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationWebSocket, flowSchema.flowTag, "source/"),
       additionalResourcePermission,
-      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
+      functionNameConfig: upperCase("ReservedLimitComp") + upperCase(shortNameHandler(handlerType)),
       roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
     },
     setting: {

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

@@ -6,6 +6,9 @@
     - 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/{getSignUrls → createPresignUrl}/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
@@ -31,12 +31,12 @@ const { HANDLER, SOURCE_PATH } = require('../../../../../../../../MainLibs/src/C
  * @return {{ templatePath, templateData, setting } }
  */
 
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
-  let functionName = "GetPresignUrl";
+function createSourceParams(_izContext, flowSchema, srcPath) {
+  let functionName = upperCase(FUNCTION_NAME.createPresignUrl);
   let handlerType = upperCase(HANDLER.hdrSqs);
 
   return {
@@ -47,7 +47,7 @@ function createSourceParams(_izContext, srcPath) {
     },
     setting: {
       saveFileName: `${functionName}_${handlerType}`,
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       fileExtension: ".js",
       isAppend: true
     }

package/src/reStructure/TemplateData/flowSchema/{legacy/hookCode-old/handler/templateAsyncHandler.ejs → components/upload/preSignUrl/createPresignUrl/handler/template.ejs}

@@ -18,16 +18,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 
 // const AWS = require('aws-sdk');
-// const sqs = new AWS.SQS(firstLetterUpperCase{ apiVersion: '2012-11-05' });
+// const sqs = new AWS.SQS({ apiVersion: '2012-11-05' });
 
 const izara = require("@izara_project/izara-middleware");
 const middleware = izara.middlewareHandler;
-const recordHandlerSharedLib = require("@izara_project/izara-shared").recordHandlerSharedLib;
+const recordHandlerSharedLib = require('@izara_project/izara-core-library-record-handler');
 const Logger = require('@izara_project/izara-core-library-logger');
-const izaraShared = require('@izara_project/izara-shared');
-const callingFlowSharedLib = izaraShared.callingFlowSharedLib;
+const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 
-const <%- hookFunctionName %> = require('./<%- hookFunctionName %>_Main')
+const createPresignUrl = require('./CreatePresignUrl_Main');
 
 // validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
@@ -53,6 +52,20 @@ let perRecordsValidatorSchema = {
   }
 };
 
+// set schema for record.body.MessageAttributes
+// const messageAttributeValidatorSchema = {
+//   type: "object",
+//   required: ['msgAtrrParam1', 'msgAtrrParam2'],
+//   properties: {
+//     msgAtrrParam1: {
+//       type: "string"
+//     },
+//     msgAtrrParam2: {
+//       type: "object"
+//     }
+//   }
+// };
+
 perRecordsValidatorSchema = callingFlowSharedLib.addOptionalPassBackPropertiesToValidatorSchema(perRecordsValidatorSchema)
 
 module.exports.main = middleware.wrap(async (event, context, callback) => {
@@ -70,21 +83,23 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // validate message (and MessageAttributes)
       await recordHandlerSharedLib.validateRecord(
         record, // one record will send to mainFunction
-        "<%- queueName %>", // queue name that need to retry or send to dlq
+        "ReservedLimitCompleteHdrSqs", // 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)
+      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))
       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
-        <%- hookFunctionName %>, // mainFunction that need to invoke.
-        "<%- queueName %>", // queue name that need to retry or send to dlq
+        createPresignUrl.createPresignUrl, // mainFunction that need to invoke.
+        "ReservedLimitCompleteHdrSqs", // queue name that need to retry or send to dlq
         passOnProperties, // all parameters that mainFunction needed.
       );
       record._izContext.logger.debug('after recordPromise in handler');
@@ -104,7 +119,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
     Logger.debug('after Promise.all(recordPromises) in handler');
 
   } catch (err) {
-    Logger.error('Unhandled Error, <%- hookFunctionName %>: ', err);
+    Logger.error('Unhandled Error, ReservedImageLimitCompleteHdrSqs: ', err);
     throw (err);
   }
-});
+});

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/{getSignUrls → createPresignUrl}/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 { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../../../MainLibs/src/Utils")
+const { SOURCE_PATH, FUNCTION_NAME } = require('../../../../../../../../MainLibs/src/Consts');
 
 /**
  * receive objectSchema
@@ -30,18 +30,21 @@ const { SOURCE_PATH } = require('../../../../../../../../MainLibs/src/Consts');
  * @return {{ templatePath, templateData, setting } }
  */
 
-function data(_izContext, srcPath) {
-  return [createSourceParams(_izContext, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return [createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, srcPath) {
-  let functionName = "GetPresignUrl"
+function createSourceParams(_izContext, flowSchema, srcPath) {
+  let functionName = upperCase(FUNCTION_NAME.createPresignUrl)
+  let bucketName = flowSchema.bucketName
   return {
     templatePath: templatePath,
-    templateData: {},
+    templateData: {
+      bucketName
+    },
     setting: {
       saveFileName: `${functionName}_Main`,
-      savePath: path.join(srcPath, SOURCE_PATH.webSocket),
+      savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       fileExtension: ".js",
       isAppend: false
     }