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

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/flowSchemaComplete/handler/template.ejs

@@ -0,0 +1,85 @@
+/*
+Copyright (C) 2021 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 izara = require("@izara_project/izara-middleware");
+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-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");
+const { flowSchemaOwnTopic } = require('./<%- `${functionName}_Main` %>');
+module.exports.main = middleware.wrap(async (event, context, callback) => {
+
+  event._izContext.logger.debug('Event:', event);
+
+  try {
+
+    if (event.requestContext) {
+      const route = event.requestContext.routeKey;
+      const connectionId = event.requestContext.connectionId;
+      let correlationId = event._izContext.correlationIds.get(consts.X_CORRELATION_ID)
+
+      switch (route) {
+        case '$default':
+          console.log('Received unknown route:', route);
+          break
+        case '<%- route %>':
+          console.log("event in route webSocket", event);
+          let eventParams = JSON.parse(event.body)
+
+          await dynamodbSharedLib.putItem(
+            event._izContext,
+            await dynamodbSharedLib.tableName(event._izContext, "WebSocketTask"),
+            {
+              taskKey: correlationId,
+              connectionId: connectionId,
+            }
+          )
+
+          let callingFlow = eventParams?.callingFlow ? eventParams.callingFlow : {};
+          await flowSchemaOwnTopic(
+            event._izContext,
+            eventParams,
+            callingFlowSharedLib.addCallingFlowToPassOnProperties(callingFlow)
+            //(<additionalParams>)
+            //(</additionalParams>)
+          )
+
+          break
+      }
+    } else {
+      const connId = event.connId;
+      // await postMessage({ message: event.message }, connId);
+      await postToConnection({ message: event.message }, connId);
+    }
+
+    return (izara.response.webSocketSuccess());
+
+  } catch (err) {
+    const connId = event.requestContext.connectionId
+    event._izContext.logger.error('Error, WebSocket: ', err);
+    // await sendErrorMessage({ message: err.message }, connId);
+    await postToConnection({ message: err.message }, connId);
+    return (izara.response.failure(err));
+  }
+});

package/src/reStructure/TemplateData/flowSchema/{components/upload/hook/hookLogic → flowSchemaOwnTopic/flowSchemaComplete/mainFunction}/data.js

@@ -17,13 +17,23 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 const path = require('path');
-const { HANDLER } = require('@izara_project/izara-core-library-service-schemas/src/Consts')
-const { createHookFunction } = require('../../../../../../SourceManager/src/Utils')
-const { FLOW_SCHEMA_HOOK_STATE } = 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, SQS_RESOURCE } = require("../../../../libs/Consts");
-const asyncTemplatePath = path.join(__dirname, "templateAsyncHandler.ejs")
-const syncTemplatePath = path.join(__dirname, "templateSyncHandler.ejs")
+const {
+  SOURCE_PATH,
+  defaultIamRolePerAction,
+  createIamRole,
+  RESOURCE_CLASSES,
+  SNS_RESOURCE,
+  resourceNames,
+  DYNAMO_RESOURCE,
+  SAVE_FILE_NAME,
+  FUNCTION_NAME,
+  shortNameHandler,
+  externalResourceYaml,
+  SOURCE_GENERATE_IAM_ROLE
+} = require('../../../../../../MainLibs/src/Consts');
+const templatePath = path.join(__dirname, "template.ejs");
+
 /**
  * receive objectSchema
  * create data for WebScoket handler template
@@ -32,12 +42,22 @@ const syncTemplatePath = path.join(__dirname, "templateSyncHandler.ejs")
  * @return {{templatePath, templateData,setting}}
  */
 
