@izara_project/izara-core-generate-service-code 1.0.45 → 1.0.46

package/src/{generateCode/generateSchema/relationshipPerActionComponent → generators/fromObjectSchema/relationship}/create/complete/mainFunction/template.ejs

@@ -64,15 +64,7 @@ export default async function createRelationshipComplete(
     );
 
     let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
-      hash({
-        linkTypeId,
-        relationshipProperties: returnValue.requestParams.relationshipProperties,
-        graphServiceTag: graphServiceTag,
-        callingFlowProperties: passBackProperties.passBackProperties.parentPassBackProperties.callingFlowProperties || {},
-        firstObject: returnValue.requestParams.firstObject,
-        secondObject: returnValue.requestParams.secondObject,
-        relType: returnValue.requestParams.relType,
-      }), // hash id
+      returnValue.parentFlowId, // hash id
       PREFIX.createRel // prefix, use constant further
     )
 
@@ -103,6 +95,7 @@ export default async function createRelationshipComplete(
             secondObject: returnValue.requestParams.secondObject,
             relType: returnValue.requestParams.relType,
             relationshipProperties: returnValue.requestParams.relationshipProperties,
+            parentFlowId: returnValue.parentFlowId,
             status: status,
             errorsFound: errorsFound
           };

package/src/{generateCode/generateSchema/relationshipPerActionComponent/create/complete/sns-out/data.js → generators/fromObjectSchema/relationship/create/complete/sns-out/snsOut.js}

@@ -56,7 +56,7 @@ function createParamsForCreateSource(_izContext, srcPath) {
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
       isAppend: true,
-      fromFile: 'relationShip/createComplete/sns-out/data.js'
+      fromFile: 'relationShip/createComplete/sns-out/snsOut.js'
     }
   };
 }

package/src/{generateCode/generateSchema/relationshipPerActionComponent → generators/fromObjectSchema/relationship}/delete/action/mainFunction/template.ejs

@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
-import { objectHash as hash } from '@izara_project/izara-shared-core';
+import { objectHash as hash, identifierUuid } from '@izara_project/izara-shared-core';
 
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import lambdaSharedLib from "@izara_project/izara-core-library-lambda";
@@ -85,6 +85,7 @@ export default async function deleteRelationship(
       //(</requestParamDeleteRel>)
     } = requestParams;
 
+    const parentFlowId = identifierUuid();
     let errorsFound = [];
 
     //(<beforeValidateDeleteRel>)
@@ -181,7 +182,8 @@ export default async function deleteRelationship(
         //(<inDeleteRelCompleteMsg>)
         //(</inDeleteRelCompleteMsg>)
         status: 'error',
-        errorsFound: errorsFound
+        errorsFound: errorsFound,
+        parentFlowId
       };
 
       // if have callingFlow will send to message complete
@@ -228,7 +230,7 @@ export default async function deleteRelationship(
         // awaitingStepId per graphServiceTag
         awaitingStepIds.push(
           asyncFlowSharedLib.createAwaitingStepId(
-            hash({ linkTypeId, graphServiceTag: targetStorageResource.graphServiceTag }), // hash id
+            parentFlowId, // hash id
             PREFIX.deleteRel // prefix, use constant further
           )
         );
@@ -278,6 +280,7 @@ export default async function deleteRelationship(
         relType: relType,
         relId: relId,
         relationshipDirection: relationshipDirection,
+        parentFlowId: parentFlowId,
         //(<inDeleteRelMessageBody>)
         //(</inDeleteRelMessageBody>)
       }

package/src/{generateCode/generateSchema/relationshipPerActionComponent → generators/fromObjectSchema/relationship}/delete/complete/mainFunction/template.ejs

@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
-import { objectHash as hash } from '@izara_project/izara-shared-core';
+import { objectHash as hash} from '@izara_project/izara-shared-core';
 
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import snsSharedLib from "@izara_project/izara-core-library-sns";
@@ -52,41 +52,24 @@ export default async function deleteRelationshipComplete(
       passBackProperties: passBackProperties,
     });
 
