@izara_project/izara-core-generate-service-code 1.0.48 → 1.0.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "Code for locally generating per service files",
   "homepage": "https://bitbucket.org/izara-core-support-services/izara-core-support-services-generate-service-code#readme",
   "repository": {

package/src/generateResources/IntTest/generateResources/generateResources.js

@@ -23,8 +23,8 @@ const __dirname = path.dirname(__filename);
 import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
 import util from '#libs/Utils.js';
 import consts from '#libs/Consts.js';
-import intTestLibs from '#libs/Libs.js';
-const { directoryPath } = intTestLibs;
+import libs from '../libs/libs';
+const { directoryPath } = libs;
 const { getLocalConfig } = util;
 const templatePath = path.join(__dirname, './templateResources.ejs');
 

package/src/generateResources/IntTest/generateTests/events/events.js

@@ -23,7 +23,7 @@ const templatePath = path.join(__dirname, './templateEvents.ejs');
 import utils from '#libs/Utils.js';
 const { getLocalConfig } = utils;
 
-import libs from '#libs/Libs.js';
+import libs from '../../libs/libs';
 const {
   setEvent,
   createEventCaseByHandler,

package/src/generateResources/IntTest/generateTests/generateTemplate.js

@@ -20,7 +20,7 @@ import generateEvent from './events/events.js';
 import generateTest from './tests/tests.js';
 import generatePathIntTest from './pathIntTest/pathIntTest.js';
 // import generateBashScript from './bashScript/data.js'
-import libs from '#libs/Libs.js';
+import libs from '../libs/libs.js';
 const { getIntTestConfig } = libs;
 import utils from '#libs/Utils.js';
 const { getLocalConfig } = utils;
@@ -40,7 +40,7 @@ async function generateCodeWithTemplate(_izContext, savePath, settings) {
     // console.log("oo:", process.env.iz_resourcePrefix);
     let allIntTestConfig = await getIntTestConfig(
       _izContext,
-      join(savePath, './libs/')
+      'generateIntegrationTest/libs/'
     );
     // console.log({ settings })
     const event = await generateEvent(_izContext, allIntTestConfig, savePath);

package/src/generateResources/IntTest/generateTests/tests/tests.js

@@ -24,7 +24,7 @@ const templatePath = path.join(__dirname, './templateTests.ejs');
 import utils from '#libs/Utils.js';
 const { getLocalConfig } = utils;
 
-import libs from '#libs/Libs.js';
+import libs from '../../libs/libs';
 const {
   createTestFunctionName,
   getHandlerFromEventTag,

package/src/generateResources/IntTest/libs/libs.js

@@ -10,44 +10,51 @@ function lowercaseFirst(str) {
   return str[0].toLowerCase() + str.slice(1);
 }
 
-function directoryPath(dirPath) {
-  let result = [];
+function directoryPath(dirPath, result = []) {
+  if (!fs.existsSync(dirPath)) return {};
   const items = fs.readdirSync(dirPath);
+
   for (let item of items) {
     const fullPath = path.join(dirPath, item);
     const stat = fs.statSync(fullPath);
 
     if (stat.isDirectory()) {
-      directoryPath(fullPath, result); // recursion
+      directoryPath(fullPath, result); // ✅ ใช้ result เดียวกัน
     } else if (stat.isFile()) {
       if (
-        !fullPath.includes('shared-resource.yml') &&
-        !fullPath.includes('core-function.yml')
+        !fullPath.includes("shared-resource.yml") &&
+        !fullPath.includes("core-function.yml")
       ) {
-        if (fullPath.endsWith('.yml')) {
+        if (fullPath.endsWith(".yml")) {
           result.push(fullPath);
         } else {
-          console.log('Skipped File:', fullPath);
+          console.log("Skipped File:", fullPath);
         }
       }
     }
   }
 
   let functionComponent = {};
+
   for (let ymlFilesPath of result) {
-    const fileContent = fs.readFileSync(ymlFilesPath, 'utf8');
+    const fileContent = fs.readFileSync(ymlFilesPath, "utf8");
     const parsedYaml = yaml.parse(fileContent);
+
     for (const component of Object.values(parsedYaml)) {
       if (component.handler && component.name) {
         const clearName = component.name.replace(
-          '${self:custom.iz_resourcePrefix}',
-          ''
+          "${self:custom.iz_resourcePrefix}",
+          ""
         );
-        const clearMain = component.handler.replace(/\.main$/, '');
-        Object.assign(functionComponent, { [clearName]: clearMain });
+        const clearMain = component.handler.replace(/\.main$/, "");
+
+        Object.assign(functionComponent, {
+          [clearName]: clearMain,
+        });
       }
     }
   }
+
   return functionComponent;
 }
 
@@ -386,10 +393,11 @@ function createResourceName(eventTag) {
 }
 
 async function getIntTestConfig(_izContext, intTestPath) {
-  return await getDataFromPath(
+  return await getObjectSchema.getDataFromPath(
     _izContext,
-    'GenerateIntegrationTestConfig.js',
-    intTestPath
+    intTestPath,                 // :white_check_mark: ใช้ relative
+    path.join(process.cwd(), 'src/'),           // :white_check_mark: root ที่ถูก
+    { exceptFileName: 'saveConfig' }
   );
 }
 
@@ -427,5 +435,6 @@ export default {
   getHandlerFromTestTag,
   createResourceName,
   setInvokeTest,
-  getIntTestConfig
+  getIntTestConfig,
+  buildInvokeStages
 };

package/src/generators/fromObjectSchema/endpoint/main/create/template.ejs

@@ -204,15 +204,17 @@ export async function createMainLogical(
            createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail));
           _izContext.logger.debug('objInstanceFull before send to Graph', objInstanceFullForGraph);
 
+            //(<additionalAttributeCreateNode>)
+            const additionalAttributes = {};
+            //(</additionalAttributeCreateNode>)
+
           const records = allAwaitingStepsId.length === 0 ? listOfRecords : [];
           allAwaitingStepsId.push({
             awaitingStepId: await asyncFlowSharedLib.createAwaitingStepId(
               parentFlowId,
               PREFIX.CREATE_OBJECT_ASYNC
             ),
-            //(<additionalAttributeCreateNode>)
-            additionalAttributes: { listOfRecords: records }
-            //(</additionalAttributeCreateNode>)
+            additionalAttributes: { listOfRecords: records ,additionalAttributes: additionalAttributes}
           });
 
           listOfObjectForCreates.push({
@@ -239,9 +241,7 @@ export async function createMainLogical(
               parentFlowId,
               PREFIX.CREATE_OBJECT_EXTERNAL_TOPIC
             ),
-            //(<additionalAttributeCreateExternalTopic>)
             additionalAttributes: {}
-            //(</additionalAttributeCreateExternalTopic>)
           });
 
           Object.assign(objInstanceFullForExternalTopic, { parentFlowId: parentFlowId });
@@ -260,7 +260,7 @@ export async function createMainLogical(
       _izContext,
       allAwaitingStepsId,
       asyncFlowSharedLib.createPendingStepId(
-        hash({ objType, identifiers: objInstanceFull.identifiers }),
+        _izContext.uniqueRequestId,
         PREFIX.CREATE_OBJECT_ASYNC_COMPLETE
       )
     );
@@ -326,7 +326,7 @@ export async function createMainLogical(
       await asyncFlowSharedLib.clearAllAwaitingSteps(
         _izContext,
         asyncFlowSharedLib.createPendingStepId(
-          hash({ objType, identifiers: objInstanceFull.identifiers }),
+          _izContext.uniqueRequestId,
           PREFIX.CREATE_OBJECT_ASYNC_COMPLETE
         )
       );
@@ -610,7 +610,7 @@ export default async function createMain(
         _izContext,
         awaitingMultipleStepIds,
         asyncFlowSharedLib.createPendingStepId(
-          hash(objInstanceFull.identifiers),
+          _izContext.uniqueRequestId,
           'beforeLogical_<%= objectType %>'
         )
       );

package/src/generators/fromObjectSchema/endpoint/main/update/template.ejs

@@ -187,6 +187,10 @@ export async function updateMainLogical(
           //(<beforeUpdateNode>)
           //(</beforeUpdateNode>)
 
+          //(<additionalAttributes>)
+          const additionalAttributes = {}
+          //(</additionalAttributes>)
+
 
           records = awaitingStepIds.lenght === 0 ? listOfRecords : [];
           awaitingStepIds.push({
@@ -194,16 +198,14 @@ export async function updateMainLogical(
               parentFlowId,
               PREFIX.updateNode
             ),
-            //(<additionalAttributes>)
-            additionalAttributes: { listOfRecords: records }
-            //(</additionalAttributes>)
+            additionalAttributes: { listOfRecords: records, additionalAttributes: additionalAttributes }
           });
 
           if (awaitingStepIds.length) {
             const awaitingMultipleStep = await asyncFlowSharedLib.createAwaitingMultipleStepsWithAdditionalAttributes(
               _izContext,
               awaitingStepIds,
-              asyncFlowSharedLib.createPendingStepId(hash({ identifiers, fields }))
+              asyncFlowSharedLib.createPendingStepId(_izContext.uniqueRequestId)
             );
             _izContext.logger.debug('awaitingMultipleStep', awaitingMultipleStep);
           }
@@ -444,7 +446,7 @@ export default async function updateMain(
           _izContext,
           awaitingMultipleStepIds,
           asyncFlowSharedLib.createPendingStepId(
-            hash(identifiers),
+            _izContext.uniqueRequestId,
             'beforeLogical_<%= objectType %>'
           )
         );

package/src/generators/fromObjectSchema/endpointComplete/create/mainFunction/template.ejs

@@ -286,7 +286,7 @@ export default async function createObjectComplete(
         await asyncFlowSharedLib.removeAwaitingMultipleStep(
           _izContext,
           awaitingStepId,
-          pendingStepId,
+          recordAwaitingStep.pendingStepId,
           errorsFound,
         );
       }),

package/src/generators/fromObjectSchema/relationship/changeRelationship/action/mainFunction/template.ejs

@@ -316,15 +316,7 @@ export default async function <%- functionName %> (
         _izContext,
         awaitingStepIds, // awaitingStepIds
         asyncFlowSharedLib.createPendingStepId( // pendingStepId
-          hash({
-            linkTypeId,
-            correlationId: _izContext.correlationIds.get("id"),
-            callingFlowProperties: callingFlowConfig.callingFlowProperties || {},
-            firstObject,
-            secondObject,
-            oldRelTypeAndDirection,
-            newRelType,
-          }), // hash id
+          _izContext.uniqueRequestId, // hash id
           PREFIX.changeRel // prefix, use constant further
         )
       );

package/src/generators/fromObjectSchema/relationship/create/action/mainFunction/template.ejs

@@ -337,15 +337,7 @@ export default async function createRelationship(
         _izContext,
         awaitingStepIds, // awaitingStepIds
         asyncFlowSharedLib.createPendingStepId( // pendingStepId
-          hash({
-            linkTypeId,
-            relationshipProperties,
-            correlationId: _izContext.correlationIds.get("id"),
-            callingFlowProperties: callingFlowConfig.callingFlowProperties || {},
-            firstObject: firstObject,
-            secondObject: secondObject,
-            relType: relType
-          }), // hash id
+          _izContext.uniqueRequestId, // hash id
           PREFIX.createRel // prefix, use constant further
         )
       );

package/src/generators/fromObjectSchema/relationship/delete/action/mainFunction/template.ejs

@@ -268,7 +268,7 @@ export default async function deleteRelationship(
         _izContext,
         awaitingStepIds, // awaitingStepIds
         asyncFlowSharedLib.createPendingStepId( // pendingStepId
-          hash({ linkTypeId, correlationId: _izContext.correlationIds.get("id") }), // hash id
+          _izContext.uniqueRequestId, // hash id
           PREFIX.deleteRel // prefix, use constant further
         )
       );

package/src/generators/fromObjectSchema/relationship/moveRelationship/action/mainFunction/template.ejs

@@ -308,17 +308,7 @@ export default async function moveRelationship(
         _izContext,
         awaitingStepIds, // awaitingStepIds
         asyncFlowSharedLib.createPendingStepId( // pendingStepId
-          hash({
-            linkTypeId,
-            correlationId: _izContext.correlationIds.get("id"),
-            callingFlowProperties: callingFlowConfig.callingFlowProperties || {},
-            firstObject,
-            secondObject,
-            relType,
-            relationshipDirection,
-            relationshipProperties,
-            moveObject
-          }), // hash id
+          _izContext.uniqueRequestId, // hash id
           PREFIX.changeRel // prefix, use constant further
         )
       );

package/src/generators/fromObjectSchema/relationship/update/action/mainFunction/template.ejs

@@ -314,7 +314,7 @@ export default async function updateRelationship(
           _izContext,
           awaitingStepIds, // awaitingStepIds
           asyncFlowSharedLib.createPendingStepId( // pendingStepId
-            hash({ linkTypeId, relId, relationshipProperties, correlationId: _izContext.correlationIds.get("id") }), // hash id
+            _izContext.uniqueRequestId, // hash id
             PREFIX.updateRel // prefix, use constant further
           )
         );

package/src/generators/fromPlugIn/firstFlowStep/mainFunction/templateByConfig/awaitingSteps.ejs

@@ -14,20 +14,7 @@ await asyncFlowSharedLib.createAwaitingMultipleStepsWithAdditionalAttributes(
   _izContext,
   allAwaitingStepsId,
   asyncFlowSharedLib.createPendingStepId(
-    hash({
-      <% if (mainObjType) { -%>
-          objType: {
-            serviceTag: "<%- mainObjType.serviceTag %>",
-            objectType: "<%- mainObjType.objectType %>"
-          },
-          //(<createPendingStepIds>)
-          //(</createPendingStepIds>)
-      <% } else { -%>
-        xCorrelationId: _izContext.correlationIds.xCorrelationId,
-        //(<createPendingStepIds>)
-        //(</createPendingStepIds>)
-      <% } %>
-     }),
+    _izContext.awsRequestId,
     "<%- upperFlowTag %><%- upperFlowStepName %><%- upperHandleLogic %>"
   )
 );
@@ -52,6 +39,3 @@ await asyncFlowSharedLib.createAwaitingMultipleStepsWithAdditionalAttributes(
       )
     )
   );
-
-
-

package/src/generators/fromPlugIn/index.js

@@ -106,7 +106,7 @@ async function generatePlunIg(
           flowStepName,
           flowTag,
           resourceApis,
-          hookTagSetting: `${flowSchema.flowTag}FunctionSetting`,
+          hookTagSetting: `${flowSchema.flowTag}${upperCase(flowStepName)}FunctionSetting`,
           functionName: upperCase(flowSchema.flowTag) + upperCase(flowStepName),
           roleName
         };
@@ -136,8 +136,8 @@ async function generatePlunIg(
           event: resourceNames(
             RESOURCE_CLASSES.sqs,
             upperCase(flowSchema.flowTag) +
-              upperCase(flowStepName) +
-              upperCase(data.handlerType)
+            upperCase(flowStepName) +
+            upperCase(data.handlerType)
           ),
           queueName:
             upperCase(flowSchema.flowTag) +
@@ -183,9 +183,9 @@ async function generatePlunIg(
           data.event = resourceNames(
             RESOURCE_CLASSES.sqs,
             upperCase(flowSchema.flowTag) +
-              upperCase(flowStepName) +
-              upperCase(data.handleLogic) +
-              upperCase(data.handlerType)
+            upperCase(flowStepName) +
+            upperCase(data.handleLogic) +
+            upperCase(data.handlerType)
           );
           const generateLambdaFlowStepByConfig = buildFlowStepResourceByConfig(
             _izContext,
@@ -405,9 +405,9 @@ function resolveHandlerConfig(
       createSqsResource([
         upperCase(flowTag) + upperCase(flowStepName) + upperCase(handler),
         upperCase(flowTag) +
-          upperCase(flowStepName) +
-          upperCase(handler) +
-          'DLQ'
+        upperCase(flowStepName) +
+        upperCase(handler) +
+        'DLQ'
       ])
     );
   } else if (events.includes('extTopic')) {
@@ -417,9 +417,9 @@ function resolveHandlerConfig(
       createSqsResource([
         upperCase(flowTag) + upperCase(flowStepName) + upperCase(handler),
         upperCase(flowTag) +
-          upperCase(flowStepName) +
-          upperCase(handler) +
-          'DLQ'
+        upperCase(flowStepName) +
+        upperCase(handler) +
+        'DLQ'
       ])
     );
   } else if (events.includes('lambdaSyncInv')) {
@@ -439,9 +439,9 @@ function resolveHandlerConfig(
       createSqsResource([
         upperCase(flowTag) + upperCase(flowStepName) + upperCase(handler),
         upperCase(flowTag) +
-          upperCase(flowStepName) +
-          upperCase(handler) +
-          'DSQ'
+        upperCase(flowStepName) +
+        upperCase(handler) +
+        'DSQ'
       ])
     );
   }
@@ -456,14 +456,14 @@ function resolveHandlerConfig(
         additionalResourcePermission.push(
           createSqsResource([
             upperCase(flowTag) +
-              upperCase(flowStepName) +
-              upperCase(flowStepConfig.settings.handleLogic) +
-              upperCase(HANDLER.hdrSqs),
+            upperCase(flowStepName) +
+            upperCase(flowStepConfig.settings.handleLogic) +
+            upperCase(HANDLER.hdrSqs),
             upperCase(flowTag) +
-              upperCase(flowStepName) +
-              upperCase(flowStepConfig.settings.handleLogic) +
-              upperCase(HANDLER.hdrSqs) +
-              'DLQ'
+            upperCase(flowStepName) +
+            upperCase(flowStepConfig.settings.handleLogic) +
+            upperCase(HANDLER.hdrSqs) +
+            'DLQ'
           ])
         );
       } else if (handleLogic === 'paginated') {
@@ -471,12 +471,12 @@ function resolveHandlerConfig(
         additionalResourcePermission.push(
           createSqsResource([
             upperCase(flowTag) +
-              upperCase(flowStepName) +
-              upperCase(HANDLER.hdrDsq),
+            upperCase(flowStepName) +
+            upperCase(HANDLER.hdrDsq),
             upperCase(flowTag) +
-              upperCase(flowStepName) +
-              upperCase(HANDLER.hdrDsq) +
-              'DLQ'
+            upperCase(flowStepName) +
+            upperCase(HANDLER.hdrDsq) +
+            'DLQ'
           ])
         );
       }