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

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

@@ -31,7 +31,7 @@ const serviceConfigLib = require('@izara_project/izara-core-library-service-sche
 
 const uploadUseCase = require('@izara_project/izara-core-library-service-schemas/src/libs/UploadUseCase')
 
-const hash = require("object-hash")
+const hash = require('@izara_project/izara-shared-core').objectHash;
 const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
 const path = require('path')
 const schemasPath = path.join(__dirname, '../schemas');
@@ -62,22 +62,11 @@ const { createDataDetailsLib } = require('@izara_project/izara-market-library-se
 const { createLinkTypeId, createObjType } = require('@izara_project/izara-core-library-service-schemas/src/Utils');
 const { findLinksByObjTypes } = require("@izara_project/izara-core-library-service-schemas/src/libs/RelSchemaLib")
 const lodash = require("lodash")
+const { createRelTypeConcat } = require('@izara_project/izara-core-library-service-schemas').utils
+const createNodeLib = require('@izara_project/izara-core-library-service-schemas').createNodeLib
+//(<optionalRequire>)
+//(</optionalRequire>)
 
-/**
-  - all storageType( DB and Graph) use objInstance({identifiers,fields})
-  - storageType[DB] async
-  - storageType[Graph] sync (should be have lambda complete)
-  -- before DB and Graph have boolend check (allStorageTagComplete = true) if storageType == graph set allStorageTagComplete = false,
-      and save awaitingMultiplastep prefix(serviceTag_CreateObject{identifierId})
-
-  >>> in lambdaComplete resive message from GrapHandler
-  1.1 check have returnValue.errorsFould.length > 0
-  -- Delete all awitingMultiplestep and senf message to callingFlow have errorFound.
-  1.2 check awaitingmultipleStepall finish
-  -- Delete awaitingStep in come if have other multiplestep(not finish)== not send message.
-  --- if check awaitingmultipleStepall finish not have record  ===> sendmessage to callingFlow.
- */
-//=========================================================================================
 /**
  *
  * @param {*} _izContext
@@ -128,156 +117,23 @@ module.exports.createMain = async (
     let createDataDetails = await createDataDetailsLib(_izContext, objectSchemas);
     _izContext.logger.debug("createDataDetails is =", createDataDetails);
 
-    let checkCorrectLinks = [];
-
-    //validate linkType
     if ((requestParams.hasOwnProperty("relationships")) && (requestParams.relationships.length > 0)) {
+      //(<beforeValidateRelationships>)
+      //(</beforeValidateRelationships>)
 
-      for (let relationshipProperties of requestParams.relationships) {
-        _izContext.logger.debug("relationshipProperties", relationshipProperties);
-        _izContext.logger.debug("relType", relationshipProperties.relType);
-        let getObjectRelationship = await getObjectSchema.getRelationshipSchemaWithCache(
-          _izContext,
-          relationshipProperties.relType
-        )
-        _izContext.logger.debug("getObjectRelationship", getObjectRelationship)
-
-        for (const relationshipLink of Object.values(getObjectRelationship.links)) {
-          if (relationshipLink.from.linkType === "many" && relationshipLink.to.linkType === "many") {
-            if (relationshipLink.from.requiredOnCreate === true || relationshipLink.to.requiredOnCreate === true) {
-              errorsFound.push("error many to many linkType can't have requireOnCreate === true")
-            }
-          }
-        }
-        const links = await findLinksByObjTypes(_izContext, [objType, relationshipProperties.targetObjType], getObjectRelationship.links);
-        _izContext.logger.debug("links", links)
-
-        if (!links.length) {
-          errorsFound.push(`not found link between ${JSON.stringify({ mainObjType: objType })} and ${JSON.stringify({ toObjType: relationshipProperties.targetObjType })} `)
-        }
-
-        for (let link of links) {
-          const { serviceTag: fromServiceTag, objectType: fromObjectType } = objType;
-          const { serviceTag: toServiceTag, objectType: toObjectType } = relationshipProperties.targetObjType
-
-          const { serviceTag: firstServiceTag, objectType: firstObjectType } = link.from.objType;
-          const { serviceTag: secondServiceTag, objectType: secondObjectType } = link.to.objType
-
-          const matchesFromTo =
-            fromServiceTag === firstServiceTag && fromObjectType === firstObjectType &&
-            toServiceTag === secondServiceTag && toObjectType === secondObjectType;
-
-          const matchesToFrom =
-            fromServiceTag === secondServiceTag && fromObjectType === secondObjectType &&
-            toServiceTag === firstServiceTag && toObjectType === firstObjectType
-
-          if ((relationshipProperties.relationshipDirection === "from" && matchesFromTo) ||
-            (relationshipProperties.relationshipDirection === "to" && matchesToFrom)) {
-            checkCorrectLinks.push(true)
-          } else {
-            checkCorrectLinks.push(false)
-          }
-        }
-      }
-    }
-    for (const [index, checkCorrectLink] of checkCorrectLinks.entries()) {
-      if (checkCorrectLink === false) {
-        errorsFound.push(`relationship direction ${JSON.stringify(requestParams.relationships[index])} is invalid`)
-      }
+      errorsFound.push(...await createNodeLib.validateRequiredOnCreateLinks(_izContext, objType, requestParams.relationships))
     }
-    _izContext.logger.debug("finish validate Relationships from RequestParams")
-    let requiredOnCreateLinks = {};
-    let createLinkTypeIds = [];
-    // validate relationships link
-    let objectRelationshipSchema = await getObjectSchema.getRequiredOnCreateLinksWithCache(_izContext, objType);
-    _izContext.logger.debug("objectRelationshipSchema", objectRelationshipSchema);
-
-    // validate requiredOnCreateLinks
-    let filteredRequiredOnCreatedLinks = [];
-
-    await Promise.all(
-      objectRelationshipSchema.map(async (requiredLink) => {
-        const serviceTag = await Promise.all(
-          requiredLink.storageResourceTags.map(async (storageTag) => {
-            let storageResource = requiredLink.storageResources[storageTag];
-            if (storageResource.storageType === consts.STORAGE_TYPES.graph) {
-              return await getGraphServiceTagWithCache(_izContext, storageResource.graphServerTag);
-            }
-          })
-        );
-        if (serviceTag) {
-          filteredRequiredOnCreatedLinks.push(requiredLink);
-        }
-      })
-    )
-    _izContext.logger.debug("filteredRequiredOnCreatedLinks", filteredRequiredOnCreatedLinks);
-
-    if (filteredRequiredOnCreatedLinks.length) {
-      if (!requestParams.relationships || !requestParams.relationships.length) {
-        // in case not send relationship to create with
-        for (const requireLink of filteredRequiredOnCreatedLinks) {
-          errorsFound.push(`missing required relationship of relType ${JSON.stringify(requireLink.relType)} when create`)
-        }
-      }
+    _izContext.logger.debug("errorsFound", errorsFound)
 
-      for (const requireLink of filteredRequiredOnCreatedLinks) {
-        const requiredOnCreateLinkTypeId = createLinkTypeId(
-          _izContext,
-          objType,
-          requireLink.other.objType,
-          requireLink.relType,
-          requireLink.base.direction
-        );
-
-        Object.assign(requiredOnCreateLinks, {
-          [requiredOnCreateLinkTypeId]: requireLink
-        })
-      }
-
-      if (requestParams.hasOwnProperty("relationships") && requestParams.relationships.length) {
-        for (const createRelationship of requestParams.relationships) {
-          const onCreateLinkTypeId = createLinkTypeId(
-            _izContext,
-            objType,
-            createRelationship.targetObjType,
-            createRelationship.relType,
-            createRelationship.relationshipDirection
-          );
-
-          if (!requiredOnCreateLinks.hasOwnProperty(onCreateLinkTypeId)) {
-            errorsFound.push(`relType:${JSON.stringify(createRelationship.relType)} not allow to create when use create action`)
-            continue;
-          } else {
-            createLinkTypeIds.push(onCreateLinkTypeId);
-          }
-        }
-      }
-    }
-
-
-    // validate missing relType when create that should create
-    const remainRequiredOnCreateLinkTypeIds = Object.keys(requiredOnCreateLinks)
-      .filter(requiredInCreateLinkTypeId => !createLinkTypeIds.includes(requiredInCreateLinkTypeId))
-
-    if (remainRequiredOnCreateLinkTypeIds.length) {
-      for (const remainRequiredOnCreateLinkTypeId of remainRequiredOnCreateLinkTypeIds) {
-        const missingLink = {
-          relType: requiredOnCreateLinks[remainRequiredOnCreateLinkTypeId].relType,
-          base: requiredOnCreateLinks[remainRequiredOnCreateLinkTypeId].base.objType,
-          other: requiredOnCreateLinks[remainRequiredOnCreateLinkTypeId].other.objType
-        };
-        errorsFound.push(`Missing Link:: ${JSON.stringify(missingLink)} when create`)
-      }
-    }
-    _izContext.logger.debug("createLinkTypeIds", createLinkTypeIds);
-    _izContext.logger.debug("requiredOnCreateLinks", requiredOnCreateLinks);
     // end validate
-
     let objInstanceFull = {
       identifiers: {},
       fields: {}
     };
 
+    //(<optionalObjInstanceFull>)
+    //(</optionalObjInstanceFull>)
+
     let listOfRequiredOnCreate = [];
     let listOfOptionalOnCreate = [];
 
@@ -404,8 +260,11 @@ module.exports.createMain = async (
     if (errorsFound.length == 0) {
 
       for (let [storageTag, createDataDetail] of Object.entries(createDataDetails)) {
-
+        //(<beforeCreate>)
+        //(</beforeCreate>)
         if (createDataDetail.storageType == consts.STORAGE_TYPES.dynamoDB) {
+          //(<beforeCreateRecordDynamo>)
+          //(</beforeCreateRecordDynamo>)
           _izContext.logger.debug("::::::DynamoDB::::::", { storageTag, objInstanceFull });
 
 
@@ -432,6 +291,8 @@ module.exports.createMain = async (
             }
           );
         } else if (createDataDetail.storageType == consts.STORAGE_TYPES.graph) {
+          //(<beforeCreateNode>)
+          //(</beforeCreateNode>)
           _izContext.logger.debug("::::::Graph::::::", { storageTag, objInstanceFull });
 
           Object.assign(objInstanceFullForGraph.fields, createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail))
@@ -500,7 +361,8 @@ module.exports.createMain = async (
         });
 
         if (objecForCreate.allStorageTagComplete == false) { // needless check because in listOfObjectForCreates push case graph  only!
-
+          //(<beforeSendMessageToGraph>)
+          //(</beforeSendMessageToGraph>)
           messageObject = {
             objType: objType,
             objInstanceFull: objecForCreate.objInstanceFull,
@@ -534,6 +396,16 @@ module.exports.createMain = async (
           };
           _izContext.logger.debug("RequestParams before send to sqs messageToCreateObject ::::::: ", messageToCreateObject);
           await sns.publishAsync(_izContext, messageToCreateObject);
+
+          //(<afterSendMessageToGraph>)
+          //(</afterSendMessageToGraph>)
+          return {
+            objType: objType,
+            objInstanceFull: objInstanceFullForGraph,
+            relationships: requestParams.relationships || [],
+            status: "complete",
+            errorsFound: errorsFound
+          }
         };
       }; // end loop of objectCreate.
       if (errorsFound.length > 0) {
@@ -574,8 +446,8 @@ module.exports.createMain = async (
 
       return {
         objType: objType,
-        fieldNames: requestParams.fieldNames,
-        relationship: requestParams.relationships,
+        objInstanceFull: objInstanceFull,
+        relationships: requestParams.relationships || [],
         status: "error",
         errorsFound: errorsFound
       }
@@ -612,8 +484,8 @@ module.exports.createMain = async (
       }
       return {
         objType: objType,
-        fieldNames: requestParams.fieldNames,
-        relationship: requestParams.relationships,
+        objInstanceFull: objInstanceFullForDynamoDb,
+        relationships: requestParams.relationships || [],
         status: "complete",
         errorsFound: errorsFound
       }
@@ -621,4 +493,4 @@ module.exports.createMain = async (
   } catch (err) {
     throw (err)
   }
-}
+}

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

@@ -28,7 +28,7 @@ const serviceConfigLib = require('@izara_project/izara-core-library-service-sche
 
 const uploadUseCase = require('@izara_project/izara-core-library-service-schemas/src/libs/UploadUseCase')
 
-const hash = require("object-hash")
+const hash = require('@izara_project/izara-shared-core').objectHash;
 const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
 const path = require('path')
 const schemasPath = path.join(__dirname, '../schemas');
@@ -50,6 +50,8 @@ const { TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER } = require('@izara_p
 const { createDeleteDataDetail } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs')
 const { createObjType } = require("@izara_project/izara-core-library-service-schemas/src/Utils");
 
+//(<optionalRequire>)
+//(</optionalRequire>)
 /**
  *
  * @param {*} _izContext

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

@@ -53,6 +53,8 @@ const sns = externalRequest.sns
 const NoRetryError = require('@izara_project/izara-core-library-core/src/NoRetryError');
 const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
 const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
+//(<optionalRequire>)
+//(</optionalRequire>)
 /**
  *
  *
@@ -149,10 +151,7 @@ module.exports.getMain = async (
             if (callingFlowConfig[callingFlowSharedLib.consts.CALLINGFLOW_PROPERTYNAME]) {
 
               let messageObject = {
-                objType: {
-                  objectType: OBJECT_TYPE,
-                  serviceTag: SERVICE_TAG
-                },
+                objType: objType,
                 objInstanceFull: dataFromGraph.objInstanceFull
               }
               // send message to SNS ProcessFindRequiredData

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

@@ -18,7 +18,7 @@ along with this program. If not, see
 
 'use strict';
 
-const hash = require("object-hash");
+const hash = require('@izara_project/izara-shared-core').objectHash;
 const {
   getObjSchemaS3WithHierarchy,
 } = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
@@ -40,6 +40,8 @@ const { createUpdateDataDetail } = require("@izara_project/izara-market-library-
 const { PREFIX, TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
 const coreConsts = require('@izara_project/izara-core-library-core/src/Consts')
 const { createObjType } = require("@izara_project/izara-core-library-service-schemas/src/Utils")
+//(<optionalRequire>)
+//(</optionalRequire>)
 /**
  *
  *

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

@@ -75,23 +75,26 @@ const createExternalLambdaRole = async (_izContext, allObjSchemas, allRelSchemas
         if (event.includes("s3")) {
           const externalLambdaIamRoleGetPresignUrl = await externalLambdaIamRoleUploadS3(_izContext);
           externalLambdaIamRoleGetPresignUrl && externalLambdaIamRoleArray.push(externalLambdaIamRoleGetPresignUrl);
+        } else if (event.includes("extTopic")) {
+          const externalSnsPublish = await externalRoleSnsPublish(_izContext, localFlowSchema);
+          externalSnsPublish && externalLambdaIamRoleArray.push(externalSnsPublish);
         }
       }
     }
-  }
 
-  // console.log("externalLambdaIamRoleArray", externalLambdaIamRoleArray)
-  // console.log("createSourceArrayIamRole", JSON.stringify(externalLambdaIamRoleArray))
-  // return externalLambdaIamRoleArray
+    // console.log("externalLambdaIamRoleArray", externalLambdaIamRoleArray)
+    // console.log("createSourceArrayIamRole", JSON.stringify(externalLambdaIamRoleArray))
+    // return externalLambdaIamRoleArray
 
-  return {
-    templatePath: templatePath,
-    templateData: { datas: externalLambdaIamRoleArray },
-    setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.externalService),
-      saveFileName: SAVE_FILE_NAME.externalLambdaRole,
-      fileExtension: ".js",
-      isAppend: false
+    return {
+      templatePath: templatePath,
+      templateData: { datas: externalLambdaIamRoleArray },
+      setting: {
+        savePath: path.join(srcPath, SOURCE_PATH.externalService),
+        saveFileName: SAVE_FILE_NAME.externalLambdaRole,
+        fileExtension: ".js",
+        isAppend: false
+      }
     }
   }
 }
@@ -219,7 +222,7 @@ function externalLambdaIamRoleUploadS3(_izContext) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
       },
       [
-        externalResourceName(RESOURCE_CLASSES.sns, "InReservedDynamicUsage", EXTERNAL_SERVICE_NAME.accountLimits)
+        externalResourceName(RESOURCE_CLASSES.sns, "ReservedDynamicUsage_In", EXTERNAL_SERVICE_NAME.accountLimits)
       ]
     ),
     createIamRole(
@@ -238,7 +241,7 @@ function externalLambdaIamRoleUploadS3(_izContext) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
       },
       [
-        externalResourceName(RESOURCE_CLASSES.sns, "InCancelUsage", EXTERNAL_SERVICE_NAME.accountLimits)
+        externalResourceName(RESOURCE_CLASSES.sns, "CancelUsage_In", EXTERNAL_SERVICE_NAME.accountLimits)
       ]
     )
   )
@@ -249,8 +252,8 @@ function externalLambdaIamRoleUploadS3(_izContext) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
       },
       [
-        externalResourceName(RESOURCE_CLASSES.sns, "OutReservedDynamicUsageComplet", EXTERNAL_SERVICE_NAME.accountLimits),
-        externalResourceName(RESOURCE_CLASSES.sns, "InConfirmUsage", EXTERNAL_SERVICE_NAME.accountLimits)
+        externalResourceName(RESOURCE_CLASSES.sns, "ReservedDynamicUsageComplet_Out", EXTERNAL_SERVICE_NAME.accountLimits),
+        externalResourceName(RESOURCE_CLASSES.sns, "ConfirmUsage_In", EXTERNAL_SERVICE_NAME.accountLimits)
       ]
     ),
   )
@@ -261,9 +264,9 @@ function externalLambdaIamRoleUploadS3(_izContext) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
       },
       [
-        externalResourceName(RESOURCE_CLASSES.sns, "InCancelUsage", EXTERNAL_SERVICE_NAME.accountLimits),
-        externalResourceName(RESOURCE_CLASSES.sns, "InConfirmUsage", EXTERNAL_SERVICE_NAME.accountLimits),
-        externalResourceName(RESOURCE_CLASSES.sns, "InReservedDynamicUsage", EXTERNAL_SERVICE_NAME.accountLimits),
+        externalResourceName(RESOURCE_CLASSES.sns, "CancelUsage_In", EXTERNAL_SERVICE_NAME.accountLimits),
+        externalResourceName(RESOURCE_CLASSES.sns, "ConfirmUsage_In", EXTERNAL_SERVICE_NAME.accountLimits),
+        externalResourceName(RESOURCE_CLASSES.sns, "ReservedDynamicUsage_In", EXTERNAL_SERVICE_NAME.accountLimits),
       ]
     )
   )
@@ -274,4 +277,27 @@ function externalLambdaIamRoleUploadS3(_izContext) {
   }
 }
 
+async function externalRoleSnsPublish(_izContext, localFlowSchema) {
+
+  const additionalResourcePermission = [];
+  const flowStepInSplitKey = Object.keys(localFlowSchema.flowSteps)[0].split('_')
+  const serviceTag = flowStepInSplitKey[0]
+
+  additionalResourcePermission.push(
+    createIamRole(
+      {
+        [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish]
+      },
+      [
+        externalResourceName(RESOURCE_CLASSES.sns, `${flowStepInSplitKey[2]}_${flowStepInSplitKey[3]}`, serviceTag)
+      ]
+    )
+  )
+
+  return {
+    additionalResourcePermission,
+    objectType: SOURCE_GENERATE_IAM_ROLE.ExternalTopicRole,
+  };
+}
+
 module.exports = createExternalLambdaRole;

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

@@ -47,10 +47,13 @@ module.exports.generatedLambdaRole = async () => {
             ]
         <%_ }) _%>
         <%_ }) _%>
-        }<% if(resourceIdx < data.additionalResourcePermission.length-1) {_%>, <%_} %>
+        },
       <%_ }) _%>
+          //(<create<%- data.objectType%>Role>)
+          //(</create<%- data.objectType%>Role>)
       ]
-    }, <%_ }) %>
+    },
+    <%_ }) %>
   ]
    return externalLambdaRole
 }

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

@@ -79,6 +79,10 @@ const createExternalSnsSubscriptions = async (_izContext, allObjSchemas, allRelS
           const snsServiceConfigForExtTopic = await snsSubscriptionFlowSchemaExternalTopic(_izContext, localFlowSchema);
           snsServiceConfigForExtTopic && snsServiceConfigArray.push(snsServiceConfigForExtTopic);
         }
+        if (!localFlowSchema.statusType === "none") {
+          const snsServiceConfigForCreateRecordByStatusType = await createFlowSchemaRegisterSnsTopicSubscriptions(_izContext, localFlowSchema);
+          snsServiceConfigForCreateRecordByStatusType && snsServiceConfigArray.push(snsServiceConfigForCreateRecordByStatusType);
+        }
       }
     }
   }
@@ -181,21 +185,27 @@ function snsSubscriptionConfirmReserved(_izContext) {
 }
 
 function snsSubscriptionFlowSchemaExternalTopic(_izContext, localFlowSchema) {
-  const flowSteps = Object.keys(localFlowSchema.flowSteps || {});
-  const lastIndex = flowSteps.length - 1;
-
-  if (lastIndex >= 0) {
-    const flowStep = flowSteps[lastIndex];
-    const splitFlowStepKey = flowStep.split("_");
-
-    return {
-      serviceTag: [splitFlowStepKey[0]],
-      topicName: splitFlowStepKey[2],
-      sqsEndpoint: splitFlowStepKey[3]
-    };
-  }
+  const flowStepOut = Object.keys(localFlowSchema.flowSteps)[1]
+  const splitFlowStepOutKey = flowStepOut.split("_");
+  const queueNameExtTopic = upperCase(FUNCTION_NAME.flowSchemaExternalTopic)
+
+  return {
+    serviceTag: [splitFlowStepOutKey[0]],
+    topicName: splitFlowStepOutKey[2] + '_' + splitFlowStepOutKey[3],
+    sqsEndpoint: queueNameExtTopic
+  };
+}
+
+function createFlowSchemaRegisterSnsTopicSubscriptions(_izContext, localFlowSchema) {
+  const flowStepKeys = Object.keys(localFlowSchema.flowSteps)[1];
+  const flowStepKeySplit = flowStepKeys.split("_");
+  const registerCompleteSqs = upperCase(FUNCTION_NAME.flowSchemaRegister);
 
-  return null;
+  return {
+    serviceTag: [flowStepKeySplit[0]],
+    topicName: flowStepKeySplit[2],
+    sqsEndpoint: registerCompleteSqs,
+  }
 }
 
 module.exports = createExternalSnsSubscriptions;

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

@@ -25,4 +25,7 @@ module.exports.generatedSnsTopicSubscription = [ <% datas.forEach(data => { -%>
     sqsEndpoint: "<%- data.sqsEndpoint %>"
   },
 <% }) _%>
-<% }) _%>]
+<% }) _%>
+  //(<optionalSubscription>)
+  //(</optionalSubscription>)
+  ]

package/src/reStructure/TemplateData/findData/GetByStorage/getByGraph.ejs

@@ -11,13 +11,14 @@ let getDataByGraph = await graphSharedLib.getNodeV2(
   graphHandlerServiceTag,
   objType,
   {
-    ...identifiers,
-    ...fieldName
+    identifiers:identifiers
   },
-          <%- JSON.stringify(versionedDataLabel) %>
+  <%- JSON.stringify(versionedDataLabel) %>
 );
+
 _izContext.logger.debug("getDataByGraph: ", getDataByGraph)
 
+
 if (!getDataByGraph) {
   errorsFound.push(`can't get data  of ${objType.objectType} in graph`)
   standardErrorParams.push(errorsFound)

package/src/reStructure/TemplateData/findData/handler/template.ejs

@@ -40,7 +40,8 @@ const perRecordsValidatorSchema = {
   ],
   properties: {
     fieldName: {
-      type: 'string'
+      type: 'object',
+      
     },
     objType: {
       type: 'object',

package/src/reStructure/TemplateData/flowSchema/CreateRecordComplete/mainFunction/data.js

@@ -40,16 +40,10 @@ function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createRecordComplete)
   let flowSteps = Object.keys(flowSchema.flowSteps)
   let splitFlowSteps = flowSteps[0].split("_")
-  let topicArn;
-  let serviceTag;
-  for (const event of flowSchema.event) {
-    if (event.includes(FLOW_SCHEMA_EVENT_TYPE.ownTopic)) {
-      topicArn = flowSteps[0]
-    } else if (event.includes(FLOW_SCHEMA_EVENT_TYPE.extTopic)) {
-      topicArn = splitFlowSteps[3] + "_" + splitFlowSteps[4]
-      serviceTag = splitFlowSteps[0]
-    }
-  }
+
+  let topicArn = splitFlowSteps[2] + "_" + splitFlowSteps[3]
+  let serviceTag = splitFlowSteps[0]
+  // serviceTag_stage_TopicName_In/Out
   return {
     templatePath: templatePath,
     templateData: {