@izara_project/izara-core-generate-service-code 1.0.4 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Code for locally generating per service files",
   "main": "index.js",
   "scripts": {

package/src/GenerateTests.js

@@ -111,7 +111,8 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
 
     console.log('upload file to S3');
 
-    await uploadLib.uploadTos3(join(saveFilePath, `../src/generateIntegrationTest/${serviceTag}`), //intTest path
+    await uploadLib.uploadTos3(
+      join(saveFilePath, `../src/generateIntegrationTest/${serviceTag}`), //intTest path
       { s3Prefix: settings, serviceTag: serviceTag } // settings
     );
 

package/src/TemplateData/EndpointPerService/handler/sqs/template.ejs

@@ -21,7 +21,7 @@ import { middlewareHandler } from "@izara_project/izara-middleware";
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import Logger from '@izara_project/izara-core-library-logger';
 import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record-handler';
-import { validator } from '@izara-core-library-service-schemas';
+import { validator } from '@izara_project/izara-core-library-service-schemas';
 
 //(<optionalRequire>)
 //(</optionalRequire>)

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

@@ -27,7 +27,7 @@ import snsSharedLib from '@izara_project/izara-core-library-sns';
 import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
-import { consts as coreConsts } from '@izara_project/izara-core-library-core';
+import { consts as coreConsts, NoRetryError } from '@izara_project/izara-core-library-core';
 import identifierLib from '@izara_project/izara-core-library-identifiers';
 const { createRandomIdentifier } = identifierLib
 
@@ -38,21 +38,17 @@ import { sns } from '@izara_project/izara-core-library-external-request';
 
 // ──────────────────────── Service Schemas ────────────────────────
 import { utils, createNodeLib, uploadUseCase, consts, getObjectSchema, identifiersObject, dataDetailsLib } from '@izara_project/izara-core-library-service-schemas';
-const { createObjType } = utils
-const { createDataDetailsLib } = dataDetailsLib
-const { dynamoDbIdentifiersByStorageResource } = identifiersObject
-// ──────────────────────── Graph Service Libraries ────────────────────────
-import graphSharedLibs from '@izara_project/izara-core-library-graph-service';
-
-// ──────────────────────── Market Library Service Schemas ────────────────────────
-import { consts as generateCodeConsts, utils as generateCodeUtils } from '@izara_project/izara-core-generate-service-code';
-
+const { createObjType, firstLetterUpperCase } = utils;
+const { createDataDetailsLib } = dataDetailsLib;
+const { dynamoDbIdentifiersByStorageResource } = identifiersObject;
 const {
   TOPIC_NAME_GENERATE_CODE,
   TOPIC_NAME_GRAPH_HANDLER
-} = generateCodeConsts;
+} = consts;
+
+// ──────────────────────── Graph Service Libraries ────────────────────────
+import graphSharedLibs from '@izara_project/izara-core-library-graph-service';
 
-const { firstLetterUpperCase } = generateCodeUtils;
 
 //(<optionalRequire>)
 //(</optionalRequire>)
@@ -110,6 +106,8 @@ export default async function createMain(
       if (objectSchema.hasOwnProperty("belongTo") && !targetId) {
         errorsFound.push('not have targetId')
       }
+    } else if (objectSchema.generatedBy === "searchResultGenerated") {
+      throw new NoRetryError("error searchResultGenerated should not happen here")
     }
 
     //(<beforeQuery>)

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

@@ -22,12 +22,10 @@ import { consts as coreConsts } from '@izara_project/izara-core-library-core';
 // ==================== Core Service Schemas ====================
 import { getObjectSchema, consts, createObjType, dataDetailsLib, identifiersObject } from '@izara_project/izara-core-library-service-schemas'
 const { createDeleteDataDetail } = dataDetailsLib;
-const { dynamoDbIdentifiersByStorageResource } = identifiersObject
-// ==================== Market Service Schemas ====================
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
+const { dynamoDbIdentifiersByStorageResource } = identifiersObject;
 const {
   TOPIC_NAME_GENERATE_CODE,
-} = generateCodeConsts;
+} = consts;
 
 // ==================== Shared Libraries ====================
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';

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

