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

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

@@ -34,6 +34,7 @@ const utils = require('@izara_project/izara-market-library-service-schemas/src/M
 const NoRetryError = require('@izara_project/izara-core-library-core').NoRetryError
 const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
 const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
+const { postToConnection } = require('../../../libs/source/GenerateCodeLibs')
 
 /**
  *
@@ -50,7 +51,7 @@ const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-librar
  * @returns {object} description of return value
  */
 
-module.exports.flowSchemaOwnTopic = async (
+module.exports.<%- functionName %> = async (
   _izContext,
   requestParams,
   callingFlowConfig = {},
@@ -59,9 +60,9 @@ module.exports.flowSchemaOwnTopic = async (
 ) => {
 
   try {
-    _izContext.logger.debug("WebSocketInvoke _izContext", _izContext)
-    _izContext.logger.debug("WebSocketInvoke requestParams", requestParams)
-    _izContext.logger.debug("WebSocketInvoke callingFlowConfig", callingFlowConfig)
+    _izContext.logger.debug("<%- functionName %> _izContext", _izContext)
+    _izContext.logger.debug("<%- functionName %> requestParams", requestParams)
+    _izContext.logger.debug("<%- functionName %> callingFlowConfig", callingFlowConfig)
 
     let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
       flowTag: requestParams.action,
@@ -70,14 +71,19 @@ module.exports.flowSchemaOwnTopic = async (
 
     _izContext.logger.debug("flowSchema", flowSchema)
 
+    let connectionId = _izContext.correlationIds.get(coreConsts.CONNECTION_ID);
 
     if (!flowSchema) {
-      throw new NoRetryError(`flowTag not found ${requestParams.action}`)
+      await postToConnection({
+        message: {
+          error: `flowTag not found ${requestParams.action}`
+        }
+      },connectionId)
+      throw new NoRetryError(`flowTag not found ${requestParams.action}`);
     }
 
-      let messageObject = {
-        requestParams:requestParams
-      }
+      let messageObject = requestParams
+
       // create callingFlow
       messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
         messageObject,
@@ -89,12 +95,12 @@ module.exports.flowSchemaOwnTopic = async (
         )
       )
 
-      let sendMessageToCreateEndpoint = {
+      let sendMessageToEndpoint = {
         Message: JSON.stringify(messageObject),
         TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "<%- topicArn %>")
       }
-      _izContext.logger.debug("sendMessageToCreateEndpoint", sendMessageToCreateEndpoint);
-      await sns.publishAsync(_izContext, sendMessageToCreateEndpoint);
+      _izContext.logger.debug("sendMessageToEndpoint", sendMessageToEndpoint);
+      await sns.publishAsync(_izContext, sendMessageToEndpoint);
 
   } catch (err) {
     _izContext.logger.error('error WebSocketInvoke: ', err)

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

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

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

@@ -49,9 +49,12 @@ function createDataForSnsOut(_izContext, flowSchema, srcPath) {
 
   //  GCTpBasTestInPersonCreate => GCTpBas_Test_PersonCreate_In
   let flowSteps = Object.keys(flowSchema.flowSteps)
+  let flowStepsOut = flowSteps[0];
+  let splitFlowStepsIn = flowStepsOut.split("_");
+  let topicOut = splitFlowStepsIn[3]
   const generatedSnsTopicOutForFlowSchema = [
     {
-      queueName: upperCase(flowSteps[1].split("_")[0])
+      queueName: upperCase(topicOut)
     }
   ];
 

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

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

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

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

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

@@ -24,6 +24,7 @@
                   - s3:PutObject
                   - s3:GetObject
                   - s3:ListBucket
+                  - s3:DeleteObject
                 Resource:
                   - arn:aws:s3:::object-schema/*
                   - arn:aws:s3:::object-schema/perServiceSchemas/${self:custom.iz_serviceTag}/*
@@ -54,5 +55,7 @@
                 Resource:<% statement.Resource.forEach(function(resource) { %>
                   - <%= resource -%><% }); %><% } else { %>
                 Resource: <%= statement.Resource %><% } %><% }); %>
+                #<#<%- role.roleName %>AdditionalRole#>
+                #<#/<%- role.roleName %>AdditionalRole#>
   <% }); %>
 <% } %>

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

@@ -27,6 +27,8 @@ const PREFIX = {
   CREATE_OBJECT_ASYNC: "createObjectAsync",
   CREATE_OBJECT_ASYNC_COMPLETE: "createObjectAsyncComplete"
 }
+//(<optionalRequire>)
+//(</optionalRequire>)
 
 /**
  *
@@ -36,14 +38,8 @@ const PREFIX = {
  * @param {*} errorsFounds
  * @param {*} graphServiceTag
  * @param {*} passBackProperties
-    returnValue = {
-      queryResult: returnCreateNode,
-      objType,
-      objInstance,
-      relationships,
-      settings
-    }
- */
+*/
+
 module.exports.createObjectComplete = async (
   _izContext,
   returnValue,
@@ -145,9 +141,14 @@ module.exports.createObjectComplete = async (
           };
           _izContext.logger.debug("Send message to OutCreateObjectComplete :::>", sendMessageOutCreateObjectComplete)
           await sns.publishAsync(_izContext, sendMessageOutCreateObjectComplete);
+
+          //(<afterSendMessage>)
+          //(</afterSendMessage>)
         }
       })
     )
+    //(<beforeReturn>)
+    //(</beforeReturn>)
     return {
       returnValue: returnValue,
       status: status,

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

@@ -27,7 +27,8 @@ const sns = require("@izara_project/izara-core-library-external-request").sns;
 const NoRetryError = require("@izara_project/izara-core-library-core/src/NoRetryError");
 
 const { explodedObjectTypeId, explodedRelationshipTypeId, createLinkTypeId } = require('@izara_project/izara-core-library-service-schemas/src/Utils');
-
+//(<optionalRequire>)
+//(</optionalRequire>)
 const {
   TOPIC_NAME_GENERATE_CODE,
   TOPIC_NAME_GRAPH_HANDLER,
@@ -77,6 +78,9 @@ module.exports.deleteNodeComplete = async (
     _izContext.logger.debug("Send Message to DeleteNodeComplete::", sendMessageToOutUpdateNodeComplete);
     await sns.publishAsync(_izContext, sendMessageToOutUpdateNodeComplete)
 
+    //(<beforeReturn>)
+    //(</beforeReturn>)
+
     return {
       objType: returnValue.objType,
       objInstanceFull: returnValue.objInstanceFull,

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

@@ -33,7 +33,8 @@ const {
   TOPIC_NAME_GRAPH_HANDLER,
   PREFIX
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
-
+//(<optionalRequire>)
+//(</optionalRequire>)
 module.exports.updateNodeComplete = async (
   _izContext,
   returnValue,

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

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

package/src/reStructure/TemplateData/{propertyNodeSchema → propertyValueSchema}/generateTemplateData.js

@@ -18,13 +18,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 
 // Import required modules
-console.log("generate main PropertySchema");
+console.log("generate main PropertyValue Schema");
 const { join } = require('path');
 
 
 const modules = {
-  objectPropertyNodeSchema: require('@izara_project/izara-market-library-service-schemas/src/reStructure/TemplateData/propertyNodeSchema/objectPropertyNodeSchema/data'),
-  relationshipPropertyNodeSchema: require('@izara_project/izara-market-library-service-schemas/src/reStructure/TemplateData/propertyNodeSchema/relationshipPropertyNodeSchema/data')
+  objectPropertyNodeSchema: require('./objectPropertyValueSchema/data'),
+  relationshipPropertyNodeSchema: require('./relationshipPropertyValueSchema/data')
 };
 /**
  * Generates code with templates for different actions
@@ -37,7 +37,7 @@ async function generateCodeWithTemplate(_izContext, objSchemaPath, settings) {
     let allCreateSource = [];
     const srcPath = join(objSchemaPath, '../');
 
-    if (settings.generateName === "propertyNode") {
+    if (settings.generateName === "propertyValue") {
       let objSchemaPropertyNode = await modules.objectPropertyNodeSchema(
         _izContext,
         settings,

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

@@ -0,0 +1,131 @@
+/*
+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';
+
+console.log("=== property value schema ===");
+
+const path = require('path');
+const fs = require('fs');
+const {
+  SOURCE_PATH,
+  fieldNameSetting,
+  FIELD_NAME_TPYE,
+  PROPERTYVALUE_TAG,
+  SAVE_FILE_NAME
+} = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Consts');
+
+const templatePath = path.join(__dirname, "./templateObjectPropertyValueSchema.ejs");
+
+const modules = {
+  validateAddOnDataStructure: require('../../../libs/ValidateAddOnDataStructure')
+};
+const yaml = require("yaml")
+const objectschemaLocalByPath = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema')
+const Consts = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Consts')
+// const objectSchemasBySrc = srcPath
+
+
+async function data(_izContext, settings, srcPath) {
+
+  let objectSchema = await objectschemaLocalByPath.getObjSchemaS3(
+    _izContext,
+    settings.objType
+  );
+  _izContext.logger.debug("objectSchema objectSchema::", objectSchema)
+
+  if (!objectSchema) {
+    throw Error(`Invalid objType:${objTypeString(objType)}, cannot generate attribute tree schema cause objectSchema is not exists`)
+  };
+
+  let propertyValueObjectSchemas = [];
+  let createSources = [];
+
+  let objectType = settings.objType.objectType;
+  // validate only addOnndataStructure is type propertyNode.
+
+  if (!objectSchema.hasOwnProperty("addOnDataStructure") || !Array.isArray(objectSchema.addOnDataStructure) || !objectSchema.addOnDataStructure.length) {
+    console.log(`Not have data in addOnDataStructure in objectType:${objectType}`);
+    throw Error(`Not have data in addOnDataStructure in objectType:${objectType}`)
+
+  };
+
+  const storageResources = objectSchema.storageResources; // storageResource from main objectType
+  const storageResourceTag = Object.keys(storageResources); // storage ResourceTag from main objectType
+  const compositeKeyDeliminator = objectSchema.compositeKeyDeliminator;
+
+  propertyValueObjectSchemas.push(
+    { // {subject}property
+      objectType: objectType + PROPERTYVALUE_TAG.property,
+      fieldNames: {
+        [objectType + PROPERTYVALUE_TAG.property + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.randomOnCreateFieldName),
+      },
+      identifiers: [
+        {
+          type: "identifier",
+          fieldName: objectType + PROPERTYVALUE_TAG.property + "Id"
+        }
+      ]
+    },
+    { // {subject}propertyLabel
+      objectType: objectType + PROPERTYVALUE_TAG.propertyLabel,
+      fieldNames: {
+        [objectType + PROPERTYVALUE_TAG.propertyLabel + "Id"]: fieldNameSetting(FIELD_NAME_TPYE.randomOnCreateFieldName),
+      },
+      identifiers: [
+        {
+          type: "identifier",
+          fieldName: objectType + PROPERTYVALUE_TAG.propertyLabel + "Id"
+        }
+      ]
+    }
+  );
+
+  for (let propertyValueObjectSchema of propertyValueObjectSchemas) {
+    Object.assign(propertyValueObjectSchema, {
+      storageResources: storageResources, // add storageResources
+      compositeKeyDeliminator: compositeKeyDeliminator
+    })
+    for (let attributeTreeFieldName of Object.values(propertyValueObjectSchema.fieldNames)) {
+      Object.assign(attributeTreeFieldName, { storageResourceTags: storageResourceTag }) // add storageResourceTags for each fieldName
+    }
+  };
+  for (const propertyValueObjectSchema of propertyValueObjectSchemas) {
+    createSources.push({
+      templatePath: templatePath,
+      templateData: {
+        fieldNames: JSON.stringify(propertyValueObjectSchema.fieldNames, null, 2),
+        identifiers: JSON.stringify(propertyValueObjectSchema.identifiers, null, 2),
+        objectType: propertyValueObjectSchema.objectType,
+        storageResources: JSON.stringify(propertyValueObjectSchema.storageResources, null, 2),
+        compositeKeyDeliminator: propertyValueObjectSchema.compositeKeyDeliminator
+      },
+      setting: {
+        savePath: path.join(srcPath, SOURCE_PATH.generatedPropertyValue, propertyValueObjectSchema.objectType + "/"),
+        hookPath: path.join(srcPath, "schemaHook", "propertyValue", propertyValueObjectSchema.objectType, "/"),
+        saveFileName: SAVE_FILE_NAME.objectSchema,
+        fileExtension: ".js",
+        isAppend: false
+      }
+    })
+  };
+  return createSources;
+
+};//End loop addOn
+
+
+module.exports = data