@izara_project/izara-market-library-service-schemas 1.0.52 → 1.0.53

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.52",
+  "version": "1.0.53",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -14,21 +14,21 @@
   "license": "AGPL-3.0-or-later",
   "homepage": "https://bitbucket.org/izara-market-libraries/izara-market-library-service-schemas/src/master/README.md",
   "devDependencies": {
-    "jest": "^30.0.4"
+    "jest": "^30.0.5"
   },
   "jest": {
     "testEnvironment": "node"
   },
   "dependencies": {
     "@izara_project/izara-core-library-calling-flow": "^1.0.3",
-    "@izara_project/izara-core-library-core": "^1.0.19",
+    "@izara_project/izara-core-library-core": "^1.0.20",
     "@izara_project/izara-core-library-external-request": "^1.0.20",
     "@izara_project/izara-core-library-logger": "^1.0.7",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.79",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.83",
     "@izara_project/izara-core-library-sns": "^1.0.6",
     "@izara_project/izara-core-library-sqs": "^1.0.4",
     "@izara_project/izara-shared": "^1.0.126",
-    "@izara_project/izara-shared-service-schemas": "^1.0.23",
+    "@izara_project/izara-shared-service-schemas": "^1.0.26",
     "@izara_project/izara-shared-core": "^1.0.2",
     "ejs": "^3.1.10",
     "js-beautify": "^1.15.4",

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

@@ -29,7 +29,7 @@ const {
 const consts = require('@izara_project/izara-core-library-service-schemas/src/Consts');
 
 const {
-  objInstanceFromobjInstanceBase
+  objInstanceFromObjInstanceBase
 } = require('@izara_project/izara-core-library-service-schemas/src/IdentifiersObject');
 
 const {
@@ -155,7 +155,7 @@ module.exports.getMain = async (
 
               let messageObject = {
                 objType: objType,
-                objInstanceFull: dataFromGraph.objInstanceFull
+                objInstanceFull: dataFromGraph.queryResults.refactoredNodes.objInstanceFull
               }
               // send message to SNS ProcessFindRequiredData
               _izContext.logger.debug("HAVE CallingFlow");
@@ -199,7 +199,7 @@ module.exports.getMain = async (
 
 
             if (dataFromDynamoDb) {
-              dataFromDynamoDb = await objInstanceFromobjInstanceBase(
+              dataFromDynamoDb = await objInstanceFromObjInstanceBase(
                 _izContext,
                 objType,
                 dataFromDynamoDb

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

@@ -283,6 +283,9 @@ module.exports.updateMain = async (
             _izContext.logger.debug("identifiersForUpdateData", identifiersForUpdateData)
             _izContext.logger.debug("fieldForUpdateTableDynamo", fieldForUpdateTableDynamo)
 
+            //(<beforeUpdateDynamoDb>)
+            //(</beforeUpdateDynamoDb>)
+
             let updateItem = await dynamodbSharedLib.updateItem(
               _izContext,
               await dynamodbSharedLib.tableName(_izContext, updateDataDetail.tableName),

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

@@ -12,15 +12,17 @@
       - http:
           path: <%- firstLetterUpperCase(resourceApi.event) %>/<%- action %>
           method: <%- resourceApi.method %>
-          # authorizer:
-            # name: arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:UserAccountTestAuthorizerServiceSchema
+          authorizer:
+            arn: arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:UserAccountTestAuthorizerServiceSchema
+            resultTtlInSecond: 300
           #<#<%- firstLetterUpperCase(resourceApi.event) _%><%- firstLetterUpperCase(handlerType) %>AppLevelAuthorizer#>
           #<#/<%- firstLetterUpperCase(resourceApi.event) _%><%- firstLetterUpperCase(handlerType) %>AppLevelAuthorizer#>
       - http:
           path: <%- firstLetterUpperCase(resourceApi.event) %>/<%- action %>/{targetUserId}
           method: <%- resourceApi.method %>
-          # authorizer:
-            # name: arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:UserAccountTestAuthorizerServiceSchema
+          authorizer:
+            arn: arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:UserAccountTestAuthorizerServiceSchema
+            resultTtlInSecond: 300
           #<#<%- firstLetterUpperCase(resourceApi.event) _%><%- firstLetterUpperCase(handlerType) %>UserLevelAuthorizer#>
           #<#/<%- firstLetterUpperCase(resourceApi.event) _%><%- firstLetterUpperCase(handlerType) %>UserLevelAuthorizer#>
           <%_ }) _%>

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

@@ -47,7 +47,7 @@ function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
       route
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), "source/"),
       saveFileName: `${functionName}_${handlerType}`,
       fileExtension: ".js",
       isAppend: false

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

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

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

@@ -69,7 +69,6 @@ const createConfirmAfterUploadS3FunctionYaml = require('./components/upload/conf
 const createConfirmAfterUploadS3Handler = require('./components/upload/confirmReserved/handler/data');
 const createConfirmAfterUploadS3MainFunction = require('./components/upload/confirmReserved/mainFunction/data');
 const createConfirmAfterUploadS3Queue = require('./components/upload/confirmReserved/queue/data');
-
 // flowSchema ExternalTopic components //
 const createExternalSqsFunctionYaml = require('./externalTopic/Process/functionYaml/data');
 const createExternalSqsHandler = require('./externalTopic/Process/handler/data');
@@ -114,9 +113,13 @@ const createFlowSchemaEventBridgeHandler = require('./eventBridge/handler/inv/da
 const createFlowSchemaEventBridgeMainFunction = require('./eventBridge/mainFunction/data');
 
 // flowSchema lambdaSync components
-const createFlowSchemaLambdaSyncFunctionYaml = require('./lambdaSync/functionYaml/data');
-const createFlowSchemaLambdaSyncHandler = require('./lambdaSync/handler/data');
-const createFlowSchemaLambdaSyncMainFunction = require('./lambdaSync/mainFunction/data');
+const createFlowSchemaLambdaSyncFunctionYamlInv = require('./lambdaSync/Inv/functionYaml/data');
+const createFlowSchemaLambdaSyncHandlerInv = require('./lambdaSync/Inv/handler/data');
+const createFlowSchemaLambdaSyncMainFunctionInv = require('./lambdaSync/Inv/mainFunction/data');
+
+const createFlowSchemaLambdaSyncFunctionYamlApi = require("./lambdaSync/Api/functionYaml/data");
+const createFlowSchemaLambdaSyncHandlerApi = require("./lambdaSync/Api/handler/data");
+const createFlowSchemaLambdaSyncMainFunctionApi = require("./lambdaSync/Api/mainFunction/data")
 
 const createAwaitingMultipleStepDynamoDbData = require('./dynamoDb/data');
 // create record status Field Complete
@@ -344,20 +347,34 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
           // console.log("event eventBridge generated", JSON.stringify(eventBridgeResources, null, 2))
           console.log("event eventBridge generated")
           createSourceParams.push(...eventBridgeResources);
-        } else if (event.includes("lambdaSync")) {
-          const flowSchemaLambdaSyncFunctionYaml = await createFlowSchemaLambdaSyncFunctionYaml(_izContext, flowSchema, saveFilePath);
-          const flowSchemaLambdaSyncHandler = createFlowSchemaLambdaSyncHandler(_izContext, flowSchema, saveFilePath);
-          const flowSchemaLambdaSyncMainFunction = await createFlowSchemaLambdaSyncMainFunction(_izContext, flowSchema, saveFilePath);
+        } else if (event.includes("lambdaSyncInv")) {
+          const flowSchemaLambdaSyncFunctionYamlInv = createFlowSchemaLambdaSyncFunctionYamlInv(_izContext, flowSchema, saveFilePath);
+          const flowSchemaLambdaSyncHandlerInv = createFlowSchemaLambdaSyncHandlerInv(_izContext, flowSchema, saveFilePath);
+          const flowSchemaLambdaSyncMainFunctionInv = createFlowSchemaLambdaSyncMainFunctionInv(_izContext, flowSchema, saveFilePath);
+
 
           // Group the resources
-          const lambdaSyncResources = [
-            ...flowSchemaLambdaSyncFunctionYaml,
-            ...flowSchemaLambdaSyncHandler,
-            ...flowSchemaLambdaSyncMainFunction
+          const lambdaSyncInvResources = [
+            flowSchemaLambdaSyncFunctionYamlInv,
+            flowSchemaLambdaSyncHandlerInv,
+            flowSchemaLambdaSyncMainFunctionInv,
           ];
 
-          console.log("event lambdaSync generated")
-          createSourceParams.push(...lambdaSyncResources);
+          console.log("event lambdaSyncInv generated")
+          createSourceParams.push(...lambdaSyncInvResources);
+
+        } else if (event.includes("lambdaSyncApi")) {
+          const flowSchemaLambdaSyncFunctionYamlApi = createFlowSchemaLambdaSyncFunctionYamlApi(_izContext, flowSchema, saveFilePath);
+          const flowSchemaLambdaSyncHandlerApi = createFlowSchemaLambdaSyncHandlerApi(_izContext, flowSchema, saveFilePath);
+          const flowSchemaLambdaSyncMainFunctionApi = createFlowSchemaLambdaSyncMainFunctionApi(_izContext, flowSchema, saveFilePath);
+
+          const lambdaSyncApiResources = [
+            flowSchemaLambdaSyncFunctionYamlApi,
+            flowSchemaLambdaSyncHandlerApi,
+            flowSchemaLambdaSyncMainFunctionApi
+          ];
+          createSourceParams.push(...lambdaSyncApiResources)
+          console.log("event lambdaSyncApi generated")
         }
       }
 

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Api/functionYaml/data.js

@@ -0,0 +1,79 @@
+/*
+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/>.
+*/
+
+'use strict';
+const path = require('path');
+
+const { FLOW_SCHEMA_HOOK_STATE, ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
+const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
+const {
+  SOURCE_PATH,
+  defaultIamRolePerAction,
+  createIamRole,
+  RESOURCE_CLASSES,
+  SNS_RESOURCE,
+  resourceNames,
+  DYNAMO_RESOURCE,
+  SAVE_FILE_NAME,
+  FUNCTION_NAME,
+  shortNameHandler,
+  externalResourceYaml,
+  SOURCE_GENERATE_IAM_ROLE,
+  SQS_RESOURCE,
+  LAMBDA_RESOURCE
+} = require('../../../../../../MainLibs/src/Consts');
+const { NoRetryError } = require('@izara_project/izara-core-library-core');
+const getObjectSchema = require('@izara_project/izara-core-library-service-schemas').getObjectSchema;
+
+const templatePath = path.join(__dirname, "./template.ejs");
+/**
+ * receive objectSchema
+ *
+ * @param {Object} objectSchema
+ * @return {{templatePath, templateData,setting}}
+ */
+
+function data(_izContext, flowSchema, srcPath) {
+  return createSourceParamsApi(_izContext, flowSchema, srcPath)
+}
+
+function createSourceParamsApi(_izContext, flowSchema, srcPath) {
+  let functionName = upperCase(flowSchema.flowTag)
+  let handlerType = upperCase(HANDLER.hdrApi)
+  let additionalResourcePermission = defaultIamRolePerAction();
+
+  return {
+    templatePath: templatePath,
+    templateData: {
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, upperCase(flowSchema.flowTag), "source/"),
+      functionName,
+      handlerType,
+      additionalResourcePermission,
+      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
+      roleName: upperCase(flowSchema.flowTag),
+      event: "post"
+    },
+    setting: {
+      savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+      saveFileName: upperCase(SAVE_FILE_NAME.flowSchema),
+      fileExtension: ".yml",
+      isAppend: true
+    }
+  }
+}
+
+module.exports = data;

package/src/reStructure/TemplateData/flowSchema/lambdaSync/{handler → Api/handler}/data.js

@@ -19,11 +19,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const path = require('path');
 
 const { FLOW_SCHEMA_HOOK_STATE, ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../MainLibs/src/Utils")
-const { SOURCE_PATH } = require('../../../../../MainLibs/src/Consts');
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../MainLibs/src/Utils")
+const { SOURCE_PATH } = require('../../../../../../MainLibs/src/Consts');
 
-const templatePathInvoke = path.join(__dirname, "./templateInv.ejs");
-const templatePathApi = path.join(__dirname, "./templateApi.ejs");
+const templatePath = path.join(__dirname, "./template.ejs");
 /**
  * receive objectSchema
  * create data for WebScoket handler template
@@ -33,40 +32,15 @@ const templatePathApi = path.join(__dirname, "./templateApi.ejs");
  */
 
 function data(_izContext, flowSchema, srcPath) {
-  let returnCreateSource = [];
-  returnCreateSource.push(createSourceParamsInvoke(_izContext, flowSchema, srcPath))
-  if (flowSchema.externalEndpoint) {
-    returnCreateSource.push(createSourceParamsApi(_izContext, flowSchema, srcPath))
-  }
-  return returnCreateSource
+  return createSourceParamsApi(_izContext, flowSchema, srcPath)
 }
 
-function createSourceParamsInvoke(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(flowSchema.flowTag)
-  let handlerType = upperCase(HANDLER.hdrInv)
-
-  return {
-    templatePath: templatePathInvoke,
-    templateData: {
-      functionName,
-      handlerType,
-    },
-    setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),
-      saveFileName: `${functionName}_${handlerType}`,
-      fileExtension: ".js",
-      isAppend: false
-    }
-  }
-}
-
-
 function createSourceParamsApi(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(flowSchema.flowTag)
   let handlerType = upperCase(HANDLER.hdrApi)
 
   return {
-    templatePath: templatePathApi,
+    templatePath: templatePath,
     templateData: {
       functionName,
       handlerType,
@@ -74,7 +48,7 @@ function createSourceParamsApi(_izContext, flowSchema, srcPath) {
       // properties
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), "source/"),
       saveFileName: `${functionName}_${handlerType}`,
       fileExtension: ".js",
       isAppend: false

package/src/reStructure/TemplateData/flowSchema/lambdaSync/{handler/templateApi.ejs → Api/handler/template.ejs}

@@ -21,7 +21,7 @@ const RBAC_TARGET_ID = process.env.iz_rbacTargetIdUser // iz_rbacTargetIdUser |
 
 const izara = require("@izara_project/izara-middleware");
 const middleware = izara.middlewareHandler;
-const lambdaFunction = require('./LambdaFunction_Main')
+const <%- functionName %> = require('./<%- functionName %>_Main')
 
 // validate event params in middlewware before into function.
 let validatorSchema = {};
@@ -58,7 +58,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       targetUserId = event.pathParameters[process.env.iz_rbacTargetIdUser]
     }
     // invoke LambdaFunction
-    let lambdaFunctionResponse = await lambdaFunction.lambdaFunction(
+    let lambdaFunctionResponse = await <%- functionName %>.<%- functionName %>Main(
       event._izContext,       // correlationId/logger/integrationTestDetail/uniqueRequestId/userId
       event.body,
       event._izContext.userId, // send userId last element

package/src/reStructure/TemplateData/flowSchema/lambdaSync/{mainFunction → Api/mainFunction}/data.js

@@ -18,13 +18,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 const path = require('path');
 const getObjectSchema = require('@izara_project/izara-core-library-service-schemas').getObjectSchema
-const { SOURCE_PATH, FUNCTION_NAME, HANDLER } = require('../../../../../MainLibs/src/Consts');
+const { SOURCE_PATH, FUNCTION_NAME, HANDLER } = require('../../../../../../MainLibs/src/Consts');
 const { STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../MainLibs/src/Utils")
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../MainLibs/src/Utils")
 const templatePath = path.join(__dirname, "./template.ejs");
-const statusFieldTemplate = path.join(__dirname, "../../templateBystatusType/statusFieldTemplate.ejs")
-const storedCacheTemplate = path.join(__dirname, "../../templateBystatusType/storedCacheTemplate.ejs")
-const triggerCacheTemplate = path.join(__dirname, "../../templateBystatusType/triggerCacheTemplate.ejs");
+const statusFieldTemplate = path.join(__dirname, "../../../templateBystatusType/statusFieldTemplate.ejs")
+const storedCacheTemplate = path.join(__dirname, "../../../templateBystatusType/storedCacheTemplate.ejs")
+const triggerCacheTemplate = path.join(__dirname, "../../../templateBystatusType/triggerCacheTemplate.ejs");
 /**
  * receive objectSchema
  * create data for WebScoket handler template
@@ -34,37 +34,20 @@ const triggerCacheTemplate = path.join(__dirname, "../../templateBystatusType/tr
  */
 
 
-async function data(_izContext, flowSchema, srcPath) {
-  return [await createParamsForCreateSource(_izContext, flowSchema, srcPath)]
+function data(_izContext, flowSchema, srcPath) {
+  return createParamsForCreateSource(_izContext, flowSchema, srcPath)
 }
 
-async function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
+function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(flowSchema.flowTag);
-  let statusType = flowSchema.statusType;
-  let triggerType = flowSchema.triggerType;
-  let tableName = null;
-  if (flowSchema.statusType === "storedCache") {
-    let objectSchema = await getObjectSchema.getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], path.join(srcPath, "./schemas")).then(res => res.records[0]);
-    for (const storageResource of Object.values(objectSchema.storageResources)) {
-      if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
-        tableName = storageResource.tableName
-      }
-    }
-  }
   return {
     templatePath: templatePath,
     templateData: {
       flowTag: flowSchema.flowTag,
       functionName,
-      statusFieldTemplate,
-      storedCacheTemplate,
-      triggerCacheTemplate,
-      statusType,
-      tableName,
-      triggerType
     },
     setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, flowSchema.flowTag, "source/"),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), "source/"),
       saveFileName: `${functionName}_Main`,
       fileExtension: ".js",
       isAppend: false

package/src/reStructure/TemplateData/flowSchema/lambdaSync/{mainFunction → Api/mainFunction}/template.ejs

@@ -71,21 +71,6 @@ module.exports.<%- functionName %>Main = async (
     _izContext.logger.debug("<%- functionName %>Main requestParams", requestParams)
     _izContext.logger.debug("<%- functionName %>Main callingFlowConfig", callingFlowConfig)
 
-    //(<beforeCheckStatus>)
-    //(</beforeCheckStatus>)
-
-    <% if (statusType === "statusField") { %>
-      <%- include(statusFieldTemplate) %>
-    <% } else if (statusType === "storedCache") { %>
-      <%- include(storedCacheTemplate, {tableName:tableName}) %>
-
-    <% } else if (statusType === "triggerCache") { %>
-      <%- include(triggerCacheTemplate, {
-        tableName: tableName,
-        triggerType: triggerType
-        }) %>
-    <% } %>
-
     //(<endpointHook>)
     //(</endpointHook>)
 

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Inv/functionYaml/data.js

@@ -0,0 +1,78 @@
+/*
+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/>.
+*/
+
+'use strict';
+const path = require('path');
+
+const { FLOW_SCHEMA_HOOK_STATE, ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
+const { firstLetterUpperCase: upperCase } = require('../../../../../../MainLibs/src/Utils')
+const {
+  SOURCE_PATH,
+  defaultIamRolePerAction,
+  createIamRole,
+  RESOURCE_CLASSES,
+  SNS_RESOURCE,
+  resourceNames,
+  DYNAMO_RESOURCE,
+  SAVE_FILE_NAME,
+  FUNCTION_NAME,
+  shortNameHandler,
+  externalResourceYaml,
+  SOURCE_GENERATE_IAM_ROLE,
+  SQS_RESOURCE,
+  LAMBDA_RESOURCE
+} = require('../../../../../../MainLibs/src/Consts');
+const { NoRetryError } = require('@izara_project/izara-core-library-core');
+const getObjectSchema = require('@izara_project/izara-core-library-service-schemas').getObjectSchema;
+
+const templatePath = path.join(__dirname, "./template.ejs");
+/**
+ * receive objectSchema
+ * create data for WebScoket handler template
+ *
+ * @param {Object} objectSchema
+ * @return {{templatePath, templateData,setting}}
+ */
+
+function data(_izContext, flowSchema, srcPath) {
+  return createSourceParamsInvoke(_izContext, flowSchema, srcPath)
+}
+
+function createSourceParamsInvoke(_izContext, flowSchema, srcPath) {
+  let functionName = upperCase(flowSchema.flowTag)
+  let handlerType = upperCase(HANDLER.hdrInv)
+  let additionalResourcePermission = defaultIamRolePerAction();
+
+  return {
+    templatePath: templatePath,
+    templateData: {
+      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, upperCase(flowSchema.flowTag), "source/"),
+      functionName,
+      handlerType,
+      additionalResourcePermission,
+      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
+      roleName: upperCase(flowSchema.flowTag)
+    },
+    setting: {
+      savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+      saveFileName: upperCase(SAVE_FILE_NAME.flowSchema),
+      fileExtension: ".yml",
+      isAppend: true
+    }
+  }
+}
+module.exports = data;

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Inv/handler/data.js

@@ -0,0 +1,58 @@
+/*
+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/>.
+*/
+
+'use strict';
+const path = require('path');
+
+const { FLOW_SCHEMA_HOOK_STATE, ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../MainLibs/src/Utils")
+const { SOURCE_PATH } = require('../../../../../../MainLibs/src/Consts');
+
+const templatePath = path.join(__dirname, "./template.ejs");
+/**
+ * receive objectSchema
+ * create data for WebScoket handler template
+ *
+ * @param {Object} objectSchema
+ * @return {{templatePath, templateData,setting}}
+ */
+
+function data(_izContext, flowSchema, srcPath) {
+  return createSourceParamsInvoke(_izContext, flowSchema, srcPath)
+}
+
+function createSourceParamsInvoke(_izContext, flowSchema, srcPath) {
+  let functionName = upperCase(flowSchema.flowTag)
+  let handlerType = upperCase(HANDLER.hdrInv)
+
+  return {
+    templatePath: templatePath,
+    templateData: {
+      functionName,
+      handlerType,
+    },
+    setting: {
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), "source/"),
+      saveFileName: `${functionName}_${handlerType}`,
+      fileExtension: ".js",
+      isAppend: false
+    }
+  }
+}
+
+
+module.exports = data;

package/src/reStructure/TemplateData/flowSchema/lambdaSync/{handler/templateInv.ejs → Inv/handler/template.ejs}

@@ -24,7 +24,7 @@ const middleware = require("@izara_project/izara-middleware").middlewareHandler;
 
 const <%- functionName %> = require('./<%- functionName %>_Main')
 
-// validate event params in middlewware before into function.
+// validate event params in middleware before into function.
 const validatorSchema = {};
 middleware.setValidatorSchema(validatorSchema)
 
@@ -35,7 +35,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
   try {
 
     // invoke LambdaFunction
-    return await lambdaFunction.lambdaFunction(
+    return await <%- functionName %>.<%- functionName %>Main(
       event._izContext, // correlationId/logger/integrationTestDetail/uniqueRequestId
       event
     );

package/src/reStructure/TemplateData/flowSchema/lambdaSync/Inv/mainFunction/data.js

@@ -0,0 +1,58 @@
+/*
+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/>.
+*/
+
+'use strict';
+const path = require('path');
+const getObjectSchema = require('@izara_project/izara-core-library-service-schemas').getObjectSchema
+const { SOURCE_PATH, FUNCTION_NAME, HANDLER } = require('../../../../../../MainLibs/src/Consts');
+const { STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../../../MainLibs/src/Utils")
+const templatePath = path.join(__dirname, "./template.ejs");
+const statusFieldTemplate = path.join(__dirname, "../../../templateBystatusType/statusFieldTemplate.ejs")
+const storedCacheTemplate = path.join(__dirname, "../../../templateBystatusType/storedCacheTemplate.ejs")
+const triggerCacheTemplate = path.join(__dirname, "../../../templateBystatusType/triggerCacheTemplate.ejs");
+/**
+ * receive objectSchema
+ * create data for WebScoket handler template
+ *
+ * @param {Object} objectSchema
+ * @return {{templatePath, templateData,setting}}
+ */
+
+
+function data(_izContext, flowSchema, srcPath) {
+  return createParamsForCreateSource(_izContext, flowSchema, srcPath)
+}
+
+function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
+  let functionName = upperCase(flowSchema.flowTag);
+
+  return {
+    templatePath: templatePath,
+    templateData: {
+      flowTag: flowSchema.flowTag,
+      functionName,
+    },
+    setting: {
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), "source/"),
+      saveFileName: `${functionName}_Main`,
+      fileExtension: ".js",
+      isAppend: false
+    }
+  }
+}
+module.exports = data

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

@@ -0,0 +1,81 @@
+/*
+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 />.
+*/
+
+'use strict';
+
+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');
+const snsSharedLib = require('@izara_project/izara-core-library-sns');
+const sqsSharedLib = require('@izara_project/izara-core-library-sqs');
+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
+const sqs = externalRequest.sqs
+const lambda = externalRequest.lambda
+const { postToConnection } = require("../../../libs/source/GenerateCodeLibs");
+const utils = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Utils')
+const NoRetryError = require('@izara_project/izara-core-library-core').NoRetryError
+const { v4: uuidv4 } = require('uuid')
+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 consts = require('@izara_project/izara-middleware/src/MiddlewareCore/Consts')
+const { createFieldNamesFromRequestParamsByObjectSchema } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs.js')
+//(<optionalRequire>)
+//(</optionalRequire>)
+/**
+ *
+ *
+ * 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
+ */
+
+module.exports.<%- functionName %>Main = async (
+  _izContext,
+  requestParams,
+  callingFlowConfig = {},
+  //(<additionalParams>)
+  //(</additionalParams>)
+) => {
+
+  try {
+    _izContext.logger.debug("<%- functionName %>Main _izContext", _izContext)
+    _izContext.logger.debug("<%- functionName %>Main requestParams", requestParams)
+    _izContext.logger.debug("<%- functionName %>Main callingFlowConfig", callingFlowConfig)
+
+    //(<endpointHook>)
+    //(</endpointHook>)
+
+  } catch (err) {
+    _izContext.logger.error('error WebSocketInvoke: ', err)
+    throw (err)
+  }
+}

package/src/reStructure/TemplateData/flowSchema/webSocketComplete/functionYaml/data.js

@@ -90,16 +90,25 @@ function createSourceParams(_izContext, allLocalFlowSchemas, srcPath) {
         resourceNames(RESOURCE_CLASSES.sqs, queueName),
         resourceNames(RESOURCE_CLASSES.sqs, queueName + "DLQ")
       ]
-    ),
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.subscribe]
-      },
-      allLocalFlowSchemas.records.map(flowSchema => resourceNames(RESOURCE_CLASSES.sns, flowSchema.flowTag + "_Out"))
     )
   )
 
-
+  for (const flowSchema of allLocalFlowSchemas.records) {
+    console.log("flowSchema", flowSchema)
+    if (flowSchema.event.includes("ownTopic") || flowSchema.event.includes("extTopic")) {
+      console.log("this is topic")
+      additionalResourcePermission.push(
+        createIamRole(
+          {
+            [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.subscribe]
+          },
+          [
+            resourceNames(RESOURCE_CLASSES.sns, upperCase(flowSchema.flowTag) + "_Out")
+          ]
+        )
+      )
+    }
+  }
   return {
     templatePath: templatePath,
     templateData: {

package/src/reStructure/TemplateData/propertyValueSchema/relationshipPropertyValueSchema/data.js

@@ -24,7 +24,7 @@ const {
   PREFIX_RELATIONSHIP,
   PROPERTY_VALUE_TAG,
   SAVE_FILE_NAME
-} = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Consts');
+} = require('../../../../MainLibs/src/Consts');
 
 const templatePath = path.join(__dirname, "./tempRelationship.ejs");
 

package/src/reStructure/TemplateData/relationshipPerAction/get/action/mainFunction/template.ejs

@@ -52,6 +52,7 @@ const {
   TOPIC_NAME_GENERATE_CODE,
   TOPIC_NAME_GRAPH_HANDLER
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
+const graphSharedLib = require('@izara_project/izara-core-library-graph-service')
 //(<optionalRequire>)
 //(</optionalRequire>)
 /**
@@ -246,17 +247,15 @@ module.exports.getRelationship = async (
     await Promise.all(
       targetGraphStorageResources.map(async (storageResource) => {
         if (storageResource.storageType === consts.STORAGE_TYPES.graph) {
-          let getResultFromGraph = await lambda.invokeSync(_izContext,
-            await lambdaSharedLib.lambdaFunctionName(_izContext, "GetRelationshipV2", storageResource.graphServiceTag),
-            {
-              firstObject: firstObject,
-              secondObject: secondObject,
-              relType: relType,
-              relId: relId,
-              relationshipDirection,
-            }
+          result = await graphSharedLib.getRelationshipV2(
+            _izContext,
+            storageResource.graphServiceTag,
+            firstObject,
+            secondObject,
+            relType,
+            relId,
+            relationshipDirection
           )
-          result = getResultFromGraph;
         } else if (storageResource.storageType === consts.STORAGE_TYPES.dynamoDB) {
 
           // if have storageResource.storageType === "dynamoDB" will create relationship here

package/src/reStructure/TemplateData/flowSchema/lambdaSync/functionYaml/data.js

@@ -1,128 +0,0 @@
-/*
-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/>.
-*/
-
-'use strict';
-const path = require('path');
-
-const { FLOW_SCHEMA_HOOK_STATE, ACTIONS, HANDLER, STORAGE_TYPES } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
-const { firstLetterUpperCase: upperCase } = require('../../../../../MainLibs/src/Utils')
-const {
-  SOURCE_PATH,
-  defaultIamRolePerAction,
-  createIamRole,
-  RESOURCE_CLASSES,
-  SNS_RESOURCE,
-  resourceNames,
-  DYNAMO_RESOURCE,
-  SAVE_FILE_NAME,
-  FUNCTION_NAME,
-  shortNameHandler,
-  externalResourceYaml,
-  SOURCE_GENERATE_IAM_ROLE,
-  SQS_RESOURCE,
-  LAMBDA_RESOURCE
-} = require('../../../../../MainLibs/src/Consts');
-const { NoRetryError } = require('@izara_project/izara-core-library-core');
-const getObjectSchema = require('@izara_project/izara-core-library-service-schemas').getObjectSchema;
-
-const templatePathInv = path.join(__dirname, "templateInv.ejs");
-const templatePathApi = path.join(__dirname, "templateApi.ejs");
-/**
- * receive objectSchema
- * create data for WebScoket handler template
- *
- * @param {Object} objectSchema
- * @return {{templatePath, templateData,setting}}
- */
-
-async function data(_izContext, flowSchema, srcPath) {
-  let returnCreateSource = [];
-  returnCreateSource.push(await createSourceParamsInvoke(_izContext, flowSchema, srcPath))
-  if (flowSchema.externalEndpoint) {
-    returnCreateSource.push(await createSourceParamsApi(_izContext, flowSchema, srcPath))
-  }
-  return returnCreateSource
-}
-
-async function createSourceParamsInvoke(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(flowSchema.flowTag)
-  let handlerType = upperCase(HANDLER.hdrInv)
-  let additionalResourcePermission = defaultIamRolePerAction();
-  let tableName = null;
-  if (flowSchema.statusType === "storedCache") {
-    let objectSchema = await getObjectSchema.getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], path.join(srcPath, "./schemas")).then(res => res.records[0]);
-    for (const storageResource of Object.values(objectSchema.storageResources)) {
-      if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
-        tableName = storageResource.tableName
-      }
-    }
-  }
-
-  return {
-    templatePath: templatePathInv,
-    templateData: {
-      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, upperCase(flowSchema.flowTag), "source/"),
-      functionName,
-      handlerType,
-      additionalResourcePermission,
-      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
-      roleName: upperCase(flowSchema.flowTag)
-    },
-    setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.appYaml),
-      saveFileName: upperCase(SAVE_FILE_NAME.flowSchema),
-      fileExtension: ".yml",
-      isAppend: true
-    }
-  }
-}
-
-async function createSourceParamsApi(_izContext, flowSchema, srcPath) {
-  let functionName = upperCase(flowSchema.flowTag)
-  let handlerType = upperCase(HANDLER.hdrApi)
-  let additionalResourcePermission = defaultIamRolePerAction();
-  let tableName = null;
-  if (flowSchema.statusType === "storedCache") {
-    let objectSchema = await getObjectSchema.getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], path.join(srcPath, "./schemas")).then(res => res.records[0]);
-    for (const storageResource of Object.values(objectSchema.storageResources)) {
-      if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
-        tableName = storageResource.tableName
-      }
-    }
-  }
-
-  return {
-    templatePath: templatePathApi,
-    templateData: {
-      resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, upperCase(flowSchema.flowTag), "source/"),
-      functionName,
-      handlerType,
-      additionalResourcePermission,
-      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
-      roleName: upperCase(flowSchema.flowTag),
-      event: "post"
-    },
-    setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.appYaml),
-      saveFileName: upperCase(SAVE_FILE_NAME.flowSchema),
-      fileExtension: ".yml",
-      isAppend: true
-    }
-  }
-}
-
-module.exports = data;