@izara_project/izara-market-library-service-schemas 1.0.32 → 1.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {

package/src/GenerateCodeLibs/src/Consts.js

@@ -77,7 +77,8 @@ const TOPIC_NAME_GENERATE_CODE = {
   outGetNodeComplete: "GetNodeComplete_Out",
   reservedLimitComplete: "ReservedLimitComplete",
   createPresignUrl: "CreatePresignUrl",
-  flowSchemaOwnTopicComplete: "FlowSchemaOwnTopicComplete"
+  flowSchemaOwnTopicComplete: "FlowSchemaOwnTopicComplete",
+  flowSchemaOwnTopicEndpointComplete: "flowSchemaOwnTopicEndpointComplete",
 }
 
 const GRAPH_HANDLER_SERVICE_NAME = {

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -1058,6 +1058,19 @@ function createBasicRelationshipsProperties(from, to, storageResources, baseDire
   return relationshipProperties
 }
 
+function createFieldNamesFromRequestParamsByObjectSchema(_izContext, requestParams, objectSchema) {
+  let createFieldNameParams = {};
+  _izContext.logger.debug("createFieldNamesFromRequestParamsByObjectSchema ::", { requestParams, objectSchema })
+  for (const fieldName of Object.keys(objectSchema.fieldNames)) {
+    if (Object.keys(requestParams).includes(fieldName)) {
+      if (!createFieldNameParams.hasOwnProperty(fieldName)) {
+        Object.assign(createFieldNameParams, { [fieldName]: requestParams[fieldName] })
+      }
+    }
+  }
+  return createFieldNameParams
+}
+
 module.exports = {
   sendMsgOutComplete,
   messageToDlq,
@@ -1077,7 +1090,8 @@ module.exports = {
   createDeleteDataDetail,
 
   createFieldForUpdateDynamoDb,
-  createBasicRelationshipsProperties
+  createBasicRelationshipsProperties,
+  createFieldNamesFromRequestParamsByObjectSchema
 }
 
 

package/src/MainLibs/src/Consts.js

@@ -120,6 +120,10 @@ const SOURCE_PATH = {
   resourceLocationWebSocket: "src/generatedCode/FlowSchema/UploadS3/",
   flowSchemaOwnTopic: "../src/generatedCode/FlowSchema/FlowSchemaOwnTopic/",
   resourceLocationFlowSchemaOwnTopic: "src/generatedCode/flowSchemaOwnTopic/",
+  flowSchemaExternalTopic: "../src/generatedCode/FlowSchema/FlowSchemaExternalTopic/",
+  resourceLocationFlowSchemaExternalTopic: "src/generatedCode/flowSchemaExternalTopic/",
+  flowSchemaEventBridge: "../src/generatedCode/FlowSchema/EventBridge/",
+  resourceLocationFlowSchemaEventBridge: "src/generatedCode/FlowSchema/EventBridge/",
   generateCodeLib: "../src/generatedCode/libs/source/",
   logicalFunctionHook: "../src/generatedCode/WebSocket/source/FlowSchemaHook/HookLogicFunction/source/",
   resourceLocationLogicalFunctionHook: "src/generatedCode/WebSocket/source/FlowSchemaHook/HookLogicFunction/source",
@@ -257,6 +261,7 @@ const FUNCTION_NAME = {
   flowSchemaOwnTopic: "flowSchemaOwnTopic",
   flowSchemaOwnTopicComplete: "flowSchemaOwnTopicComplete",
   flowSchemaOwnTopicEndpoint: "flowSchemaOwnTopicEndpoint",
+  flowSchemaOwnTopicEndpointComplete: "flowSchemaOwnTopicEndpointComplete",
   flowSchemaExternalTopic: "externalTopic",
 };
 
@@ -374,9 +379,9 @@ const SOURCE_GENERATE_IAM_ROLE = {
   RelationshipCompleteRole: "RelationshipCom",
   FlowSchemaUploadS3Role: "FlowSchemaUploadS3",
   FlowSchemaOwnTopic: "FlowSchemaOwnTopic",
-  FlowSchemaOwnTopic: "FlowSchemaOwnTopic",
-  perActionEndpoint: "PerActionEndpoint",
+  PerActionEndpoint: "PerActionEndpoint",
   ExternalTopicRole: "ExternalTopic",
+  EventBridge: "EventBridge",
 };
 
 const ADD_ON_DATA_STRUCTURE_TYPE = {

package/src/reStructure/GenerateCode.js

@@ -45,16 +45,17 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
     let localServicePath = join(saveFilePath, "../../");
 
     // // define path for store yml file
-    const GENERATE_CODE_SOURCE_PATH = {
-      appYaml: join(saveFilePath, SOURCE_PATH.appYaml),
-      resourceYaml: join(saveFilePath, SOURCE_PATH.resourceYaml),
-      lambdaPerAction: join(saveFilePath, SOURCE_PATH.lambdaPerAction),
-      externalService: join(saveFilePath, SOURCE_PATH.externalService),
-      relationshipPerAction: join(saveFilePath, SOURCE_PATH.relationshipPerAction),
-      webSocketEndpoint: join(saveFilePath, SOURCE_PATH.webSocket),
-      generateCodeLib: join(saveFilePath, SOURCE_PATH.generateCodeLib),
-      generatedMainFunctionPerService: join(saveFilePath, SOURCE_PATH.endpointPerService),
-    };
+    // const GENERATE_CODE_SOURCE_PATH = {
+    //   appYaml: join(saveFilePath, SOURCE_PATH.appYaml),
+    //   resourceYaml: join(saveFilePath, SOURCE_PATH.resourceYaml),
+    //   lambdaPerAction: join(saveFilePath, SOURCE_PATH.lambdaPerAction),
+    //   externalService: join(saveFilePath, SOURCE_PATH.externalService),
+    //   relationshipPerAction: join(saveFilePath, SOURCE_PATH.relationshipPerAction),
+    //   webSocketEndpoint: join(saveFilePath, SOURCE_PATH.webSocket),
+    //   generateCodeLib: join(saveFilePath, SOURCE_PATH.generateCodeLib),
+    //   generatedMainFunctionPerService: join(saveFilePath, SOURCE_PATH.endpointPerService),
+    //   flowSchema: join(saveFilePath,'../src/generatedCode/flowSchema')
+    // };
 
     //------ Start Create Source ------
 
@@ -108,18 +109,15 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath) {
       if (status === false) {
         throw Error(errors)
       }
-    }
 
-    // validate path before empty folder
-    for (let folderPathToEmpty of Object.values(GENERATE_CODE_SOURCE_PATH)) {
-      validatePathWithRootServicePath(localServicePath, folderPathToEmpty)
-    }
+      // console.log("templatePath in generateCode", setting.savePath)
+      // empty file by savePath
+      // validate path before empty folder
+      validatePathWithRootServicePath(localServicePath, setting.savePath)
 
-    for (let folderPathToEmpty of Object.values(GENERATE_CODE_SOURCE_PATH)) {
-      await deleteFileInDir(folderPathToEmpty);
+      await deleteFileInDir(setting.savePath);
     }
 
-
     // generate all source
     for (let item of allCreateSource) {
       // throw error if item is invalid

package/src/reStructure/TemplateData/EndpointPerService/yaml/data.js

@@ -66,7 +66,7 @@ async function data(_izContext, allObjSchemas, srcPath) {
 }
 
 async function createParamForCreateSource(_izContext, allObjSchemas, action, handler, srcPath) {
-  let groupBy = SOURCE_GENERATE_IAM_ROLE.perActionEndpoint;
+  let groupBy = SOURCE_GENERATE_IAM_ROLE.PerActionEndpoint;
   let additionalResourcePermission = defaultIamRolePerAction();
   let functionNameConfig = upperCase(action) + upperCase(shortNameHandler(handler))
 

package/src/reStructure/TemplateData/externalService/functionNameConfig/data.js

@@ -21,7 +21,7 @@ const path = require('path');
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = require("../../../../MainLibs/index.js").utils;
 const templateYamlPath = path.join(__dirname, "./templateYaml.ejs");
 const templatePathIntTestPath = path.join(__dirname, "./templateIntTesting.ejs");
-const { SOURCE_PATH, SOURCE_GENERATE_IAM_ROLE } = require("../../../../MainLibs/index.js").consts;
+const { SOURCE_PATH, SOURCE_GENERATE_IAM_ROLE } = require("../../../../MainLibs/src/Consts.js");
 
 
 function data(_izContext, createSourceParams, srcPath) {
@@ -50,13 +50,23 @@ function data(_izContext, createSourceParams, srcPath) {
   const roleNameConcatConfigs = new Set();
 
   // Add default IAM roles from configuration
-  Object.entries(SOURCE_GENERATE_IAM_ROLE)
-    .filter(([_, enabled]) => enabled)
-    .forEach(([_, value]) => {
-      if (value === SOURCE_GENERATE_IAM_ROLE.NodeCompleteRole) return;
-      roleNameConfigs.add(`${upperCase(value)}Role`);
-      roleNameConcatConfigs.add(`${upperCase(value)}`);
-    });
+  // Object.entries(SOURCE_GENERATE_IAM_ROLE)
+  //   .filter(([_, enabled]) => enabled)
+  //   .forEach(([_, value]) => {
+  //     if (value === SOURCE_GENERATE_IAM_ROLE.NodeCompleteRole) return;
+  //     roleNameConfigs.add(`${upperCase(value)}Role`);
+  //     roleNameConcatConfigs.add(`${upperCase(value)}`);
+  //   });
+  for (const data of createSourceParams) {
+    let roleName = data.templateData?.roleName
+    if (roleName) {
+      if (roleName === SOURCE_GENERATE_IAM_ROLE.NodeCompleteRole) {
+        return
+      }
+      roleNameConfigs.add(`${upperCase(roleName)}Role`);
+      roleNameConcatConfigs.add(`${upperCase(roleName)}`);
+    }
+  }
 
   // Extract role names from templateData in createSourceParams
   createSourceParams.forEach(({ templateData }) => {

package/src/reStructure/TemplateData/externalService/lambdaRole/data.js

@@ -131,7 +131,7 @@ async function externalLambdaIamRoleDataPerAction(_izContext, allObjSchemas) {
 
 
   return {
-    objectType: SOURCE_GENERATE_IAM_ROLE.perActionEndpoint,
+    objectType: SOURCE_GENERATE_IAM_ROLE.PerActionEndpoint,
     additionalResourcePermission
   }
 }

package/src/reStructure/TemplateData/externalService/snsTopicSubscriptions/data.js

@@ -99,10 +99,10 @@ const createExternalSnsSubscriptions = async (_izContext, allObjSchemas, allRelS
 
 // update Relationship
 async function snsSubScriptionUpdateRelationshipComplete(_izContext, allRelSchemas) {
-  let serviceNames = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas)
+  let serviceTag = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas)
 
   return {
-    serviceNames: serviceNames,
+    serviceTag: serviceTag,
     topicName: TOPIC_NAME_GRAPH_HANDLER.outUpdateRel, // external service
     sqsEndpoint: TOPIC_NAME_GENERATE_CODE.updateRelComplete // in service
   }
@@ -110,10 +110,10 @@ async function snsSubScriptionUpdateRelationshipComplete(_izContext, allRelSchem
 
 // create Relationship
 async function snsSubscriptionCreateRelationshipComplete(_izContext, allRelSchemas) {
-  let serviceNames = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas)
+  let serviceTag = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas)
 
   return {
-    serviceNames: serviceNames,
+    serviceTag: serviceTag,
     topicName: TOPIC_NAME_GRAPH_HANDLER.outCreateRel,
     sqsEndpoint: TOPIC_NAME_GENERATE_CODE.createRelComplete
   }
@@ -122,20 +122,20 @@ async function snsSubscriptionCreateRelationshipComplete(_izContext, allRelSchem
 // topic not create yet will return error when initialSetup
 // create topic for OutUpdateNodeComplete
 async function snsSubscriptionOutUpdateNodeComplete(_izContext, allObjSchemas) {
-  let serviceNames = await getGraphServiceNameFromObjectSchema(_izContext, allObjSchemas)
+  let serviceTag = await getGraphServiceNameFromObjectSchema(_izContext, allObjSchemas)
 
   return {
-    serviceNames: serviceNames,
+    serviceTag: serviceTag,
     topicName: TOPIC_NAME_GRAPH_HANDLER.outUpdateNode,
     sqsEndpoint: TOPIC_NAME_GENERATE_CODE.updateNodeComplete
   }
 }
 
 async function snsSubscriptionCreateNodeComplete(_izContext, allObjectSchemas) {
-  let serviceNames = await getGraphServiceNameFromObjectSchema(_izContext, allObjectSchemas)
+  let serviceTag = await getGraphServiceNameFromObjectSchema(_izContext, allObjectSchemas)
 
   return {
-    serviceNames: serviceNames,
+    serviceTag: serviceTag,
     topicName: TOPIC_NAME_GRAPH_HANDLER.outCreateNode,
     sqsEndpoint: TOPIC_NAME_GENERATE_CODE.createNodeComplete
   }
@@ -152,19 +152,19 @@ async function snsSubscriptionDeleteNodeComplate(_izContext, allObjectSchemas) {
 }
 
 async function snsSubscriptionDeleteRelatipnshipComplete(_izContext, allRelSchemas) {
-  let serviceNames = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas)
+  let serviceTag = await getGraphServiceNameFromAllRelSchema(_izContext, allRelSchemas)
 
   return {
-    serviceNames: serviceNames,
+    serviceTag: serviceTag,
     topicName: TOPIC_NAME_GRAPH_HANDLER.outDeleteRel,
     sqsEndpoint: TOPIC_NAME_GENERATE_CODE.deleteRelComplete
   }
 }
 
 function snsSubscriptionReservedLimitCompleteForReservedDynamicUsage(_izContext) {
-  let serviceNames = [EXTERNAL_SERVICE_NAME.accountLimits]
+  let serviceTag = [EXTERNAL_SERVICE_NAME.accountLimits]
   return {
-    serviceNames: serviceNames,
+    serviceTag: serviceTag,
     topicName: TOPIC_NAME_EXTERNAL_SERVICE.reservedDynamicUsageComplete,
     sqsEndpoint: TOPIC_NAME_GENERATE_CODE.createPresignUrl + upperCase(HANDLER.hdrSqs)
   }
@@ -172,9 +172,9 @@ function snsSubscriptionReservedLimitCompleteForReservedDynamicUsage(_izContext)
 
 
 function snsSubscriptionConfirmReserved(_izContext) {
-  let serviceNames = [EXTERNAL_SERVICE_NAME.accountLimits];
+  let serviceTag = [EXTERNAL_SERVICE_NAME.accountLimits];
   return {
-    serviceNames: serviceNames,
+    serviceTag: serviceTag,
     topicName: TOPIC_NAME_EXTERNAL_SERVICE.reservedDynamicUsageComplete,
     sqsEndpoint: "ConfirmNewReserved" + upperCase(HANDLER.hdrSqs)
   }
@@ -189,7 +189,7 @@ function snsSubscriptionFlowSchemaExternalTopic(_izContext, localFlowSchema) {
     const splitFlowStepKey = flowStep.split("_");
 
     return {
-      serviceNames: [splitFlowStepKey[0]],
+      serviceTag: [splitFlowStepKey[0]],
       topicName: splitFlowStepKey[2],
       sqsEndpoint: splitFlowStepKey[3]
     };

package/src/reStructure/TemplateData/externalService/snsTopicSubscriptions/template.ejs

@@ -18,9 +18,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 
 module.exports.generatedSnsTopicSubscription = [ <% datas.forEach(data => { -%>
-<% data.serviceNames.forEach(serviceName => { _%>
+<% data.serviceTag.forEach(serviceTag => { _%>
   {
-    serviceName: "<%- serviceName %>",
+    serviceTag: "<%- serviceTag %>",
     topicName: "<%- data.topicName %>",
     sqsEndpoint: "<%- data.sqsEndpoint %>"
   },

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

@@ -3,10 +3,6 @@
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   events:
-    - websocket:
-        route: $connect
-    - websocket:
-        route: $disconnect
     - websocket:
         route: $default
     - websocket:

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

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

package/src/reStructure/TemplateData/flowSchema/components/websocket/connect/functionYaml/data.js

@@ -52,6 +52,16 @@ function createWebSocketConnectYaml(_izContext, srcPath) {
       [
         resourceNames(RESOURCE_CLASSES.dynamoDbTable, "WebSocketTask")
       ]
+    ),
+    createIamRole(
+      {
+        "execute-api": [
+          "ManageConnections"
+        ]
+      },
+      [
+        resourceNames(RESOURCE_CLASSES.webSocket)
+      ]
     )
   )
 
@@ -61,7 +71,7 @@ function createWebSocketConnectYaml(_izContext, srcPath) {
       functionName,
       resourceLocation: "src/generatedCode/FlowSchema/WebSocketConnect/source/",
       additionalResourcePermission,
-      roleName: SOURCE_GENERATE_IAM_ROLE.FlowSchemaUploadS3Role
+      roleName: "WebsocketConnect"
 
     },
     setting: {

package/src/reStructure/TemplateData/flowSchema/components/websocket/connect/functionYaml/template.ejs

@@ -9,20 +9,7 @@
         route: $disconnect
     - websocket:
         route: $default
-  iamRoleStatements:
-    <%_ additionalResourcePermission.forEach(resourcePermission => { _%>
-    - Effect: <%- resourcePermission.effect %>
-      Action:
-        <%_ Object.keys(resourcePermission.action).forEach(resourcePerAction => { _%>
-        <%_ resourcePermission.action[resourcePerAction].forEach(permission => { _%>
-        - <%- resourcePerAction %>:<%- permission %>
-        <%_ }) _%>
-        <%_ }) _%>
-      Resource:
-        <%_ resourcePermission.resource.forEach(resource => { _%>
-        - "<%- resource %>"
-        <%_ }) _%>
-        <%_}) _%>
+  role: WebsocketConnectRole
 #<#<WebSocketConnectIamRole#>
 #<#/<WebSocketConnectIamRole#>
 

package/src/reStructure/TemplateData/flowSchema/createRecordByStatusType/statusFieldTemplate.ejs

@@ -0,0 +1,14 @@
+// getObjectSchema
+let objectSchema = await getObjectSchema.getObjSchemaS3WithCache(_izContext, flowSchema.objType)
+
+// create record
+let fieldNames = createFieldNamesFromRequestParamsByObjectSchema(_izContext, requestParams, objectSchema)
+
+
+let sendMessageToCreateEndpoint = {
+  Message: JSON.stringify({fieldNames: fieldNames}),
+  topicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "Create_In")
+};
+
+_izContext.logger.debug("before sendMessageToCreateEndpoint:: ", sendMessageToCreateEndpoint);
+await sns.publishAsync(_izContext, sendMessageToCreateEndpoint);

package/src/reStructure/TemplateData/flowSchema/createRecordByStatusType/storedCacheTemplate.ejs

@@ -0,0 +1,17 @@
+// create storedCache
+function createExpiryTime (_izContext, expiryInterval) {
+  const currentTime = new Date();
+  const expiryTime = new Date(currentTime);
+  expiryTime.setTime(expiryTime.getTime() + expiryInterval);
+  return expiryTime.getTime();
+};
+
+await dynamodbSharedLib.putItem(_izContext,
+  await dynamodbSharedLib.tableName(_izContext, "<%- flowTag %>Main"),
+  {
+    <%- flowTag %>Id: hash(requestParams),
+    cacheExpiryTime: createExpiryTime(_izContext, 31536000000),
+    cacheStatus: "processing",
+    cacheUniqueRequestId: _izContext.uniqueRequestId
+  }
+)

package/src/reStructure/TemplateData/flowSchema/dynamoDb/data.js

@@ -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 path = require("path")
+
+
+// const {
+//   HANDLER,
+// STORAGE_TYPES
+// } = require('@izara_project/izara-core-library-service-schemas/src/Consts');
+
+const STORAGE_TYPES = {
+  dynamoDB: "dynamoDB",
+  graph: "graph"
+}
+const templatePath = path.join(__dirname, '../../resourceYaml/dynamodb/template.ejs')
+const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../../../MainLibs/src/Consts.js')
+
+/**
+ * create param of crateSouce for FindData And processLogical
+ *
+ * @param {Object} _izContext
+ * @param {String} srcPath
+ * @returns {Object[]}
+ */
+const createAwaitingMultipleStepDynamoDbData = (_izContext, flowSchema, srcPath) => {
+
+  let resultsForCreateSource = [];
+  const defaultDynamoDataLists = [];
+
+  if (flowSchema.statusType === "storedCache") {
+    defaultDynamoDataLists.push(
+      {
+        tableName: flowSchema.flowTag + "Main",
+        resourceName: flowSchema.flowTag + "Main",
+        attributes: [
+          {
+            keyType: "partitionKey",
+            AttributeName: flowSchema.flowTag + "Id",
+            AttributeType: "S"
+          }
+        ]
+      }
+    )
+  }
+
+  for (let defaultDynamoData of defaultDynamoDataLists) {
+    resultsForCreateSource.push({
+      templatePath: templatePath,
+      templateData: defaultDynamoData,
+      setting: {
+        initialData: 'Resources:\n',
+        savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
+        saveFileName: SAVE_FILE_NAME.dynamoDbYaml,
+        fileExtension: '.yml',
+        isAppend: true
+      }
+    });
+  }
+  // console.log("resultsForCreateSource default dynamo", resultsForCreateSource)
+
+  return resultsForCreateSource;
+}
+
+module.exports = createAwaitingMultipleStepDynamoDbData