+
 function data(_izContext, flowSchema, srcPath) {
-  return [createSourceParams(_izContext, flowSchema, srcPath)]
+  return [createParamsForCreateSource(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, flowSchema, srcPath) {
-
+function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
+  let functionName = upperCase(FUNCTION_NAME.flowSchemaOwnTopicComplete)
+  return {
+    templatePath: templatePath,
+    templateData: {},
+    setting: {
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchemaOwnTopic, flowSchema.flowTag, "source/"),
+      saveFileName: `${functionName}_Main`,
+      fileExtension: ".js",
+      isAppend: false
+    }
+  }
 }
-
 module.exports = data

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

@@ -0,0 +1,105 @@
+/*
+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("object-hash");
+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 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 externalRequest = require('@izara_project/izara-core-library-external-request');
+const sns = externalRequest.sns
+
+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')
+/**
+ *
+ *
+ * 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.flowSchemaOwnTopic = async (
+  _izContext,
+  requestParams,
+  callingFlowConfig = {},
+  //(<additionalParams>)
+  //(</additionalParams>)
+) => {
+
+  try {
+    _izContext.logger.debug("WebSocketInvoke _izContext", _izContext)
+    _izContext.logger.debug("WebSocketInvoke requestParams", requestParams)
+    _izContext.logger.debug("WebSocketInvoke callingFlowConfig", callingFlowConfig)
+
+    let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
+      flowTag: requestParams.flowTag,
+      serviceTag: process.env.iz_serviceTag
+      // serviceTag: "GenerateCodeTamplateBas002"
+    })
+
+    _izContext.logger.debug("flowSchema", flowSchema)
+
+
+    if (!flowSchema) {
+      throw new NoRetryError(`flowTag not found ${requestParams.flowTag}`)
+    }
+
+    let messageObject = {
+      requestParams:requestParams
+    }
+    // create callingFlow
+    messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
+      messageObject,
+      callingFlowSharedLib.addParentCallingFlowConfig(
+        callingFlowConfig,
+        callingFlowSharedLib.createCallingFlowConfig(
+          await lambdaSharedLib.lambdaFunctionName(_izContext, TOPIC_NAME_GENERATE_CODE.createNodeComplete), {}
+        )
+      )
+    )
+
+    // send message to ImportBatchCreateHdrSqs
+    let sendMessageToCreateEndpoint = {
+      Message: JSON.stringify(messageObject),
+      TopicArn: await snsSharedLib.snsTopicArn(_izContext, `flowSchema.flowSteps`)
+    }
+    _izContext.logger.debug("sendMessageToCreateEndpoint", sendMessageToCreateEndpoint);
+    await sns.publishAsync(_izContext, sendMessageToCreateEndpoint);
+
+  } catch (err) {
+    _izContext.logger.error('error WebSocketInvoke: ', err)
+    throw (err)
+  }
+}

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

@@ -32,7 +32,8 @@ const createWebSocketDynamoDb = require('./components/websocket/dynamoDb/WebSock
 const createReservedDataMainTable = require('./components/websocket/dynamoDb/ReservedTableData');
 const createBucketS3 = require('./components/upload/relate/S3/data');
 const createWebSocketGenerateCodeLibs = require('./components/upload/relate/libs/data');
-
+const createWebSocketConnectYaml = require('./components/websocket/connect/functionYaml/data')
+const createWebSocketConnectHandler = require('./components/websocket/connect/handler/data')
 // CreateObject components
 const createFunctionYamlCreateObjectWebSocket = require('./components/upload/createObject/functionYaml/data');
 const createHandlerCreateObjectWebSocket = require('./components/upload/createObject/handler/data');
@@ -45,16 +46,16 @@ const createWebSocketCreateObjectCompleteHandler = require('./components/upload/
 const createWebSocketCreateObjectCompleteMainFunction = require('./components/upload/createObjectComplete/mainFunction/data');
 
 // PreSign URL components
-const createGetPreSignUrlFunctionYaml = require('./components/upload/preSignUrl/getSignUrls/functionYaml/data');
-const createGetPreSignUrlHandler = require('./components/upload/preSignUrl/getSignUrls/handler/data');
-const createGetPreSignUrlMainFunction = require('./components/upload/preSignUrl/getSignUrls/mainFunction/data');
-const createGetPreSignUrlQueueName = require('./components/upload/preSignUrl/getSignUrls/sqs/data');
-
-// Reserved limit components
 const createReservedLimitFunctionYaml = require('./components/upload/preSignUrl/reservedLimit/functionYaml/data');
-const createReservedLimitHandler = require('./components/upload/preSignUrl/reservedLimit/handler/data');
+const createReservedLimitlHandler = require('./components/upload/preSignUrl/reservedLimit/handler/data');
 const createReservedLimitMainFunction = require('./components/upload/preSignUrl/reservedLimit/mainFunction/data');
-const createReservedLimitQueueName = require('./components/upload/preSignUrl/reservedLimit/queue/data');
+const createReservedLimitQueueName = require('./components/upload/preSignUrl/reservedLimit/sqs/data');
+
+// Reserved limit components
+const createPresignUrlFunctionYaml = require('./components/upload/preSignUrl/createPresignUrl/functionYaml/data');
+const createPresignUrlHandler = require('./components/upload/preSignUrl/createPresignUrl/handler/data');
+const createPresignUrlMainFunction = require('./components/upload/preSignUrl/createPresignUrl/mainFunction/data');
+const createPresignUrlQueueName = require('./components/upload/preSignUrl/createPresignUrl/queue/data');
 
 // Process uploaded file components
 const createProcessAfterUploadS3FunctionYmlS3 = require('./components/upload/processFile/functionYml/HdrS3/data');
@@ -68,6 +69,16 @@ const createConfirmAfterUploadS3Handler = require('./components/upload/confirmRe
 const createConfirmAfterUploadS3MainFunction = require('./components/upload/confirmReserved/mainFunction/data');
 const createConfirmAfterUploadS3Queue = require('./components/upload/confirmReserved/queue/data');
 
+// flowSchema OwnTopic component
+const createFlowSchemaOwnTopicFunctionYaml = require('./flowSchemaOwnTopic/flowSchema/functionYaml/data');
+const createFlowSchemaOwnTopicHandler = require('./flowSchemaOwnTopic/flowSchema/handler/data');
+const createFlowSchemaOwnTopicMainFunction = require('./flowSchemaOwnTopic/flowSchema/mainFunction/data');
+
+// flowSchema OwnTopicComplete component
+const createFlowSchemaOwnTopicCompleteFunctionYaml = require("./flowSchemaOwnTopic/flowSchemaComplete/functionYaml/data")
+const createFlowSchemaOwnTopicCompleteHandler = require("./flowSchemaOwnTopic/flowSchemaComplete/handler/data")
+const createFlowSchemaOwnTopicCompleteMainFunction = require("./flowSchemaOwnTopic/flowSchemaComplete/mainFunction/data")
+
 /**
  * Generates code with templates for different actions
  * @param {Object} _izContext - Context object
@@ -82,12 +93,10 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
 
     // default webSocket setting
     const webSocketTaskTable = createWebSocketDynamoDb(_izContext, saveFilePath);
-    // const webSocketConnectYaml = createWebSocketConnectYaml(_izContext, saveFilePath);
-    // const webSocketConnectHandler = createWebSocketConnectHandler(_izContext, saveFilePath);
+    const webSocketConnectYaml = createWebSocketConnectYaml(_izContext, saveFilePath);
+    const webSocketConnectHandler = createWebSocketConnectHandler(_izContext, saveFilePath);
 
-    const webSocketResource = [...webSocketTaskTable
-      // ...webSocketConnectYaml, ...webSocketConnectHandler,
-    ]
+    const webSocketResource = [...webSocketTaskTable, ...webSocketConnectYaml, ...webSocketConnectHandler]
     if (allLocalFlowSchemas.records.length) {
       createSourceParams.push(
         ...webSocketResource
@@ -95,42 +104,41 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     }
 
     for (const flowSchema of allLocalFlowSchemas.records) {
-      // console.log("flowSchema::", flowSchema)
+
       const reservedDataTable = createReservedDataMainTable(_izContext, saveFilePath);
       const bucketS3 = createBucketS3(_izContext, flowSchema, saveFilePath)
 
-
       const functionYamlCreateObjectWebSocket = createFunctionYamlCreateObjectWebSocket(_izContext, flowSchema, saveFilePath);
       const handlerCreateObjectWebSocket = createHandlerCreateObjectWebSocket(_izContext, flowSchema, saveFilePath);
       const mainFunctionCreateObjectWebSocket = await createMainFunctionCreateObjectWebSocket(_izContext, flowSchema, saveFilePath);
-      const webSocketCreateObjectCompleteFunctionYaml = createWebSocketCreateObjectCompleteFunctionYaml(_izContext, saveFilePath);
+      const webSocketCreateObjectCompleteFunctionYaml = createWebSocketCreateObjectCompleteFunctionYaml(_izContext, flowSchema, saveFilePath);
       const webSocketCreateObjectCompleteQueue = createWebSocketCreateObjectCompleteQueue(_izContext, saveFilePath);
-      const webSocketCreateObjectCompleteMainFunction = createWebSocketCreateObjectCompleteMainFunction(_izContext, saveFilePath)
-      const webSocketCreateObjectCompleteHandler = createWebSocketCreateObjectCompleteHandler(_izContext, saveFilePath);
+      const webSocketCreateObjectCompleteMainFunction = createWebSocketCreateObjectCompleteMainFunction(_izContext, flowSchema, saveFilePath)
+      const webSocketCreateObjectCompleteHandler = createWebSocketCreateObjectCompleteHandler(_izContext, flowSchema, saveFilePath);
 
       // const webSocketCreateObjectStordCache = createWebSocketCreateObjectStoredCache(_izContext, saveFilePath);
       const webSocketGenerateCodeLibs = createWebSocketGenerateCodeLibs(_izContext, saveFilePath)
 
-      const getPreSignUrlFunctionYaml = createGetPreSignUrlFunctionYaml(_izContext, saveFilePath);
-      const getPreSignUrlHandler = createGetPreSignUrlHandler(_izContext, saveFilePath);
-      const getPreSignUrlMainFunction = createGetPreSignUrlMainFunction(_izContext, saveFilePath);
-      const getPreSignUrlQueue = createGetPreSignUrlQueueName(_izContext, saveFilePath);
+      const getPreSignUrlFunctionYaml = createReservedLimitFunctionYaml(_izContext, flowSchema, saveFilePath);
+      const getPreSignUrlHandler = createReservedLimitlHandler(_izContext, flowSchema, saveFilePath);
+      const getPreSignUrlMainFunction = createReservedLimitMainFunction(_izContext, flowSchema, saveFilePath);
+      const getPreSignUrlQueue = createReservedLimitQueueName(_izContext, saveFilePath);
 
-      const reservedLimitCompleteFunctionYaml = createReservedLimitFunctionYaml(_izContext, saveFilePath);
-      const reservedLimitCompleteMainFunction = createReservedLimitMainFunction(_izContext, flowSchema, saveFilePath);
-      const reservedLimitCompleteHandler = createReservedLimitHandler(_izContext, saveFilePath);
-      const reservedLimitCompleteQueue = createReservedLimitQueueName(_izContext, saveFilePath);
+      const reservedLimitCompleteFunctionYaml = createPresignUrlFunctionYaml(_izContext, flowSchema, saveFilePath);
+      const reservedLimitCompleteMainFunction = createPresignUrlMainFunction(_izContext, flowSchema, saveFilePath);
+      const reservedLimitCompleteHandler = createPresignUrlHandler(_izContext, flowSchema, saveFilePath);
+      const reservedLimitCompleteQueue = createPresignUrlQueueName(_izContext, saveFilePath);
 
       const processAfterUploadFunctionYmlS3 = createProcessAfterUploadS3FunctionYmlS3(_izContext, flowSchema, saveFilePath);
       // const processAfterUploadFunctionYamlHdrDsq = createProcessAfterUploadS3FunctionYmlDsq(_izContext, saveFilePath);
       const processAfterUploadSqs = createProcessAfterUploadS3Queue(_izContext, saveFilePath);
-      const processAfterUploadHandlerS3 = createProcessAfterUploadS3HandlerS3(_izContext, saveFilePath);
+      const processAfterUploadHandlerS3 = createProcessAfterUploadS3HandlerS3(_izContext, flowSchema, saveFilePath);
       // const processAfterUploadHandlerDsq = createProcessAfterUploadS3HandlerDsq(_izContext, saveFilePath);
-      const processAfterUploadMainFunction = createProcessAfterUploadS3MainFunction(_izContext, saveFilePath);
+      const processAfterUploadMainFunction = createProcessAfterUploadS3MainFunction(_izContext, flowSchema, saveFilePath);
 
-      const confirmReservedAfterUploadFunctionYaml = createConfirmAfterUploadS3FunctionYaml(_izContext, saveFilePath);
-      const confirmReservedAfterUploadHandler = createConfirmAfterUploadS3Handler(_izContext, saveFilePath);
-      const confirmReservedAfterUploadMainFunction = createConfirmAfterUploadS3MainFunction(_izContext, saveFilePath);
+      const confirmReservedAfterUploadFunctionYaml = createConfirmAfterUploadS3FunctionYaml(_izContext, flowSchema, saveFilePath);
+      const confirmReservedAfterUploadHandler = createConfirmAfterUploadS3Handler(_izContext, flowSchema, saveFilePath);
+      const confirmReservedAfterUploadMainFunction = createConfirmAfterUploadS3MainFunction(_izContext, flowSchema, saveFilePath);
       const confirmReservedAfterUploadQueue = createConfirmAfterUploadS3Queue(_izContext, saveFilePath);
 
       // Group related resources for better organization
@@ -175,34 +183,49 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
         ...confirmReservedAfterUploadQueue
       ];
 
-      if (flowSchema.hasOwnProperty("uploadS3") && flowSchema.uploadS3 === true) {
-        // Group all resources related to S3 upload functionality
-        const webSocketUploadS3Resources = [
-          ...webSocketFunctions,
-          ...webSocketGenerateCodeLibs,
-          ...reservedDataTable
-        ];
-
-        // Add all resources to the parameters array
-        createSourceParams.push(
-          ...webSocketUploadS3Resources,
-          ...getPreSignUrlResources,
-          ...reservedLimitResources,
-          ...bucketS3,
-          ...processAfterUploadResources,
-          ...confirmAfterUploadResources
-        );
-      }
+      // Group all resources related to S3 upload functionality
+      const webSocketUploadS3Resources = [
+        ...webSocketFunctions,
+        ...webSocketGenerateCodeLibs,
+        ...reservedDataTable
+      ];
 
-      if (flowSchema.hasOwnProperty("initializeRequest") && flowSchema.hasOwnProperty("response")) {
-        const webSocketEndpointResource = []
-        createSourceParams.push(...webSocketEndpointResource)
+      const flowSchemaOwnTopicFunctionYaml = createFlowSchemaOwnTopicFunctionYaml(_izContext, flowSchema, saveFilePath);
+      const flowSchemaOwnTopicHandler = createFlowSchemaOwnTopicHandler(_izContext, flowSchema, saveFilePath);
+      const flowSchemaOwnTopicMainFunction = createFlowSchemaOwnTopicMainFunction(_izContext, flowSchema, saveFilePath);
+
+      const flowSchemaOwnTopicComponent = [...flowSchemaOwnTopicFunctionYaml, ...flowSchemaOwnTopicHandler, ...flowSchemaOwnTopicMainFunction];
+
+      const flowSchemaOwnTopicCompleteFunctionYaml = createFlowSchemaOwnTopicCompleteFunctionYaml(_izContext, flowSchema, saveFilePath);
+      const flowSchemaOwnTopicCompleteHandler = createFlowSchemaOwnTopicCompleteHandler(_izContext, flowSchema, saveFilePath);
+      const flowSchemaOwnTopicCompleteMainFunction = createFlowSchemaOwnTopicCompleteMainFunction(_izContext, flowSchema, saveFilePath);
+
+      const flowSchemaOwnTopicCompleteComponent = [...flowSchemaOwnTopicCompleteFunctionYaml, ...flowSchemaOwnTopicCompleteHandler, ...flowSchemaOwnTopicCompleteMainFunction]
+      for (const event of flowSchema.event) {
+        if (event.includes("s3")) {
+          // Add all resources to the parameters array
+          createSourceParams.push(
+            ...webSocketUploadS3Resources,
+            ...getPreSignUrlResources,
+            ...reservedLimitResources,
+            ...bucketS3,
+            ...processAfterUploadResources,
+            ...confirmAfterUploadResources
+          );
+        }
+
+        if (event.includes("ownTopic")) {
+          createSourceParams.push(
+            ...flowSchemaOwnTopicComponent,
+            ...flowSchemaOwnTopicCompleteComponent
+          )
+        }
       }
     }
-
+    console.log("createSourceParams in flowSchemas", createSourceParams)
     return createSourceParams;
   } catch (error) {
-    _izContext.logger.error('Error generating code with template perActionComplete:', error);
+    _izContext.logger.error('Error generating code with template flowSchema:', error);
     return [];
   }
 }

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

@@ -14,7 +14,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const { SOURCE_GENERATE_IAM_ROLE, SOURCE_PATH, SAVE_FILE_NAME } = require('../../../MainLibs/index').consts;
+const { SOURCE_GENERATE_IAM_ROLE, SOURCE_PATH, SAVE_FILE_NAME } = require('../../../MainLibs/src/Consts');
 const { firstLetterUpperCase: upperCase } = require("../../../MainLibs/index").utils;
 const path = require('path');
 
@@ -106,6 +106,14 @@ const createSharedResource = (_izContext, createSourceParams, srcPath) => {
       handlerType: [],
       resources: {}
     },
+    [SOURCE_GENERATE_IAM_ROLE.perActionEndpoint]: {
+      handlerType: [],
+      resources: {}
+    },
+    [SOURCE_GENERATE_IAM_ROLE.FlowSchemaOwnTopic]: {
+      handlerType: [],
+      resources: {}
+    },
     Other: []
   };
   const objectTypeList = [];
@@ -187,6 +195,18 @@ const createSharedResource = (_izContext, createSourceParams, srcPath) => {
         templateData.additionalResourcePermission,
         groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role].resources
       )
+    } else if (templateData.roleName.includes(SOURCE_GENERATE_IAM_ROLE.perActionEndpoint)) {
+      groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.perActionEndpoint].handlerType.push(templateData);
+      processResourcePermissions(
+        templateData.additionalResourcePermission,
+        groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.perActionEndpoint].resources
+      )
+    } else if (templateData.roleName.includes(SOURCE_GENERATE_IAM_ROLE.FlowSchemaOwnTopic)) {
+      groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.FlowSchemaOwnTopic].handlerType.push(templateData);
+      processResourcePermissions(
+        templateData.additionalResourcePermission,
+        groupedByObjectType[SOURCE_GENERATE_IAM_ROLE.FlowSchemaOwnTopic].resources
+      )
     }
     else {
       // Handle other items

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

@@ -113,50 +113,41 @@ module.exports.createObjectComplete = async (
     );
     _izContext.logger.debug("record awaitingSteps::", recordAwaitingSteps);
 
-    nextAwaitingAteps:
-    for (let listRecordAwaitingStep of recordAwaitingSteps.Items) {
-
-      _izContext.logger.debug("iterate RecordAwaitingStep:", listRecordAwaitingStep);
-
-
-      if (!await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
-        _izContext,
-        listRecordAwaitingStep.pendingStepId,
-        awaitingStepId
-      )) {
-        _izContext.logger.debug("!Waiting record form other graph::")
-        // **** add step of remove awaitingMultiplestep!! ??
-        continue nextAwaitingAteps
-      };
-
-      await asyncFlowSharedLib.removeAwaitingMultipleStep(
-        _izContext,
-        awaitingStepId,
-        listRecordAwaitingStep.pendingStepId,
-      );
-      _izContext.logger.debug("Remove awaitingStep finish")
-    };
-
-    // seagame: problem about lambdaComplete is will missing errorsFound from request if have 2 request
-    // one send with errorsFound and one send without errorsFound
-    // this scenario can complete with or without errorsFound
-    let messageObject = {
-      objType: returnValue.objType,
-      objInstanceFull: returnValue.objInstanceFull,
-      errorsFound: errorsFound
-    };
-
-    messageObject = callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(passBackProperties, messageObject)
-    let messageAttributes = callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(passBackProperties, {})
-
-    let sendMessageOutCreateObjectComplete = {
-      Message: JSON.stringify(messageObject),
-      MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-      TopicArn: await snsSharedLib.snsTopicArn(_izContext, "OutCreateObjectComplete")
-    };
-    _izContext.logger.debug("Send message to OutCreateObjectComplete :::>", sendMessageOutCreateObjectComplete)
-    await sns.publishAsync(_izContext, sendMessageOutCreateObjectComplete);
-
+    await Promise.all(
+      recordAwaitingSteps.Items.map(async ({ pendingStepId }) => {
+        if (await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
+          _izContext,
+          pendingStepId,
+          awaitingStepId
+        )) {
+          _izContext.logger.debug("finish all awaitingStep");
+
+          let messageObject = {
+            objType: {
+              objectType: returnValue.objType.objectType,
+              serviceTag: returnValue.objType.serviceTag
+            },
+            objInstanceFull: {
+              identifiers: returnValue.objInstanceFull.identifiers,
+              fields: returnValue.objInstanceFull.fields
+            },
+            status: status,
+            errorsFound: errorsFound
+          }
+
+          messageObject = callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(passBackProperties, messageObject)
+          let messageAttributes = callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(passBackProperties, {})
+
+          let sendMessageOutCreateObjectComplete = {
+            Message: JSON.stringify(messageObject),
+            MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
+            TopicArn: await snsSharedLib.snsTopicArn(_izContext, "OutCreateObjectComplete")
+          };
+          _izContext.logger.debug("Send message to OutCreateObjectComplete :::>", sendMessageOutCreateObjectComplete)
+          await sns.publishAsync(_izContext, sendMessageOutCreateObjectComplete);
+        }
+      })
+    )
     return {
       returnValue: returnValue,
       status: status,

package/src/reStructure/TemplateData/perActionComplete/create/sns-out/template.ejs

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

package/src/reStructure/TemplateData/perActionComplete/create/yaml/data.js

@@ -45,7 +45,7 @@ const { getGraphServiceNameFromGraphServerTagWithCache, getServiceNameWithCache
 const {
   firstLetterLowerCase: lowerCase,
   firstLetterUpperCase: upperCase
-} = require("../../../../../MainLibs/index.js").utils;
+} = require("../../../../../MainLibs/src/Utils.js");
 const {
   DEFAULT_HANDLER_PER_ACTION,
   createIamRole,
@@ -65,7 +65,7 @@ const {
   awaitingMultipleStepsRole,
   SHORT_FUNCTION_NAME,
   SOURCE_GENERATE_IAM_ROLE
-} = require("../../../../../MainLibs/index.js").consts;
+} = require("../../../../../MainLibs/src/Consts.js");
 
 const templatePath = path.join(__dirname, './template.ejs');
 
@@ -98,8 +98,8 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName)),
         resourceNames(RESOURCE_CLASSES.sqs, upperCase(functionName) + "DLQ"),
-        resourceNames(RESOURCE_CLASSES.sns, "In" + upperCase(functionName)),
-        resourceNames(RESOURCE_CLASSES.sns, "Out" + upperCase(functionName)),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out")
       ]
     )
   )
@@ -123,7 +123,6 @@ function createFunctionYamlOutUpdateComplete(_izContext, srcPath) {
       fileExtension: '.yml',
       isAppend: true
     }
-
   }
 }