@@ -1,22 +1,20 @@
 /*
 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 />.
-  */
+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 />.
+*/
 
 // ==================== Izara Core Service Schemas ====================
 import { getObjectSchema, serviceConfig, consts, identifiersObject, utils, dataDetailsLib } from '@izara_project/izara-core-library-service-schemas'
@@ -29,11 +27,9 @@ const {
   createGetDataDetails
 } = dataDetailsLib;
 
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code'
-
 const {
   TOPIC_NAME_GENERATE_CODE,
-} = generateCodeConsts;
+} = consts;
 
 
 // ==================== Shared Core Libraries ====================

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

@@ -18,21 +18,18 @@ along with this program. If not, see
 
 // ==================== Shared Core Utilities ====================
 import { objectHash as hash } from '@izara_project/izara-shared-core';
-import { consts as coreConsts } from '@izara_project/izara-core-library-core';
+import { consts as coreConsts, NoRetryError } from '@izara_project/izara-core-library-core';
 
 // ==================== Core Service Schemas ====================
 import { getObjectSchema, consts, utils, identifiersObject, dataDetailsLib } from '@izara_project/izara-core-library-service-schemas';
 const { createObjType } = utils;
 const { dynamoDbIdentifiersByStorageResource } = identifiersObject;
 const { createUpdateDataDetail } = dataDetailsLib;
-
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code'
-
 const {
   PREFIX,
   TOPIC_NAME_GENERATE_CODE,
   TOPIC_NAME_GRAPH_HANDLER,
-} = generateCodeConsts;
+} = consts;
 
 
 // ==================== Shared Libraries ====================
@@ -118,6 +115,8 @@ export default async function updateMain(
       if (objectSchema.hasOwnProperty("belongTo") && !targetId) {
         errorsFound.push('not have targetId')
       }
+    } else if (objectSchema.generatedBy === "searchResultGenerated") {
+      throw new NoRetryError("error searchResultGenerated should not happen here")
     }
 
     //(<beforeQuery>)
