@izara_project/izara-market-library-service-schemas 1.0.35 → 1.0.37

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/FlowSchemaComponent/mainFunction/data.js

@@ -49,16 +49,21 @@ function data(_izContext, flowSchema, srcPath) {
 }
 
 function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(FUNCTION_NAME.flowSchemaOwnTopic)
-  let topicArn = Object.keys(flowSchema.flowSteps)[0];
+  let functionName = upperCase(flowSchema.flowTag)
+  // let topicArn = Object.keys(flowSchema.flowSteps)[0];
+  let flowStep = Object.keys(flowSchema.flowSteps)
+  let flowStepsIn = flowStep[0];
+  let splitFlowStepsIn = flowStepsIn.split("_");
+  let topicArn = `${splitFlowStepsIn[2]}_${splitFlowStepsIn[3]}`
   return {
     templatePath: templatePath,
     templateData: {
       topicArn,
       flowTag: flowSchema.flowTag,
+      functionName
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchemaOwnTopic, flowSchema.flowTag, "source/"),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_Main`,
       fileExtension: ".js",
       isAppend: false

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

@@ -18,7 +18,7 @@ along with this program. If not, see
 
 'use strict';
 
-const hash = require("object-hash");
+const hash = require('@izara_project/izara-shared-core').objectHash;
 const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
 
 const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
@@ -26,7 +26,7 @@ const snsSharedLib = require('@izara_project/izara-core-library-sns');
 const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
-
+const storedCacheSharedLib = require('@izara_project/izara-core-library-stored-cache')
 const externalRequest = require('@izara_project/izara-core-library-external-request');
 const sns = externalRequest.sns
 
@@ -34,7 +34,9 @@ const utils = require('@izara_project/izara-market-library-service-schemas/src/M
 const NoRetryError = require('@izara_project/izara-core-library-core').NoRetryError
 const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
 const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
-
+const { postToConnection } = require('../../../libs/source/GenerateCodeLibs')
+//(<optionalRequire>)
+//(</optionalRequire>)
 /**
  *
  *
@@ -50,7 +52,7 @@ const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-librar
  * @returns {object} description of return value
  */
 
-module.exports.flowSchemaOwnTopic = async (
+module.exports.<%- functionName %> = async (
   _izContext,
   requestParams,
   callingFlowConfig = {},
@@ -59,9 +61,9 @@ module.exports.flowSchemaOwnTopic = async (
 ) => {
 
   try {
-    _izContext.logger.debug("WebSocketInvoke _izContext", _izContext)
-    _izContext.logger.debug("WebSocketInvoke requestParams", requestParams)
-    _izContext.logger.debug("WebSocketInvoke callingFlowConfig", callingFlowConfig)
+    _izContext.logger.debug("<%- functionName %> _izContext", _izContext)
+    _izContext.logger.debug("<%- functionName %> requestParams", requestParams)
+    _izContext.logger.debug("<%- functionName %> callingFlowConfig", callingFlowConfig)
 
     let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
       flowTag: requestParams.action,
@@ -70,14 +72,19 @@ module.exports.flowSchemaOwnTopic = async (
 
     _izContext.logger.debug("flowSchema", flowSchema)
 
+    let connectionId = _izContext.correlationIds.get(coreConsts.CONNECTION_ID);
 
     if (!flowSchema) {
-      throw new NoRetryError(`flowTag not found ${requestParams.action}`)
+      await postToConnection({
+        message: {
+          error: `flowTag not found ${requestParams.action}`
+        }
+      },connectionId)
+      throw new NoRetryError(`flowTag not found ${requestParams.action}`);
     }
 
-      let messageObject = {
-        requestParams:requestParams
-      }
+      let messageObject = requestParams
+
       // create callingFlow
       messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
         messageObject,
@@ -89,12 +96,12 @@ module.exports.flowSchemaOwnTopic = async (
         )
       )
 
-      let sendMessageToCreateEndpoint = {
+      let sendMessageToEndpoint = {
         Message: JSON.stringify(messageObject),
         TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "<%- topicArn %>")
       }
-      _izContext.logger.debug("sendMessageToCreateEndpoint", sendMessageToCreateEndpoint);
-      await sns.publishAsync(_izContext, sendMessageToCreateEndpoint);
+      _izContext.logger.debug("sendMessageToEndpoint", sendMessageToEndpoint);
+      await sns.publishAsync(_izContext, sendMessageToEndpoint);
 
   } catch (err) {
     _izContext.logger.error('error WebSocketInvoke: ', err)

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/sns-in/data.js

@@ -58,9 +58,24 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
 
   //  GCTpBasTestInPersonCreate => GCTpBas_Test_PersonCreate_In
   let flowSteps = Object.keys(flowSchema.flowSteps)
+  let flowStepsIn = flowSteps[0];
+  let splitFlowStepsIn = flowStepsIn.split("_");
+  let topicIn = splitFlowStepsIn[2]
+  
+  let splitFlowStepsOut;
+  let topicOut;
+  if (flowSchema.outputTopic) {
+    let flowStepOut = flowSteps[1];
+    splitFlowStepsOut = flowStepOut.split("_")
+    topicOut = splitFlowStepsOut[2]
+  } else {
+    splitFlowStepsOut = null
+    topicOut = null
+  }
+
   const generatedSnsTopicInForFlowSchema = [
     {
-      queueName: upperCase(flowSteps[0].split("_")[0]),
+      queueName: upperCase(topicIn),
     },
   ];
 
@@ -75,12 +90,9 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
 
   let defaultDsqQueueDataList = [
     {
-      queueName: upperCase(FUNCTION_NAME.flowSchemaOwnTopicEndpointComplete) + upperCase(HANDLER.hdrSqs),
-      subscribeTo: upperCase(flowSteps[1].split("_")[0])
-    },
-    // {
-    //   queueName: upperCase(FUNCTION_NAME.flowSchemaOwnTopicComplete) + upperCase(HANDLER.hdrSqs)
-    // }
+      queueName: `${upperCase(flowSchema.flowTag)}Complete` + upperCase(HANDLER.hdrSqs),
+      subscribeTo: topicOut
+    }
   ]
   for (let defaultDsqQueueData of defaultDsqQueueDataList) {
     resultsForCreateDefaultSnsInSqs.push({
@@ -89,7 +101,10 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
       setting: setting
     })
   }
-  console.log()
+  // console.log({
+  //   resultsForCreateDefaultSnsInSqs: JSON.stringify(resultsForCreateDefaultSnsInSqs, null, 2
+  //   )
+  // })
   return resultsForCreateDefaultSnsInSqs;
 }
 

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/sns-out/data.js

@@ -47,13 +47,18 @@ const { SOURCE_PATH, SAVE_FILE_NAME, FUNCTION_NAME, HANDLER } = require('../../.
 function createDataForSnsOut(_izContext, flowSchema, srcPath) {
   let resultsForCreateDefaultSnsInSqs = [];
 
-  //  GCTpBasTestInPersonCreate => GCTpBas_Test_PersonCreate_In
   let flowSteps = Object.keys(flowSchema.flowSteps)
-  const generatedSnsTopicOutForFlowSchema = [
-    {
-      queueName: upperCase(flowSteps[1].split("_")[0])
-    }
-  ];
+  let generatedSnsTopicOutForFlowSchema = []
+  if (flowSchema.outputTopic) {
+    let flowStepsOut = flowSteps[1];
+    let splitFlowStepsOut = flowStepsOut.split("_");
+    let topicOut = splitFlowStepsOut[2]
+    generatedSnsTopicOutForFlowSchema.push(
+      {
+        queueName: upperCase(topicOut)
+      }
+    )
+  }
 
 
   for (let defaultSnsOutData of generatedSnsTopicOutForFlowSchema) {

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

@@ -107,7 +107,7 @@ const createFlowSchemaEventBridgeFunctionYaml = require('./eventBridge/functionY
 const createFlowSchemaEventBridgeHandler = require('./eventBridge/handler/inv/data');
 const createFlowSchemaEventBridgeMainFunction = require('./eventBridge/mainFunction/data');
 
-const createFlowSchemaDynamoDb = require('./dynamoDb/data');
+const createAwaitingMultipleStepDynamoDbData = require('./dynamoDb/data');
 // create record status Field Complete
 const createCreateObjectCompleteFuntionYaml = require('./CreateRecordComplete/functionYaml/data');
 const createCreateObjectCompleteHandler = require('./CreateRecordComplete/handler/data');
@@ -122,6 +122,7 @@ const createFlowSchemaRegisterMainCompleteFuncYaml = require('./createRecordBySt
 const createFlowSchemaRegisterMainWbsFuncYaml = require('./createRecordByStatusType/wbs/functionYaml/data');
 const createFlowSchemaRegisterSubscribeOutAll = require('./createRecordByStatusType/subscriptionOutAll/data');
 const createFlowSchemaRegisterSnsInSqs = require('./createRecordByStatusType/sns-in/data');
+const createFlowSchemaRegisterDynamoDb = require('./createRecordByStatusType/dynamoDB/register');
 
 /**
  * Generates code with templates for different actions
@@ -130,11 +131,13 @@ const createFlowSchemaRegisterSnsInSqs = require('./createRecordByStatusType/sns
  * @returns {Array} Array of generated code parameters
  */
 async function generateCodeWithTemplate(_izContext, objSchemaPath) {
-  console.log("objSchemaPath", objSchemaPath);
+  console.log("objSchemaPath in flowSchema generateTemplateAndData", objSchemaPath);
   try {
     const saveFilePath = join(objSchemaPath, '../');
+    console.log("saveFilePath in flowSchema generateTemplateAndData", saveFilePath)
     let createSourceParams = [];
     const allLocalFlowSchemas = await getAllLocalFlowSchemas(_izContext, objSchemaPath);
+    const allLocalObjectSchemas = await getAllLocalObjectSchemasWithHierarchy(_izContext, objSchemaPath);
 
     // default webSocket setting
     const webSocketTaskTable = createWebSocketDynamoDb(_izContext, saveFilePath);
@@ -143,10 +146,8 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
     const webSocketResource = [...webSocketTaskTable, ...webSocketConnectYaml, ...webSocketConnectHandler]
     if (allLocalFlowSchemas.records.length) {
-      const webSocketGenerateCodeLibs = createWebSocketGenerateCodeLibs(_izContext, saveFilePath)
       createSourceParams.push(
         ...webSocketResource,
-        ...webSocketGenerateCodeLibs
       )
     }
 
@@ -155,10 +156,9 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
     for (const flowSchema of allLocalFlowSchemas.records) {
       console.log("flowSchema in Generate TemplateData", flowSchema);
+      const webSocketGenerateCodeLibs = createWebSocketGenerateCodeLibs(_izContext, flowSchema, saveFilePath)
+      createSourceParams.push(...webSocketGenerateCodeLibs)
 
-      if (flowSchema.statusType === "none" || flowSchema.handlerObj === "multi") {
-        continue;
-      }
       for (const event of flowSchema.event) {
         if (event.includes("s3")) {
           const reservedDataTable = createReservedDataMainTable(_izContext, saveFilePath);
@@ -275,7 +275,6 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
             ...externalTopicSnsOut
           ];
 
-          console.log("event externalTopic generated")
           createSourceParams.push(...externalTopic)
 
         } else if (event.includes("ownTopic")) {
@@ -283,7 +282,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           // flowSchema OwnTopic components
           const flowSchemaOwnTopicFunctionYaml = createFlowSchemaOwnTopicFunctionYaml(_izContext, flowSchema, saveFilePath);
           const flowSchemaOwnTopicHandler = createFlowSchemaOwnTopicHandler(_izContext, flowSchema, saveFilePath);
-          const flowSchemaOwnTopicMainFunction = createFlowSchemaOwnTopicMainFunction(_izContext, flowSchema, saveFilePath);
+          const flowSchemaOwnTopicMainFunction = await createFlowSchemaOwnTopicMainFunction(_izContext, flowSchema, saveFilePath);
           const flowSchemaOwnTopicComponent = [...flowSchemaOwnTopicFunctionYaml, ...flowSchemaOwnTopicHandler, ...flowSchemaOwnTopicMainFunction]
           // flowSchema OwnTopic Complete component
           const flowSchemaOwnTopicCompleteFunctionYaml = createFlowSchemaOwnTopicCompleteFunctionYaml(_izContext, flowSchema, saveFilePath);
@@ -291,22 +290,23 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           const flowSchemaOwnTopicCompleteMainFunction = createFlowSchemaOwnTopicCompleteMainFunction(_izContext, flowSchema, saveFilePath);
           const flowSchemaOwnTopicCompleteComponent = [...flowSchemaOwnTopicCompleteFunctionYaml, ...flowSchemaOwnTopicCompleteHandler, ...flowSchemaOwnTopicCompleteMainFunction]
           // flowSchemaOwnTopic Endpoint
-          const flowSchemaOwnTopicEndpointFuntionYaml = createFlowSchemaOwnTopicEndpointFuntionYaml(_izContext, flowSchema, saveFilePath);
+          const flowSchemaOwnTopicEndpointFuntionYaml = await createFlowSchemaOwnTopicEndpointFuntionYaml(_izContext, flowSchema, saveFilePath);
           const flowSchemaOwnTopicEndpointHandler = createFlowSchemaOwnTopicEndpointHandler(_izContext, flowSchema, saveFilePath);
-          const flowSchemaOwnTopicEndpointMainFunction = createFlowSchemaOwnTopicEndpointMainFunction(_izContext, flowSchema, saveFilePath);
+          const flowSchemaOwnTopicEndpointMainFunction = await createFlowSchemaOwnTopicEndpointMainFunction(_izContext, flowSchema, saveFilePath);
           const flowSchemaOwnTopicEndpointComponent = [...flowSchemaOwnTopicEndpointFuntionYaml, ...flowSchemaOwnTopicEndpointHandler, ...flowSchemaOwnTopicEndpointMainFunction]
 
           // flowSchemaOwnTopic EndpointComplete
-          const flowSchemaOwnTopicEndpointCompleteFuntionYaml = createFlowSchemaOwnTopicEndpointCompleteFuntionYaml(_izContext, flowSchema, saveFilePath);
-          const flowSchemaOwnTopicEndpointCompleteHandler = createFlowSchemaOwnTopicEndpointCompleteHandler(_izContext, flowSchema, saveFilePath);
-          const flowSchemaOwnTopicEndpointCompleteMainFunction = createFlowSchemaOwnTopicEndpointCompleteMainFunction(_izContext, flowSchema, saveFilePath);
-          const flowSchemaOwnTopicEndpointCompleteComponent = [...flowSchemaOwnTopicEndpointCompleteFuntionYaml, ...flowSchemaOwnTopicEndpointCompleteHandler, ...flowSchemaOwnTopicEndpointCompleteMainFunction];
+          // const flowSchemaOwnTopicEndpointCompleteFuntionYaml = createFlowSchemaOwnTopicEndpointCompleteFuntionYaml(_izContext, flowSchema, saveFilePath);
+          // const flowSchemaOwnTopicEndpointCompleteHandler = createFlowSchemaOwnTopicEndpointCompleteHandler(_izContext, flowSchema, saveFilePath);
+          // const flowSchemaOwnTopicEndpointCompleteMainFunction = createFlowSchemaOwnTopicEndpointCompleteMainFunction(_izContext, flowSchema, saveFilePath);
+          // const flowSchemaOwnTopicEndpointCompleteComponent = [...flowSchemaOwnTopicEndpointCompleteFuntionYaml, ...flowSchemaOwnTopicEndpointCompleteHandler, ...flowSchemaOwnTopicEndpointCompleteMainFunction];
 
           const flowSchemaOwnTopicQueue = createFlowSchemaOwnTopicQueue(_izContext, flowSchema, saveFilePath);
           const flowSchemaOwnTopicSnsOut = createFlowSchemaOwnTopicSnsOut(_izContext, flowSchema, saveFilePath);
           // Group the resources
           const ownTopicResources = [
-            ...flowSchemaOwnTopicComponent, ...flowSchemaOwnTopicCompleteComponent, ...flowSchemaOwnTopicEndpointComponent, ...flowSchemaOwnTopicQueue, ...flowSchemaOwnTopicSnsOut, ...flowSchemaOwnTopicEndpointCompleteComponent
+            ...flowSchemaOwnTopicComponent, ...flowSchemaOwnTopicCompleteComponent, ...flowSchemaOwnTopicEndpointComponent, ...flowSchemaOwnTopicQueue, ...flowSchemaOwnTopicSnsOut,
+            // ...flowSchemaOwnTopicEndpointCompleteComponent
           ];
 
           console.log("event ownTopic generated")
@@ -328,15 +328,16 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           console.log("event eventBridge generated")
           createSourceParams.push(...eventBridgeResources);
         }
+      }
+
+      if (flowSchema.statusType === "storedCache") {
+        const flowSchemaDynamoDb = createAwaitingMultipleStepDynamoDbData(_izContext, flowSchema, allLocalObjectSchemas, saveFilePath)
+        console.log("generated code storedCache flowSchema")
+        createSourceParams.push(...flowSchemaDynamoDb);
+      } else if (flowSchema.statusType === "statusField") {
+        // wait
 
-        if (flowSchema.statusType === "storedCache") {
-          const flowSchemaDynamoDb = createFlowSchemaDynamoDb(_izContext, flowSchema, saveFilePath)
-          console.log("generated code storedCache flowSchema")
-          createSourceParams.push(...flowSchemaDynamoDb);
-        } else if (flowSchema.statusType === "statusField") {
-          // wait
 
-  
         // if (flowSchema.statusType === "statusField") {
         //   const createRecordCompleteFunctionYaml = createCreateObjectCompleteFuntionYaml(_izContext, flowSchema, saveFilePath);
         //   const createRecordCompleteHandler = createCreateObjectCompleteHandler(_izContext, flowSchema, saveFilePath);
@@ -353,29 +354,33 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
         //   createSourceParams.push(...recordCompleteResources);
         // }
       }
-      }
     }
-    console.log("flowSchema Register");
-    const flowSchemaRegisterHandlerComplete = createFlowSchemaRegisterHandlerComplete(_izContext, saveFilePath);
-    const flowSchemaRegisterMainComplete = createFlowSchemaRegisterMainCompleteFunc(_izContext, saveFilePath);
-    const flowSchemaRegisterHandlerWbs = createFlowSchemaRegisterHandlerWbsFunc(_izContext, saveFilePath);
-    const flowSchemaRegisterMainWbs = createFlowSchemaRegisterMainWbsFunc(_izContext, saveFilePath);
-    const flowSchemaRegisterFunctionYamlComplete = createFlowSchemaRegisterMainCompleteFuncYaml(_izContext, saveFilePath);
-    const flowSchemaRegisterFunctionYamlWbs = createFlowSchemaRegisterMainWbsFuncYaml(_izContext, saveFilePath);
-    const flowSchemaRegisterSubscribeOutAll = createFlowSchemaRegisterSubscribeOutAll(_izContext, allLocalFlowSchemas, saveFilePath);
-    const flowSchemaRegisterSnsInSqs = createFlowSchemaRegisterSnsInSqs(_izContext, saveFilePath);
-
-    const flowSchemaRegisters = [
-      ...flowSchemaRegisterHandlerComplete,
-      ...flowSchemaRegisterMainComplete,
-      ...flowSchemaRegisterHandlerWbs,
-      ...flowSchemaRegisterMainWbs,
-      ...flowSchemaRegisterFunctionYamlComplete,
-      ...flowSchemaRegisterFunctionYamlWbs,
-      ...flowSchemaRegisterSnsInSqs,
-      ...flowSchemaRegisterSubscribeOutAll,
-    ];
-    createSourceParams.push(...flowSchemaRegisters);
+    if (allLocalFlowSchemas.records.length) {
+      console.log("flowSchema Register");
+      const flowSchemaRegisterHandlerComplete = createFlowSchemaRegisterHandlerComplete(_izContext, saveFilePath);
+      const flowSchemaRegisterMainComplete = await createFlowSchemaRegisterMainCompleteFunc(_izContext, allLocalFlowSchemas, saveFilePath);
+      const flowSchemaRegisterHandlerWbs = createFlowSchemaRegisterHandlerWbsFunc(_izContext, saveFilePath);
+      const flowSchemaRegisterMainWbs = createFlowSchemaRegisterMainWbsFunc(_izContext, saveFilePath);
+      const flowSchemaRegisterFunctionYamlComplete = createFlowSchemaRegisterMainCompleteFuncYaml(_izContext, saveFilePath);
+      const flowSchemaRegisterFunctionYamlWbs = await createFlowSchemaRegisterMainWbsFuncYaml(_izContext, allLocalFlowSchemas, saveFilePath);
+      const flowSchemaRegisterSubscribeOutAll = createFlowSchemaRegisterSubscribeOutAll(_izContext, allLocalFlowSchemas, saveFilePath);
+      const flowSchemaRegisterSnsInSqs = createFlowSchemaRegisterSnsInSqs(_izContext, saveFilePath);
+
+      const flowSchemaRegisterDynamoDb = createFlowSchemaRegisterDynamoDb(_izContext, saveFilePath);
+
+      const flowSchemaRegisters = [
+        ...flowSchemaRegisterHandlerComplete,
+        ...flowSchemaRegisterMainComplete,
+        ...flowSchemaRegisterHandlerWbs,
+        ...flowSchemaRegisterMainWbs,
+        ...flowSchemaRegisterFunctionYamlComplete,
+        ...flowSchemaRegisterFunctionYamlWbs,
+        ...flowSchemaRegisterSnsInSqs,
+        ...flowSchemaRegisterSubscribeOutAll,
+        ...flowSchemaRegisterDynamoDb
+      ];
+      createSourceParams.push(...flowSchemaRegisters);
+    }
 
     return createSourceParams;
   } catch (error) {

package/src/reStructure/TemplateData/generateRole/createSharedResource.js

@@ -239,7 +239,7 @@ const createSharedResource = (_izContext, createSourceParams, srcPath) => {
         templateData.additionalResourcePermission,
         groupedByObjectType["WebsocketConnect"].resources
       )
-    } else if (templateData.roleName.includes(SOURCE_GENERATE_IAM_ROLE.EventBridge)) {
+    } else if (templateData?.roleName?.includes(SOURCE_GENERATE_IAM_ROLE.EventBridge)) {
       groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.EventBridge].handlerType.push(templateData);
       processResourcePermissions(
         templateData.additionalResourcePermission,
@@ -251,7 +251,7 @@ const createSharedResource = (_izContext, createSourceParams, srcPath) => {
         templateData.additionalResourcePermission,
         groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.CreateRecordComplete].resources
       )
-    } else if (templateData.roleName.includes(SOURCE_GENERATE_IAM_ROLE.RegisterRole)) {
+    } else if (templateData?.roleName?.includes(SOURCE_GENERATE_IAM_ROLE.RegisterRole)) {
       groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.RegisterRole].handlerType.push(templateData);
       processResourcePermissions(
         templateData.additionalResourcePermission,
@@ -264,6 +264,7 @@ const createSharedResource = (_izContext, createSourceParams, srcPath) => {
     }
     return item;
   });
+
   // Process "Other" items that might belong to existing object types
   groupedByObjectType.Other = groupedByObjectType.Other.filter(item => {
     const templateData = item.templateData;

package/src/reStructure/TemplateData/generateRole/sharedResourceTemplate.ejs

@@ -1,32 +1,4 @@
 #IAM Role for Upload Schema functionality
-  UploadSchemaRole:
-    Type: AWS::IAM::Role
-    Properties:
-      RoleName: ${self:custom.iz_resourcePrefix}UploadSchemaRole
-      AssumeRolePolicyDocument:
-        Version: "2012-10-17"
-        Statement:
-          - Effect: Allow
-            Principal:
-              Service: "lambda.amazonaws.com"
-            Action: sts:AssumeRole
-      # this is the managed policy for lambda basic execution ex. logging to cloudwatch
-      ManagedPolicyArns:
-        - arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole
-        - arn:aws:iam::${self:custom.iz_accountId}:policy/UploadSchemaSharedPolicy
-      Policies:
-        - PolicyName: ${self:custom.iz_resourcePrefix}UploadSchemaPolicy
-          PolicyDocument:
-            Version: "2012-10-17"
-            Statement:
-              - Effect: Allow
-                Action:
-                  - s3:PutObject
-                  - s3:GetObject
-                  - s3:ListBucket
-                Resource:
-                  - arn:aws:s3:::object-schema/*
-                  - arn:aws:s3:::object-schema/perServiceSchemas/${self:custom.iz_serviceTag}/*
 <% if (roles && roles.length > 0) { -%>
 <% roles.forEach(function(role) { %>
   <%= role.roleName %>Role:
@@ -54,5 +26,7 @@
                 Resource:<% statement.Resource.forEach(function(resource) { %>
                   - <%= resource -%><% }); %><% } else { %>
                 Resource: <%= statement.Resource %><% } %><% }); %>
+                #<#<%- role.roleName %>AdditionalRole#>
+                #<#/<%- role.roleName %>AdditionalRole#>
   <% }); %>
 <% } %>

package/src/reStructure/TemplateData/perActionComplete/create/mainFunction/createObjectComplete_main.js

@@ -21,7 +21,7 @@ const snsSharedLib = require('@izara_project/izara-shared/src/SnsSharedLib');
 const sns = require('@izara_project/izara-core-library-external-request/src/resources/Sns');
 const callingFlowSharedLib = require('@izara_project/izara-shared/src/CallingFlowSharedLib');
 const _ = require('lodash');
-const hash = require("object-hash")
+const hash = require('@izara_project/izara-shared-core').objectHash;
 
 
 const PREFIX = {

package/src/reStructure/TemplateData/perActionComplete/create/mainFunction/template.ejs

@@ -21,12 +21,14 @@ const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
 const snsSharedLib = require('@izara_project/izara-core-library-sns');
 const sns = require('@izara_project/izara-core-library-external-request/src/resources/Sns');
 const _ = require('lodash');
-const hash = require("object-hash")
+const hash = require('@izara_project/izara-shared-core').objectHash;
 const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
 const PREFIX = {
   CREATE_OBJECT_ASYNC: "createObjectAsync",
   CREATE_OBJECT_ASYNC_COMPLETE: "createObjectAsyncComplete"
 }
+//(<optionalRequire>)
+//(</optionalRequire>)
 
 /**
  *
@@ -36,14 +38,8 @@ const PREFIX = {
  * @param {*} errorsFounds
  * @param {*} graphServiceTag
  * @param {*} passBackProperties
-    returnValue = {
-      queryResult: returnCreateNode,
-      objType,
-      objInstance,
-      relationships,
-      settings
-    }
- */
+*/
+
 module.exports.createObjectComplete = async (
   _izContext,
   returnValue,
@@ -145,9 +141,14 @@ module.exports.createObjectComplete = async (
           };
           _izContext.logger.debug("Send message to OutCreateObjectComplete :::>", sendMessageOutCreateObjectComplete)
           await sns.publishAsync(_izContext, sendMessageOutCreateObjectComplete);
+
+          //(<afterSendMessage>)
+          //(</afterSendMessage>)
         }
       })
     )
+    //(<beforeReturn>)
+    //(</beforeReturn>)
     return {
       returnValue: returnValue,
       status: status,

package/src/reStructure/TemplateData/perActionComplete/delete/mainFunction/template.ejs

@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
-const hash = require("object-hash");
+const hash = require('@izara_project/izara-shared-core').objectHash;
 
 const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
@@ -27,7 +27,8 @@ const sns = require("@izara_project/izara-core-library-external-request").sns;
 const NoRetryError = require("@izara_project/izara-core-library-core/src/NoRetryError");
 
 const { explodedObjectTypeId, explodedRelationshipTypeId, createLinkTypeId } = require('@izara_project/izara-core-library-service-schemas/src/Utils');
-
+//(<optionalRequire>)
+//(</optionalRequire>)
 const {
   TOPIC_NAME_GENERATE_CODE,
   TOPIC_NAME_GRAPH_HANDLER,
@@ -77,6 +78,9 @@ module.exports.deleteNodeComplete = async (
     _izContext.logger.debug("Send Message to DeleteNodeComplete::", sendMessageToOutUpdateNodeComplete);
     await sns.publishAsync(_izContext, sendMessageToOutUpdateNodeComplete)
 
+    //(<beforeReturn>)
+    //(</beforeReturn>)
+
     return {
       objType: returnValue.objType,
       objInstanceFull: returnValue.objInstanceFull,

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

@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
-const hash = require("object-hash");
+const hash = require('@izara_project/izara-shared-core').objectHash;
 
 const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
@@ -33,7 +33,8 @@ const {
   TOPIC_NAME_GRAPH_HANDLER,
   PREFIX
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
-
+//(<optionalRequire>)
+//(</optionalRequire>)
 module.exports.updateNodeComplete = async (
   _izContext,
   returnValue,

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

@@ -16,8 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
-const hash = require("object-hash");
-
+const hash = require('@izara_project/izara-shared-core').objectHash;
 const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const dynamodbSharedLib = require('@izara_project/izara-core-library-dynamodb');
@@ -33,6 +32,8 @@ const {
   TOPIC_NAME_GRAPH_HANDLER,
   PREFIX
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
+//(<optionalRequire>)
+//(</optionalRequire>)
 
 module.exports.updateNodeComplete = async (
   _izContext,

package/src/reStructure/TemplateData/perActionEndpoint/libs/template.ejs

@@ -21,7 +21,7 @@ const externalRequest = require('@izara_project/izara-core-library-external-requ
 const lambda = externalRequest.lambda;
 
 const inMemoryCacheLib = require('@izara_project/izara-shared/src/InMemoryCacheLib');
-const hash = require('object-hash')
+const hash = require('@izara_project/izara-shared-core').objectHash;
 
 async function checkPermission(_izContext, functionName, payload) {
   return await lambda.invokeSync(_izContext, functionName, payload)

package/src/reStructure/TemplateData/perActionEndpoint/mainFunction/create/template.ejs

@@ -31,7 +31,7 @@ const serviceConfigLib = require('@izara_project/izara-core-library-service-sche
 
 const uploadUseCase = require('@izara_project/izara-core-library-service-schemas/src/libs/UploadUseCase')
 
-const hash = require("object-hash")
+const hash = require('@izara_project/izara-shared-core').objectHash;
 const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
 const path = require('path')
 const schemasPath = path.join(__dirname, '../schemas');

package/src/reStructure/TemplateData/perActionEndpoint/mainFunction/delete/template.ejs

@@ -29,7 +29,7 @@ const serviceConfigLib = require('@izara_project/izara-core-library-service-sche
 
 const uploadUseCase = require('@izara_project/izara-core-library-service-schemas/src/libs/UploadUseCase')
 
-const hash = require("object-hash")
+const hash = require('@izara_project/izara-shared-core').objectHash;
 const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
 const path = require('path')
 const schemasPath = path.join(__dirname, '../schemas');

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

@@ -18,7 +18,7 @@ along with this program. If not, see
 
 'use strict';
 
-const hash = require("object-hash");
+const hash = require('@izara_project/izara-shared-core').objectHash;
 const {
   getObjSchemaS3WithHierarchy,
 } = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');

package/src/reStructure/TemplateData/processLogical/mainFunction/template.ejs

@@ -22,6 +22,7 @@ const snsSharedLib = require('@izara_project/izara-core-library-sns');
 const asyncFlowSharedLib = require('@izara_project/izara-core-library-asynchronous-flow');
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
+const logicalResultsSharedLib = require('@izara_project/izara-core-library-logical-result');
 
 const serviceSchemas = require('@izara_project/izara-core-library-service-schemas');
 const getObjectSchemas = serviceSchemas.getObjectSchema;