-    let linkTypeId;
-    // start create awaitingStepId
-    if (returnValue.requestParams.hasOwnProperty("secondObject") && Object.values(returnValue.requestParams.secondObject.objType).length > 0) {
-      linkTypeId = createLinkTypeId(
-        _izContext,
-        returnValue.requestParams.firstObject.objType,
-        returnValue.requestParams.secondObject.objType,
-        returnValue.requestParams.relType,
-        returnValue.requestParams.relationshipDirection
-      );
-    } else {
-      linkTypeId = hash({ firstObject: returnValue.requestParams.firstObject.objType, relType: returnValue.requestParams.relType })
-    }
     let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
-      hash({
-        linkTypeId,
-        graphServiceTag: graphServiceTag
-      }), // hash id
+      returnValue.parentFlowId, // hash id
       PREFIX.deleteRel // prefix, use constant further
     )
 
-
-    let createRelPendingObjects = await dynamodbSharedLib.query(
+    let deleteRelPendingObjects = await dynamodbSharedLib.query(
       _izContext,
       await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleSteps"),
       {
         awaitingStepId: awaitingStepId
       }
     );
-    _izContext.logger.debug("record of createRelPendingObjects ::", createRelPendingObjects);
+    _izContext.logger.debug("record of deleteRelPendingObjects ::", deleteRelPendingObjects);
 
 
 
     await Promise.all(
-      createRelPendingObjects.Items.map(async ({ pendingStepId }) => {
+      deleteRelPendingObjects.Items.map(async ({ pendingStepId }) => {
         if (await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
           _izContext,
           pendingStepId, // task waiting
@@ -99,6 +82,7 @@ export default async function deleteRelationshipComplete(
             firstObject: returnValue.requestParams.firstObject,
             secondObject: returnValue.requestParams.secondObject,
             relType: returnValue.requestParams.relType,
+            parentFlowId: returnValue.parentFlowId,
             status: status,
             errorsFound: errorsFound
           };

package/src/{generateCode/generateSchema/relationshipPerActionComponent/delete/complete/sns-out/data.js → generators/fromObjectSchema/relationship/delete/complete/sns-out/snsOut.js}

@@ -58,7 +58,7 @@ function createParamsForCreateSource(_izContext, srcPath) {
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
       isAppend: true,
-      fromFile: 'relationShip/deleteComplete/sns-out/data.js'
+      fromFile: 'relationShip/deleteComplete/sns-out/snsOut.js'
     }
   };
 }

package/src/{generateCode/generateSchema/relationshipPerActionComponent → generators/fromObjectSchema/relationship}/get/action/mainFunction/template.ejs

@@ -259,7 +259,7 @@ export default async function getRelationship(
     await Promise.all(
       targetGraphStorageResources.map(async (storageResource) => {
         if (storageResource.storageType === consts.STORAGE_TYPES.graph) {
-          result = await graphSharedLib.getRelationshipV2(
+          result = await graphSharedLib.getRelationship(
             _izContext,
             storageResource.graphServiceTag,
             firstObject,

package/src/generators/fromObjectSchema/relationship/get/complete/mainFunction/template.ejs

@@ -0,0 +1,99 @@
+/*
+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/>.
+*/
+
+
+import { objectHash as hash } from '@izara_project/izara-shared-core';
+
+import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+import snsSharedLib from "@izara_project/izara-core-library-sns";
+import dynamodbSharedLib from "@izara_project/izara-core-library-dynamodb";
+import asyncFlowSharedLib from "@izara_project/izara-core-library-asynchronous-flow";
+
+import { sns } from "@izara_project/izara-core-library-external-request";
+import { utils, consts } from '@izara_project/izara-core-library-service-schemas';
+const { createLinkTypeId } = utils;
+
+const {
+  TOPIC_NAME_GENERATE_CODE,
+  PREFIX
+} = consts;
+
+//(<optionalRequire>)
+//(</optionalRequire>)
+
+export default async function getRelationshipComplete(
+  _izContext,
+  returnValue,
+  status,
+  errorsFound,
+  graphServiceTag,
+  passBackProperties = {},
+
+) {
+  try {
+    _izContext.logger.debug("Function:getRelationshipComplete", {
+      returnValue: returnValue,
+      status: status,
+      errorsFound: errorsFound,
+      graphServiceTag: graphServiceTag,
+      passBackProperties: passBackProperties,
+    });
+
+    let createCompleteMsg = {
+      firstObject: returnValue.requestParams.firstObject,
+      secondObject: returnValue.requestParams.secondObject,
+      relType: returnValue.requestParams.relType,
+      relationshipProperties: returnValue.requestParams.relationshipProperties,
+      status: status,
+      errorsFound: errorsFound
+    };
+
+    createCompleteMsg = callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(passBackProperties, createCompleteMsg);
+    _izContext.logger.debug("After addCallingFlowToSnsResponseMessageObject", createCompleteMsg);
+
+    let messageAttributes = callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(passBackProperties, {});
+    _izContext.logger.debug("After addCallingFlowToSnsResponseMessageAttributes", createCompleteMsg);
+
+    let sendMessageToOutGetRelComplete = {
+      Message: JSON.stringify(createCompleteMsg),
+      MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
+      TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outGetRelComplete)
+    };
+    _izContext.logger.debug("Send message to outGetRelComplete :::>", sendMessageToOutGetRelComplete);
+    await sns.publishAsync(_izContext, sendMessageToOutGetRelComplete);
+
+    // check pendingStepId finished
+
+    // remove awaitingMultipleStep after finished
+    await asyncFlowSharedLib.removeAwaitingMultipleStep(
+      _izContext,
+      awaitingStepId,
+      pendingStepId,
+      errorsFound
+    );
+
+    return {
+      returnValue,
+      status,
+      errorsFound
+    }
+
+  } catch (err) {
+    _izContext.logger.error('error GetRelationshipComplete:', err)
+    throw (err)
+  }
+}

package/src/{generateCode/generateSchema/relationshipPerActionComponent/get/complete/sns-out/data.js → generators/fromObjectSchema/relationship/get/complete/sns-out/snsOut.js}

@@ -59,7 +59,7 @@ function createParamsForCreateSource(_izContext, srcPath) {
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
       isAppend: true,
-      fromFile: 'relationShip/getComplete/sns-out/data.js'
+      fromFile: 'relationShip/getComplete/sns-out/snsOut.js'
     }
   };
 }

package/src/{generateCode/generateSchema/relationshipPerActionComponent → generators/fromObjectSchema/relationship}/index.js

@@ -15,65 +15,65 @@ 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/>.
 */
 
-import updateActionMainFunction from './update/action/mainFunction/data.js';
-import updateActionFunctionYaml from './update/action/functionYaml/data.js';
-import updateActionHandler from './update/action/handler/data.js';
-import updateActionSnsInSqs from './update/action/sns-in-sqs/data.js';
-import updateCompleteMainFunction from './update/complete/mainFunction/data.js';
-import updateCompleteFunctionYaml from './update/complete/functionYaml/data.js';
-import updateCompleteHandler from './update/complete/handler/sqs/data.js';
-import updateCompleteSnsInSqs from './update/complete/sns-in-sqs/data.js';
-import updateCompleteSnsOut from './update/complete/sns-out/data.js';
+import updateActionMainFunction from './update/action/mainFunction/main.js';
+import updateActionFunctionYaml from './update/action/functionYaml/yaml.js';
+import updateActionHandler from './update/action/handler/handler.js';
+import updateActionSnsInSqs from './update/action/sns-in-sqs/snsInSqs.js';
+import updateCompleteMainFunction from './update/complete/mainFunction/main.js';
+import updateCompleteFunctionYaml from './update/complete/functionYaml/yaml.js';
+import updateCompleteHandler from './update/complete/handler/sqs/sqs.js';
+import updateCompleteSnsInSqs from './update/complete/sns-in-sqs/snsInSqs.js';
+import updateCompleteSnsOut from './update/complete/sns-out/snsOut.js';
 
-import createActionMainFunction from './create/action/mainFunction/data.js';
-import createActionFunctionYaml from './create/action/functionYaml/data.js';
-import createActionHandler from './create/action/handler/data.js';
-import createActionSnsInSqs from './create/action/sns-in-sqs/data.js';
-import createCompleteMainFunction from './create/complete/mainFunction/data.js';
-import createCompleteFunctionYaml from './create/complete/functionYaml/data.js';
-import createCompleteHandler from './create/complete/handler/sqs/data.js';
-import createCompleteSnsInSqs from './create/complete/sns-in-sqs/data.js';
-import createCompleteSnsOut from './create/complete/sns-out/data.js';
+import createActionMainFunction from './create/action/mainFunction/main.js';
+import createActionFunctionYaml from './create/action/functionYaml/yaml.js';
+import createActionHandler from './create/action/handler/handler.js';
+import createActionSnsInSqs from './create/action/sns-in-sqs/snsInSqs.js';
+import createCompleteMainFunction from './create/complete/mainFunction/main.js';
+import createCompleteFunctionYaml from './create/complete/functionYaml/yaml.js';
+import createCompleteHandler from './create/complete/handler/sqs/sqs.js';
+import createCompleteSnsInSqs from './create/complete/sns-in-sqs/snsInSqs.js';
+import createCompleteSnsOut from './create/complete/sns-out/snsOut.js';
 
-import deleteActionMainFunction from './delete/action/mainFunction/data.js';
-import deleteActionFunctionYaml from './delete/action/functionYaml/data.js';
-import deleteActionHandler from './delete/action/handler/data.js';
-import deleteActionSnsInSqs from './delete/action/sns-in-sqs/data.js';
-import deleteCompleteMainFunction from './delete/complete/mainFunction/data.js';
-import deleteCompleteFunctionYaml from './delete/complete/functionYaml/data.js';
-import deleteCompleteHandler from './delete/complete/handler/sqs/data.js';
-import deleteCompleteSnsInSqs from './delete/complete/sns-in-sqs/data.js';
-import deleteCompleteSnsOut from './delete/complete/sns-out/data.js';
+import deleteActionMainFunction from './delete/action/mainFunction/main.js';
+import deleteActionFunctionYaml from './delete/action/functionYaml/yaml.js';
+import deleteActionHandler from './delete/action/handler/handler.js';
+import deleteActionSnsInSqs from './delete/action/sns-in-sqs/snsInSqs.js';
+import deleteCompleteMainFunction from './delete/complete/mainFunction/main.js';
+import deleteCompleteFunctionYaml from './delete/complete/functionYaml/yaml.js';
+import deleteCompleteHandler from './delete/complete/handler/sqs/sqs.js';
+import deleteCompleteSnsInSqs from './delete/complete/sns-in-sqs/snsInSqs.js';
+import deleteCompleteSnsOut from './delete/complete/sns-out/snsOut.js';
 
-import getActionMainFunction from './get/action/mainFunction/data.js';
-import getActionFunctionYaml from './get/action/functionYaml/data.js';
-import getActionHandler from './get/action/handler/data.js';
-import getActionSnsInSqs from './get/action/sns-in-sqs/data.js';
-import getCompleteMainFunction from './get/complete/mainFunction/data.js';
-import getCompleteFunctionYaml from './get/complete/functionYaml/data.js';
-import getCompleteHandler from './get/complete/handler/sqs/data.js';
-import getCompleteSnsInSqs from './get/complete/sns-in-sqs/data.js';
-import getCompleteSnsOut from './get/complete/sns-out/data.js';
+import getActionMainFunction from './get/action/mainFunction/main.js';
+import getActionFunctionYaml from './get/action/functionYaml/yaml.js';
+import getActionHandler from './get/action/handler/handler.js';
+import getActionSnsInSqs from './get/action/sns-in-sqs/snsInSqs.js';
+import getCompleteMainFunction from './get/complete/mainFunction/main.js';
+import getCompleteFunctionYaml from './get/complete/functionYaml/yaml.js';
+import getCompleteHandler from './get/complete/handler/sqs/sqs.js';
+import getCompleteSnsInSqs from './get/complete/sns-in-sqs/snsInSqs.js';
+import getCompleteSnsOut from './get/complete/sns-out/snsOut.js';
 
-import changeRelCompleteMainFunction from './changeRelationship/complete/mainFunction/data.js';
-import changeRelCompleteFunctionYaml from './changeRelationship/complete/functionYaml/data.js';
-import changeRelCompleteHandler from './changeRelationship/complete/handler/sqs/data.js';
-import changeRelCompleteSnsInSqs from './changeRelationship/complete/sns-in-sqs/data.js';
-import changeRelCompleteSnsOut from './changeRelationship/complete/sns-out/data.js';
-import changeRelActionMainFunction from './changeRelationship/action/mainFunction/data.js';
-import changeRelActionHandler from './changeRelationship/action/handler/data.js';
-import changeRelActionSnsInSqs from './changeRelationship/action/sns-in-sqs/data.js';
-import changeRelActionFunctionYaml from './changeRelationship/action/functionYaml/data.js';
+import changeRelCompleteMainFunction from './changeRelationship/complete/mainFunction/main.js';
+import changeRelCompleteFunctionYaml from './changeRelationship/complete/functionYaml/yaml.js';
+import changeRelCompleteHandler from './changeRelationship/complete/handler/sqs/sqs.js';
+import changeRelCompleteSnsInSqs from './changeRelationship/complete/sns-in-sqs/snsInSqs.js';
+import changeRelCompleteSnsOut from './changeRelationship/complete/sns-out/snsOut.js';
+import changeRelActionMainFunction from './changeRelationship/action/mainFunction/main.js';
+import changeRelActionHandler from './changeRelationship/action/handler/handler.js';
+import changeRelActionSnsInSqs from './changeRelationship/action/sns-in-sqs/snsInSqs.js';
+import changeRelActionFunctionYaml from './changeRelationship/action/functionYaml/yaml.js';
 
-import moveRelActionMainFunction from './moveRelationship/action/mainFunction/data.js';
-import moveRelActionFunctionYaml from './moveRelationship/action/functionYaml/data.js';
-import moveRelActionHandler from './moveRelationship/action/handler/data.js';
-import moveRelActionSnsInSqs from './moveRelationship/action/sns-in-sqs/data.js';
-import moveRelCompleteMainFunction from './moveRelationship/complete/mainFunction/data.js';
-import moveRelCompleteFunctionYaml from './moveRelationship/complete/functionYaml/data.js';
-import moveRelCompleteHandler from './moveRelationship/complete/handler/sqs/data.js';
-import moveRelCompleteSnsInSqs from './moveRelationship/complete/sns-in-sqs/data.js';
-import moveRelCompleteSnsOut from './moveRelationship/complete/sns-out/data.js';
+import moveRelActionMainFunction from './moveRelationship/action/mainFunction/main.js';
+import moveRelActionFunctionYaml from './moveRelationship/action/functionYaml/yaml.js';
+import moveRelActionHandler from './moveRelationship/action/handler/handler.js';
+import moveRelActionSnsInSqs from './moveRelationship/action/sns-in-sqs/snsInSqs.js';
+import moveRelCompleteMainFunction from './moveRelationship/complete/mainFunction/main.js';
+import moveRelCompleteFunctionYaml from './moveRelationship/complete/functionYaml/yaml.js';
+import moveRelCompleteHandler from './moveRelationship/complete/handler/sqs/sqs.js';
+import moveRelCompleteSnsInSqs from './moveRelationship/complete/sns-in-sqs/snsInSqs.js';
+import moveRelCompleteSnsOut from './moveRelationship/complete/sns-out/snsOut.js';
 
 // components that receive (ctx, rootServicePath)
 const baseComponents = [

package/src/{generateCode/generateSchema/relationshipPerActionComponent → generators/fromObjectSchema/relationship}/moveRelationship/action/mainFunction/template.ejs

@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 
-import { objectHash as hash } from '@izara_project/izara-shared-core';
+import { objectHash as hash, identifierUuid } from '@izara_project/izara-shared-core';
 
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import lambdaSharedLib from "@izara_project/izara-core-library-lambda";
@@ -87,6 +87,7 @@ export default async function moveRelationship(
       //(</requestParamMoveRel>)
     } = requestParams;
 
+    const parentFlowId = identifierUuid();
     let errorsFound = [];
 
     //(<beforeValidateMoveRel>)
@@ -252,7 +253,8 @@ export default async function moveRelationship(
         //(<inMoveCompleteMsg>)
         //(</inMoveCompleteMsg>)
         status: 'error',
-        errorsFound: errorsFound
+        errorsFound: errorsFound,
+        parentFlowId: parentFlowId
       };
 
       // if have callingFlow will send to message complete
@@ -293,17 +295,7 @@ export default async function moveRelationship(
         // awaitingStepId per graphServiceTag
         awaitingStepIds.push(
           asyncFlowSharedLib.createAwaitingStepId(
-            hash({
-              linkTypeId,
-              graphServiceTag: targetStorageResource.graphServiceTag,
-              callingFlowProperties: callingFlowConfig.callingFlowProperties || {},
-              firstObject,
-              secondObject,
-              relType,
-              relationshipDirection,
-              relationshipProperties,
-              moveObject
-            }), // hash id
+            parentFlowId, // hash id
             PREFIX.changeRel // prefix, use constant further
           )
         );
@@ -338,7 +330,8 @@ export default async function moveRelationship(
         relType,
         relationshipDirection,
         relationshipProperties,
-        moveObject
+        moveObject,
+        parentFlowId: parentFlowId,
         //(<messageBodyMoveRel>)
         //(</messageBodyMoveRel>)
 

package/src/{generateCode/generateSchema/relationshipPerActionComponent → generators/fromObjectSchema/relationship}/moveRelationship/complete/mainFunction/template.ejs

@@ -64,17 +64,7 @@ export default async function <%- functionName %> (
     );
 
     let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
-      hash({
-        linkTypeId,
-        graphServiceTag: graphServiceTag,
-        callingFlowProperties: passBackProperties.passBackProperties.parentPassBackProperties.callingFlowProperties || {},
-        firstObject: returnValue.requestParams.firstObject,
-        secondObject: returnValue.requestParams.secondObject,
-        relType: returnValue.requestParams.relType,
-        relationshipProperties: returnValue.requestParams.relationshipProperties,
-        relationshipDirection: returnValue.requestParams.relationshipDirection,
-        moveObject: returnValue.requestParams.moveObject,
-      }), // hash id
+      returnValue.parentFlowId, // hash id
       PREFIX.changeRel // prefix, use constant further
     )
 
@@ -108,6 +98,7 @@ export default async function <%- functionName %> (
             relationshipDirection: returnValue.requestParams.relationshipDirection,
             moveObject: returnValue.requestParams.moveObject,
             status: status,
+            parentFlowId: returnValue.parentFlowId,
             errorsFound: errorsFound
           };
 

package/src/{generateCode/generateSchema/relationshipPerActionComponent/moveRelationship/complete/sns-out/data.js → generators/fromObjectSchema/relationship/moveRelationship/complete/sns-out/snsOut.js}

@@ -58,7 +58,7 @@ function createParamsForCreateSource(_izContext, srcPath) {
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
       isAppend: true,
-      fromFile: 'relationShip/moveComplete/sns-out/data.js'
+      fromFile: 'relationShip/moveComplete/sns-out/snsOut.js'
     }
   };
 }

package/src/{generateCode/generateSchema/relationshipPerActionComponent → generators/fromObjectSchema/relationship}/update/action/mainFunction/template.ejs

@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 
-import { objectHash as hash } from '@izara_project/izara-shared-core';
+import { objectHash as hash, identifierUuid } from '@izara_project/izara-shared-core';
 
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import lambdaSharedLib from "@izara_project/izara-core-library-lambda";
@@ -90,6 +90,7 @@ export default async function updateRelationship(
     } = requestParams;
 
     let errorsFound = [];
+    const parentFlowId = identifierUuid();
 
     //(<beforeValidateUpdateRel>)
     //(</beforeValidateUpdateRel>)
@@ -232,7 +233,8 @@ export default async function updateRelationship(
           relType: relType,
           relationshipDirection,
           status: 'error',
-          errorsFound: errorsFound
+          errorsFound: errorsFound,
+          parentFlowId: parentFlowId,
           //(<inUpdateCompleteMsgUpdateRel>)
           //(</inUpdateCompleteMsgUpdateRel>)
         };
@@ -275,7 +277,7 @@ export default async function updateRelationship(
           // awaitingStepId per graphServiceTag
           awaitingStepIds.push(
             asyncFlowSharedLib.createAwaitingStepId(
-              hash({ linkTypeId, relId, relationshipProperties, graphServiceTag: targetStorageResource.graphServiceTag }), // hash id
+              parentFlowId, // hash id
               PREFIX.updateRel // prefix, use constant further
             )
           );
@@ -324,7 +326,8 @@ export default async function updateRelationship(
           relId,
           relType: relType,
           relationshipProperties,
-          relationshipDirection
+          relationshipDirection,
+          parentFlowId
           //(<inUpdateRelMessageBodyUpdateRel>)
           //(</inUpdateRelMessageBodyUpdateRel>)
         }
@@ -367,7 +370,8 @@ export default async function updateRelationship(
           secondObject: secondObject,
           relType: relType,
           relationshipDirection,
-          relationshipProperties
+          relationshipProperties,
+          parentFlowId
         };
 
         if (callingFlowConfig[callingFlowSharedLib.consts.CALLINGFLOW_PROPERTYNAME]) {

package/src/{generateCode/generateSchema/relationshipPerActionComponent/update/action/sns-out/data.js → generators/fromObjectSchema/relationship/update/action/sns-out/snsOut.js}

@@ -61,7 +61,7 @@ function createParamsForCreateSource(_izContext, srcPath) {
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
       isAppend: true,
-      fromFile: 'relationShip/update/sns-out/data.js'
+      fromFile: 'relationShip/update/sns-out/snsOut.js'
     }
   };
 }

package/src/{generateCode/generateSchema/relationshipPerActionComponent/update/complete/sns-out/data.js → generators/fromObjectSchema/relationship/update/complete/sns-out/snsOut.js}

@@ -50,7 +50,7 @@ function createParamsForCreateSource(_izContext, appPath) {
         saveFileName: SAVE_FILE_NAME.snsOutYaml,
         fileExtension: '.yml',
         isAppend: true,
-      fromFile: 'relationShip/updateComplete/sns-out/data.js'
+      fromFile: 'relationShip/updateComplete/sns-out/snsOut.js'
       }
     }
   ];

package/src/{generateCode/generateSchema/generateTextTag → generators/fromObjectSchema/textTag}/index.js

@@ -19,7 +19,7 @@ import { join } from 'path';
 
 import libs from '#libs/Utils.js';
 
-import createSourceSystemText from './systemText/data.js';
+import createSourceSystemText from './systemText/systemText.js';
 
 async function systemTextComponent(
   _izContext,

package/src/{generateCode/generateSchema/generateTextTag/systemText/data.js → generators/fromObjectSchema/textTag/systemText/systemText.js}

@@ -22,6 +22,7 @@ const __dirname = path.dirname(__filename);
 
 import consts from '#libs/Consts.js';
 import utils from '#libs/Utils.js';
+import libs from '#libs/Libs.js';
 
 const {
   firstLetterLowerCase: lowerCase,
@@ -67,10 +68,10 @@ function createSourceSystemText(
           serviceTag: getLocalConfig('iz_serviceTag')
         };
         const systemTextObjectSchemas = {
-          nameSpace: `${coreUtils.createObjTypeConcat(_izContext, objType)}_description`, // for each objectType
-          systemTextTag: `${fieldName}_${coreUtils.createObjTypeConcat(_izContext, objType)}`, // for each fieldName
-          openHook: `//(<${coreUtils.createObjTypeConcat(_izContext, objType)}${fieldName}Hook>)`,
-          closeHook: `//(</${coreUtils.createObjTypeConcat(_izContext, objType)}${fieldName}Hook>)`
+          nameSpace: `${coreUtils.createObjTypeConcat(_izContext, objType, '|')}|description`, // for each objectType
+          systemTextTag: `${fieldName}|${coreUtils.createObjTypeConcat(_izContext, objType, '|')}`, // for each fieldName
+          openHook: `//(<${coreUtils.createObjTypeConcat(_izContext, objType, '|')}${fieldName}Hook>)`,
+          closeHook: `//(</${coreUtils.createObjTypeConcat(_izContext, objType, '|')}${fieldName}Hook>)`
         };
         createSourceArray.push(systemTextObjectSchemas);
       }
@@ -84,10 +85,10 @@ function createSourceSystemText(
         serviceTag: getLocalConfig('iz_serviceTag')
       };
       const systemTextFlowSchemas = {
-        nameSpace: `${coreUtils.createFlowTypeConcat(_izContext, flowType)}`, // for each flowType
-        systemTextTag: `errors_${coreUtils.createFlowTypeConcat(_izContext, flowType)}`,
-        openHook: `//(<${coreUtils.createFlowTypeConcat(_izContext, flowType)}Hook>)`,
-        closeHook: `//(</${coreUtils.createFlowTypeConcat(_izContext, flowType)}Hook>)`
+        nameSpace: `${coreUtils.createFlowTypeConcat(_izContext, flowType, '|')}`, // for each flowType
+        systemTextTag: `errors|${coreUtils.createFlowTypeConcat(_izContext, flowType, '|')}`,
+        openHook: `//(<${coreUtils.createFlowTypeConcat(_izContext, flowType, '|')}Hook>)`,
+        closeHook: `//(</${coreUtils.createFlowTypeConcat(_izContext, flowType, '|')}Hook>)`
       };
       createSourceArray.push(systemTextFlowSchemas);
     }
@@ -104,10 +105,10 @@ function createSourceSystemText(
       if (relSchema[relTag].hasOwnProperty('fieldNames') && Object.keys(relSchema[relTag].fieldNames).length > 0) {
         for (const fieldName of Object.keys(relSchema[relTag].fieldNames)) {
           const systemTextRelSchemas = {
-            nameSpace: `${coreUtils.createRelTypeConcat(_izContext, relType)}_description`,
-            systemTextTag: `${fieldName}_${coreUtils.createRelTypeConcat(_izContext, relType)}`,
-            openHook: `//(<${coreUtils.createRelTypeConcat(_izContext, relType)}${fieldName}Hook>)`,
-            closeHook: `//(</${coreUtils.createRelTypeConcat(_izContext, relType)}${fieldName}Hook>)`
+            nameSpace: `${coreUtils.createRelTypeConcat(_izContext, relType, '|')}|description`,
+            systemTextTag: `${fieldName}_${coreUtils.createRelTypeConcat(_izContext, relType, '|')} `,
+            openHook: `//(<${coreUtils.createRelTypeConcat(_izContext, relType, '|')}${fieldName}Hook>)`,
+            closeHook: `//(</${coreUtils.createRelTypeConcat(_izContext, relType, '|')}${fieldName}Hook>)`
           }
           createSourceArray.push(systemTextRelSchemas);
         }
@@ -118,7 +119,7 @@ function createSourceSystemText(
   if (notificationSchemas.length > 0) {
     for (const notification of notificationSchemas) {
       const notificationSystemText = {
-        nameSpace: `sysNotification_${notification.notificationGrouping}`,
+        nameSpace: `sysNotification'|'${notification.notificationGrouping}`,
         systemTextTag: notification.notificationTag,
         openHook: `//(<${notification.notificationTag}Hook>)`,
         closeHook: `//(</${notification.notificationTag}Hook>)`