@@ -269,26 +268,27 @@ export default async function updateMain(
             if (Object.keys(updateNodeParams.objInstanceFull.fields).length === 0) {
               return
             } else {
+
               //(<beforeUpdateNode>)
               //(</beforeUpdateNode>)
 
-              awaitingStepIds.push(
+              awaitingStepIds.push( // createAwaitingStepId if updateGraph
                 {
-                  awaitingStepId: await asyncFlowSharedLib.createAwaitingStepId(
-                    (hash({
-                      objType: objType,
-                      graphServerTag: storageTag,
-                      identifiers: objInstanceFullForGraph.identifiers,
-                      callingFlowProperties: callingFlowConfig.callingFlowProperties || {}
-                    })),
-                    PREFIX.CREATE_OBJECT_ASYNC
+                  awaitingStepId: asyncFlowSharedLib.createAwaitingStepId(
+                    hash({
+                      objectType: objType.objectType,
+                      serviceTag: objType.serviceTag,
+                      identifiers: identifiers,
+                      fields: fields,
+                      // correlationIds: _izContext.correlationIds.get("id")
+                    }),
+                    PREFIX.updateNode
                   ),
-                  //(<additionalAttributeCreateNode>)
+                  //(<additionalAttributes>)
                   additionalAttributes: {}
-                  //(</additionalAttributeCreateNode>)
-                },
-              );
-
+                  //(</additionalAttributes>)
+                }
+              )
               _izContext.logger.debug("awaitingStepIds", awaitingStepIds)
 
               if (awaitingStepIds.length) {

package/src/TemplateData/IntTest/generateTests/events/data.js

@@ -41,7 +41,9 @@ async function data(_izContext, allIntTestConfig, srcPath) {
   for (const intTest of allIntTestConfig) {
     for (const [testTag, config] of Object.entries(intTest)) {
       // console.log(testTag, config)
-      for (const eachStage of config.testStages) {
+      for (let stageIdx = 0; stageIdx < config.testStages.length; stageIdx++) {
+        let eachStage = config.testStages[stageIdx];
+
         let inputEventTag = eachStage.eventTag;
         let outputEventTag = `Output_${inputEventTag}`;
 
@@ -57,6 +59,10 @@ async function data(_izContext, allIntTestConfig, srcPath) {
           )
         };
 
+        if (stageIdx === 0) {
+          inputConfig.snsSqsTrigger = true
+        }
+
         let outputConfig = {
           forStageMatching: true,
           ...setEvent(
@@ -106,6 +112,7 @@ async function data(_izContext, allIntTestConfig, srcPath) {
             });
           }
         }
+
         createEventSources.push({
           templatePath: templatePath,
           templateData: {
@@ -130,7 +137,7 @@ async function data(_izContext, allIntTestConfig, srcPath) {
       }
     }
   }
-
+  console.log("createEventSources", JSON.stringify(createEventSources, null, 2))
   return createEventSources;
 }
 

package/src/TemplateData/IntTest/generateTests/events/templateEvents.ejs

@@ -1,9 +1,9 @@
 {
   "<%- inputEventTag %>": <%- JSON.stringify(inputConfig, null, 2) %>,
-  "<%- outputEventTag %>": <%- JSON.stringify(outputConfig, null, 2) %> <% eventDynamos.length ? "," : "" -%>
+  "<%- outputEventTag %>": <%- JSON.stringify(outputConfig, null, 2) %> <%- eventDynamos.length ? "," : "" -%>
   <% eventDynamos.forEach((eventDynamo,idx) => { %>
       "<%- eventDynamo.eventTag %>": <%- JSON.stringify(eventDynamo.event,null,2) %> <% idx < eventDynamos.length - 1 ? ",": "" -%>
-  <% }) %> <% eventInvokes.length ? "," : "" %>
+  <% }) %> <%- eventInvokes.length ? "," : "" -%>
   <% eventInvokes.forEach((invokeEventComponent,index) => { %>
   "<%- invokeEventComponent.inputInvokeName %>": <%- JSON.stringify(invokeEventComponent.inputInvoke,null,2) %>,
   "<%- invokeEventComponent.outputInvokeName %>": <%- JSON.stringify(invokeEventComponent.outputInvoke,null,2) %><%= index < eventInvokes.length - 1 ? ',': "" -%>

package/src/TemplateData/IntTest/generateTests/pathIntTest/data.js

@@ -25,12 +25,17 @@ const { bucketPathForUpload } = uploadIntTest;
 
 async function data(_izContext, srcPath, settings) {
   // console.log('settingsInData', settings);
+  let intTestPaths = [];
+
   let pathIntTestInBuckets = await bucketPathForUpload(
     join(srcPath, `../../src/generateIntegrationTest/${settings.serviceTag}`),
     settings
   );
   // console.log({ pathIntTestInBuckets });
-  let intTestPaths = [];
+  if (!pathIntTestInBuckets || pathIntTestInBuckets.length === 0) {
+    return []
+  }
+
   for (const pathIntTestInBucket of pathIntTestInBuckets) {
     if (pathIntTestInBucket.key.endsWith(".json")) {
       let path = pathIntTestInBucket.key.replace(/(events|tests|resources|dynamoDBSeedDataTags|graphSeedDataTags).json$/, '/');

package/src/TemplateData/IntTest/generateTests/tests/data.js

@@ -158,8 +158,7 @@ async function data(_izContext, allIntTestConfig, srcPath) {
             );
             if (dynamoEventStage.length > 0) {
               // baseIntTest.stage[currentStageIdx]["dynamodbOutputEventIdentifiers"] = dynamoEventStage;
-              stages[currentStageIdx]['dynamodbOutputEventIdentifiers'] =
-                dynamoEventStage;
+              stages[currentStageIdx]['dynamodbOutputEventIdentifiers'] = dynamoEventStage;
             }
           }
 
@@ -174,9 +173,7 @@ async function data(_izContext, allIntTestConfig, srcPath) {
               if (stage.generatedSeedData.hasOwnProperty(generateSeedType)) {
                 // baseIntTest.stage[currentStageIdx]["generateSeedDatas"] = {
                 stages[currentStageIdx]['generateSeedDatas'] = {
-                  [generateSeedType]: [
-                    ...stage.generatedSeedData[generateSeedType]
-                  ]
+                  [generateSeedType]: [...stage.generatedSeedData[generateSeedType]]
                 };
               }
             }

package/src/TemplateData/IntTest/libs/libs.js

@@ -107,6 +107,7 @@ function setEvent(input, settings = {}) {
       }
 
       if (isEqual.includes(key)) {
+        field.forStageMatching = true;
         field.isEqual = true;
       }
 
@@ -301,7 +302,6 @@ function createEventCaseByHandler(handler, messageAttributes = {}) {
     [HANDLER.hdrDsq]: { DirectSqs: true },
     [HANDLER.hdrInv]: {},
     [HANDLER.hdrSqs]: {
-      snsSqsTrigger: true,
       ...(messageAttributes && Object.keys(messageAttributes).length > 0
         ? { messageAttributes: setEventMessageAttributes(messageAttributes) }
         : {})

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

@@ -45,13 +45,7 @@ const {
 
 const templatePath = path.join(__dirname, 'template.ejs');
 
-const createExternalLambdaRole = async (
-  _izContext,
-  allObjSchemas,
-  allRelSchemas,
-  allLocalFlowSchemas,
-  srcPath
-) => {
+const createExternalLambdaRole = async (_izContext, allObjSchemas, allRelSchemas, allLocalFlowSchemas, srcPath) => {
   // console.log("allRelationshipSchemas", allRelationshipSchemas);
   const externalLambdaIamRoleArray = [];
   // per action external lambda role

package/src/TemplateData/flowSchema/flowSchemaMainFunction/data.js

@@ -98,7 +98,7 @@ async function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
       tableName,
       flowSchemaComplete,
       triggerType,
-      queueName: `${createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig('iz_serviceTag'), flowTag: flowSchema.flowTag })}_Main`
+      queueName: `${createFlowTypeConcat(_izContext, { serviceTag: getLocalConfig('iz_serviceTag'), flowTag: upperCase(flowSchema.flowTag) })}_Main`
     },
     setting: {
       savePath: path.join(

package/src/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComponent/functionYaml/data.js

@@ -63,7 +63,6 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = 'Process' + upperCase(flowSchema.flowTag);
   let handlerType = upperCase(HANDLER.hdrSqs);
   let additionalResourcePermission = defaultIamRolePerAction();
-  let route = upperCase(flowSchema.flowTag);
   let queueName = upperCase(flowSchema.flowTag) + handlerType;
   let objectSchema;
 

package/src/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComponent/handler/DsqHandlerTemplate.ejs

@@ -28,7 +28,21 @@ let perRecordsValidatorSchema = {
   //(<validatorSchema>)
   //(</validatorSchema>)
 }
-middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
+
+middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
+  {
+    type: "object",
+    required: ['body', 'messageAttributes'],
+    properties: {
+      body: {
+        type: 'object',
+      },
+      messageAttributes: {
+        type: 'object'
+      }
+    }
+  }
+));
 
 export const main = middleware.wrap(async (event, context) => {
 

package/src/TemplateData/flowSchema/flowSchemaOwnTopic/FlowSchemaComponent/handler/template.ejs

@@ -22,7 +22,7 @@ import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 import { postToConnection } from '../../../libs/source/GenerateCodeLibs.js';
-import A from './A_Main.js';
+import <%- functionName %> from './<%- functionName %>_Main.js';
 import { utils, getObjectSchema } from "@izara_project/izara-core-library-service-schemas";
 const { createFlowTypeConcat } = utils
 

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

@@ -22,7 +22,7 @@ const __dirname = path.dirname(__filename);
 import consts from '../../../../libs/Consts.js';
 import utils from '../../../../libs/Utils.js';
 
-const { SOURCE_PATH, SAVE_FILE_NAME } = consts;
+const { SOURCE_PATH, SAVE_FILE_NAME, HANDLER } = consts;
 const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = utils;
 
 const snsTemplatePath = path.join(
@@ -64,6 +64,15 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
 
   let defaultDsqQueueDataList = [];
 
+  if (flowSchema.statusType === 'triggerCache') {
+    defaultDsqQueueDataList.push(
+      {
+        queueName: upperCase(flowSchema.flowTag) + upperCase(HANDLER.hdrDsq)
+      }
+    )
+
+  }
+
   // if (flowSchema.outputTopic) {
   //   if (flowSteps.includes("Out")) {
   //     if (flowSchema.outputTopic) {

package/src/TemplateData/flowSchema/triggerCacheComponent/checkTriggerCacheComplete/handler/data.js

@@ -41,11 +41,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName =
     'CheckTriggerCache' + upperCase(flowSchema.flowTag) + 'Complete';
   let handlerType = upperCase(HANDLER.hdrSqs);
-  let queueName =
-    'CheckTriggerCache' +
-    upperCase(flowSchema.flowTag) +
-    'Complete' +
-    handlerType;
+  let queueName = 'CheckTriggerCache' + upperCase(flowSchema.flowTag) + 'Complete' + handlerType;
 
   return {
     templatePath: templatePath,

package/src/TemplateData/flowSchema/triggerCacheComponent/processTriggerCache/handler/data.js

@@ -58,12 +58,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
       queueName
     },
     setting: {
-      savePath: path.join(
-        srcPath,
-        SOURCE_PATH.flowSchema,
-        upperCase(flowSchema.flowTag),
-        'source/'
-      ),
+      savePath: path.join(srcPath, SOURCE_PATH.flowSchema, upperCase(flowSchema.flowTag), 'source/'),
       saveFileName: `${upperCase(functionName)}_${upperCase(handlerType)}`,
       fileExtension: '.js',
       isAppend: true

package/src/TemplateData/flowSchema/triggerCacheComponent/processTriggerCache/handler/template.ejs

@@ -29,7 +29,21 @@ let perRecordsValidatorSchema = {
   //(<validatorSchema>)
   //(</validatorSchema>)
 }
-middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
+
+middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
+  {
+    type: "object",
+    required: ['body', 'messageAttributes'],
+    properties: {
+      body: {
+        type: 'object',
+      },
+      messageAttributes: {
+        type: 'object'
+      }
+    }
+  }
+));
 
 export const main = middleware.wrap(async (event, context) => {
 

package/src/TemplateData/flowSchema/triggerCacheComponent/triggerCacheComplete/handler/data.js

@@ -44,8 +44,7 @@ function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName =
     'TriggerCache' + upperCase(flowSchema.flowTag) + 'Complete';
   let handlerType = upperCase(HANDLER.hdrSqs);
-  let queueName =
-    'TriggerCache' + upperCase(flowSchema.flowTag) + 'Complete' + handlerType;
+  let queueName = 'TriggerCache' + upperCase(flowSchema.flowTag) + 'Complete' + handlerType;
 
   return {
     templatePath: templatePath,

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

@@ -22,8 +22,8 @@ import snsSharedLib from '@izara_project/izara-core-library-sns';
 import { sns } from '@izara_project/izara-core-library-external-request';
 import _ from 'lodash';
 import { objectHash as hash } from '@izara_project/izara-shared-core';
-import { consts as generateCodeConsts } from '@izara_project/izara-code-generate-code-service';
-const { TOPIC_NAME_GENERATE_CODE, } = generateCodeConsts;
+import { consts } from '@izara_project/izara-core-library-service-schemas';
+const { TOPIC_NAME_GENERATE_CODE } = consts;
 const PREFIX = {
   CREATE_OBJECT_ASYNC: "createObjectAsync",
   CREATE_OBJECT_ASYNC_COMPLETE: "createObjectAsyncComplete"
@@ -41,7 +41,7 @@ const PREFIX = {
  * @param {*} passBackProperties
  */
 
-export default async function createObjectComplete (
+export default async function createObjectComplete(
   _izContext,
   returnValue,
   status,

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

@@ -21,8 +21,8 @@ import snsSharedLib from '@izara_project/izara-core-library-sns';
 
 import { sns } from "@izara_project/izara-core-library-external-request";
 
-import { consts as generateCodeConsts } from '@izara_project/izara-code-generate-code-service';
-const { TOPIC_NAME_GENERATE_CODE, } = generateCodeConsts;
+import { consts } from '@izara_project/izara-core-library-service-schemas';
+const { TOPIC_NAME_GENERATE_CODE } = consts;
 
 //(<optionalRequire>)
 //(</optionalRequire>)

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

@@ -20,9 +20,10 @@ import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow
 import snsSharedLib from '@izara_project/izara-core-library-sns';
 
 import { sns } from "@izara_project/izara-core-library-external-request";
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code'
 
-const { TOPIC_NAME_GENERATE_CODE, PREFIX } = generateCodeConsts;
+import { consts } from '@izara_project/izara-core-library-service-schemas';
+const { TOPIC_NAME_GENERATE_CODE, PREFIX } = consts;
+
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 
 import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow';

package/src/TemplateData/perActionComplete/update/mainFunction/template.ejs

@@ -24,8 +24,8 @@ import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-f
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import { sns } from "@izara_project/izara-core-library-external-request";
 
-import { consts as generateCodeConsts } from '@izara_project/izara-code-generate-code-service';
-const { TOPIC_NAME_GENERATE_CODE, } = generateCodeConsts;
+import { consts } from '@izara_project/izara-core-library-service-schemas';
+const { TOPIC_NAME_GENERATE_CODE } = consts;
 
 //(<optionalRequire>)
 //(</optionalRequire>)

package/src/TemplateData/relationshipPerAction/changeRelationship/action/mainFunction/template.ejs

@@ -42,12 +42,11 @@ const { getGraphServiceTagWithCache } = serviceConfig;
 
 const { findLinksByObjTypes } = relSchemaLib;
 
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
 const {
   PREFIX,
   TOPIC_NAME_GENERATE_CODE,
   TOPIC_NAME_GRAPH_HANDLER
-} = generateCodeConsts;
+} = consts;
 
 import { consts as coreConsts } from '@izara_project/izara-core-library-core';
 

package/src/TemplateData/relationshipPerAction/changeRelationship/complete/handler/sqs/template.ejs

@@ -99,7 +99,7 @@ export const main = middleware.wrap(async (event, context) => {
       // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
       let recordPromise = recordHandlerSharedLib.recordHandler(
         record,                                                 // one record will send to mainFunction
-        changeRelationshipComplete.changeRelationshipComplete,  // mainFunction that need to invoke.
+        changeRelationshipComplete,  // mainFunction that need to invoke.
         "ChangeRelationshipComplete",                           // queue name that need to retry or send to dlq
         passOnProperties,                                       // all parameters that mainFunction needed.
       );

package/src/TemplateData/relationshipPerAction/changeRelationship/complete/mainFunction/template.ejs

@@ -24,14 +24,13 @@ 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 } from '@izara_project/izara-core-library-service-schemas';
+import { utils, consts } from '@izara_project/izara-core-library-service-schemas';
 const { createLinkTypeId } = utils;
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
 
 const {
   TOPIC_NAME_GENERATE_CODE,
   PREFIX
-} = generateCodeConsts;
+} = consts;
 
 //(<optionalRequire>)
 //(</optionalRequire>)
@@ -56,8 +55,8 @@ export default async function changeRelationshipComplete(
     // start create awaitingStepId
     const linkTypeId = createLinkTypeId(
       _izContext,
-      returnValue.requestParams.fromObject.objType,
-      returnValue.requestParams.toObject.objType,
+      returnValue.requestParams.firstObject.objType,
+      returnValue.requestParams.secondObject.objType,
       returnValue.requestParams.newRelType,
       returnValue.requestParams.oldRelTypeAndDirection.relationshipDirection
     );
@@ -67,8 +66,8 @@ export default async function changeRelationshipComplete(
         linkTypeId,
         graphServiceTag: graphServiceTag,
         callingFlowProperties: passBackProperties.passBackProperties.parentPassBackProperties.callingFlowProperties || {},
-        firstObject: returnValue.requestParams.fromObject,
-        secondObject: returnValue.requestParams.toObject,
+        firstObject: returnValue.requestParams.firstObject,
+        secondObject: returnValue.requestParams.secondObject,
         oldRelTypeAndDirection: returnValue.requestParams.oldRelTypeAndDirection,
         newRelType: returnValue.requestParams.newRelType,
       }), // hash id
@@ -98,8 +97,8 @@ export default async function changeRelationshipComplete(
           _izContext.logger.debug("finished all awaitingStep");
 
           let createCompleteMsg = {
-            firstObject: returnValue.requestParams.fromObject,
-            secondObject: returnValue.requestParams.toObject,
+            firstObject: returnValue.requestParams.firstObject,
+            secondObject: returnValue.requestParams.secondObject,
             relType: returnValue.requestParams.relType,
             oldRelTypeAndDirection: returnValue.requestParams.oldRelTypeAndDirection,
             newRelType: returnValue.requestParams.newRelType,

package/src/TemplateData/relationshipPerAction/create/action/mainFunction/template.ejs

@@ -40,12 +40,11 @@ const {
   getGraphServiceTagWithCache
 } = serviceConfig;
 
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
 const {
   PREFIX,
   TOPIC_NAME_GENERATE_CODE,
   TOPIC_NAME_GRAPH_HANDLER
-} = generateCodeConsts;
+} = consts;
 
 
 //(<optionalRequire>)

package/src/TemplateData/relationshipPerAction/create/complete/mainFunction/template.ejs

@@ -24,14 +24,13 @@ 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 } from '@izara_project/izara-core-library-service-schemas';
+import { utils, consts } from '@izara_project/izara-core-library-service-schemas';
 const { createLinkTypeId } = utils;
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
 
 const {
   TOPIC_NAME_GENERATE_CODE,
   PREFIX
-} = generateCodeConsts;
+} = consts;
 
 //(<optionalRequire>)
 //(</optionalRequire>)

package/src/TemplateData/relationshipPerAction/delete/action/mainFunction/template.ejs

@@ -40,12 +40,11 @@ const {
   getGraphServiceTagWithCache
 } = serviceConfig;
 
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
 const {
   PREFIX,
   TOPIC_NAME_GENERATE_CODE,
   TOPIC_NAME_GRAPH_HANDLER
-} = generateCodeConsts;
+} = consts;
 
 //(<optionalRequire>)
 //(</optionalRequire>)

package/src/TemplateData/relationshipPerAction/delete/complete/mainFunction/template.ejs

@@ -24,14 +24,13 @@ 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 } from '@izara_project/izara-core-library-service-schemas';
+import { utils, consts } from '@izara_project/izara-core-library-service-schemas';
 const { createLinkTypeId } = utils;
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
 
 const {
   TOPIC_NAME_GENERATE_CODE,
   PREFIX
-} = generateCodeConsts;
+} = consts;
 
 //(<optionalRequire>)
 //(</optionalRequire>)

package/src/TemplateData/relationshipPerAction/get/action/mainFunction/template.ejs

@@ -25,7 +25,7 @@ import snsSharedLib from "@izara_project/izara-core-library-sns";
 import asyncFlowSharedLib from "@izara_project/izara-core-library-asynchronous-flow";
 import dynamodbSharedLib from "@izara_project/izara-core-library-dynamodb";
 
-import { sns,lambda } from "@izara_project/izara-core-library-external-request";
+import { sns, lambda } from "@izara_project/izara-core-library-external-request";
 
 import { getObjectSchema, utils, serviceConfig, consts, relSchemaLib, identifiersObject } from '@izara_project/izara-core-library-service-schemas'
 const { findLinksByObjTypes } = relSchemaLib;
@@ -43,12 +43,11 @@ const {
   getGraphServiceTagWithCache
 } = serviceConfig;
 
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
 const {
   PREFIX,
   TOPIC_NAME_GENERATE_CODE,
   TOPIC_NAME_GRAPH_HANDLER
-} = generateCodeConsts;
+} = consts;
 
 import { consts as coreConsts } from '@izara_project/izara-core-library-core';
 

package/src/TemplateData/relationshipPerAction/get/complete/mainFunction/template.ejs

@@ -24,14 +24,13 @@ 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 } from '@izara_project/izara-core-library-service-schemas';
+import { utils, consts } from '@izara_project/izara-core-library-service-schemas';
 const { createLinkTypeId } = utils;
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
 
 const {
   TOPIC_NAME_GENERATE_CODE,
   PREFIX
-} = generateCodeConsts;
+} = consts;
 
 //(<optionalRequire>)
 //(</optionalRequire>)

package/src/TemplateData/relationshipPerAction/moveRelationship/action/mainFunction/template.ejs

@@ -24,7 +24,7 @@ import snsSharedLib from "@izara_project/izara-core-library-sns";
 import asyncFlowSharedLib from "@izara_project/izara-core-library-asynchronous-flow";
 import dynamodbSharedLib from "@izara_project/izara-core-library-dynamodb";
 
-import { sns,lambda } from "@izara_project/izara-core-library-external-request";
+import { sns, lambda } from "@izara_project/izara-core-library-external-request";
 
 import { getObjectSchema, utils, serviceConfig, consts, relSchemaLib, identifiersObject } from '@izara_project/izara-core-library-service-schemas'
 const { findLinksByObjTypes } = relSchemaLib;
@@ -42,12 +42,11 @@ const {
   getGraphServiceTagWithCache
 } = serviceConfig;
 
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
 const {
   PREFIX,
   TOPIC_NAME_GENERATE_CODE,
   TOPIC_NAME_GRAPH_HANDLER
-} = generateCodeConsts;
+} = consts;
 
 import { consts as coreConsts } from '@izara_project/izara-core-library-core';
 

package/src/TemplateData/relationshipPerAction/moveRelationship/complete/mainFunction/template.ejs

@@ -24,14 +24,13 @@ 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 } from '@izara_project/izara-core-library-service-schemas';
+import { utils, consts } from '@izara_project/izara-core-library-service-schemas';
 const { createLinkTypeId } = utils;
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
 
 const {
   TOPIC_NAME_GENERATE_CODE,
   PREFIX
-} = generateCodeConsts;
+} = consts;
 
 //(<optionalRequire>)
 //(</optionalRequire>)

package/src/TemplateData/relationshipPerAction/update/action/mainFunction/template.ejs

@@ -25,7 +25,7 @@ import snsSharedLib from "@izara_project/izara-core-library-sns";
 import asyncFlowSharedLib from "@izara_project/izara-core-library-asynchronous-flow";
 import dynamodbSharedLib from "@izara_project/izara-core-library-dynamodb";
 
-import { sns,lambda } from "@izara_project/izara-core-library-external-request";
+import { sns, lambda } from "@izara_project/izara-core-library-external-request";
 
 import { getObjectSchema, utils, serviceConfig, consts, relSchemaLib, identifiersObject } from '@izara_project/izara-core-library-service-schemas'
 const { findLinksByObjTypes } = relSchemaLib;
@@ -43,12 +43,11 @@ const {
   getGraphServiceTagWithCache
 } = serviceConfig;
 
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
 const {
   PREFIX,
   TOPIC_NAME_GENERATE_CODE,
   TOPIC_NAME_GRAPH_HANDLER
-} = generateCodeConsts;
+} = consts;
 
 import { consts as coreConsts } from '@izara_project/izara-core-library-core';
 

package/src/TemplateData/relationshipPerAction/update/complete/mainFunction/template.ejs

@@ -24,14 +24,13 @@ 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 } from '@izara_project/izara-core-library-service-schemas';
+import { utils, consts } from '@izara_project/izara-core-library-service-schemas';
 const { createLinkTypeId } = utils;
-import { consts as generateCodeConsts } from '@izara_project/izara-core-generate-service-code';
 
 const {
   TOPIC_NAME_GENERATE_CODE,
   PREFIX
-} = generateCodeConsts;
+} = consts;
 
 //(<optionalRequire>)
 //(</optionalRequire>)

package/src/libs/Consts.js

@@ -278,14 +278,6 @@ const SEED_DATA_TAG = {
   graphSeedDataTags: "graphSeedDataTags"
 }
 
-
-const FLOW_SCHEMA_EVENT_TYPE = {
-  s3: "s3",
-  ownTopic: "ownTopic",
-  extTopic: "extTopic",
-  eventBridge: "eventBridge",
-}
-
 const DEFAULT_LAMBDA_ROLE_PER_ACTION = {
   [ACTIONS.create]: {
     dynamoDbPermission: 'PutItem',
@@ -417,7 +409,6 @@ export default {
   ADD_ON_DATA_STRUCTURE_TYPE,
   ATTRIBUTE_TAG,
   PROPERTY_VALUE_TAG,
-  FLOW_SCHEMA_EVENT_TYPE,
   GENERATE_SEED_DATA_TYPE,
   SEED_DATA_TAG,
   TOPIC_NAME_GENERATE_CODE,