@izara_project/izara-market-library-service-schemas 1.0.44 → 1.0.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -24,11 +24,11 @@
     "@izara_project/izara-core-library-core": "^1.0.19",
     "@izara_project/izara-core-library-external-request": "^1.0.20",
     "@izara_project/izara-core-library-logger": "^1.0.7",
-    "@izara_project/izara-core-library-service-schemas": "^1.0.62",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.73",
     "@izara_project/izara-core-library-sns": "^1.0.6",
     "@izara_project/izara-core-library-sqs": "^1.0.4",
     "@izara_project/izara-shared": "^1.0.126",
-    "@izara_project/izara-shared-service-schemas": "^1.0.13",
+    "@izara_project/izara-shared-service-schemas": "^1.0.19",
     "@izara_project/izara-shared-core": "^1.0.2",
     "ejs": "^3.1.10",
     "js-beautify": "^1.15.4",

package/src/GenerateCodeLibs/index.js

@@ -18,7 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 'use strict';
 
 // contain functions that use with generated code in each services
-console.log("./src/GenerateCodeLibs")
 module.exports = {
   consts: require('./src/Consts'),
   generateCodeLibs: require("./src/GenerateCodeLibs"),

package/src/SourceManager/src/CreateSource.js

@@ -86,7 +86,7 @@ function generateDataFromTemplate(template, data,) {
  * @param {string} setting.initialData // initialData can use when isAppend = true
  * @returns
  */
-async function createSource(template, data, { savePath, hookPath, saveFileName, fileExtension, initialData, isAppend = false, checkCreateSourcePass = false }) {
+async function createSource(template, data, { savePath, hookPath, saveFileName, fileExtension, initialData, isAppend = false, checkCreateSourcePass = false, generateHookFile = true }) {
 
   try {
 
@@ -115,7 +115,7 @@ async function createSource(template, data, { savePath, hookPath, saveFileName,
     let hookDataPath = hookPath ? hookPath : join(savePath, '../hook/');
 
     if (!fs.existsSync(savePath)) fs.mkdirSync(savePath, { recursive: true });
-    if (!fs.existsSync(hookDataPath)) fs.mkdirSync(hookDataPath, { recursive: true });
+    if (generateHookFile) if (!fs.existsSync(hookDataPath)) fs.mkdirSync(hookDataPath, { recursive: true });
 
     // check saveFileName for Hook exists
     if (fs.existsSync(`${hookDataPath}${saveFileName}${fileExtension}`.trim())) {
@@ -165,26 +165,6 @@ async function createSource(template, data, { savePath, hookPath, saveFileName,
   }
 }
 
-
-
-
-
-// Function to extract multiple code between tags
-// function extractMultipleCodeBetweenTags(content, tagName) {
-//   const result = [];
-//   const startTag = `//(<${tagName}>)`;
-//   const endTag = `//(</${tagName}>)`;
-//   let startIndex = content.indexOf(startTag);
-//   let endIndex = content.indexOf(endTag, startIndex);
-//   while (startIndex >= 0 && endIndex >= 0) {
-//     result.push(content.substring(startIndex + startTag.length + 1, endIndex));
-//     startIndex = content.indexOf(startTag, endIndex);
-//     endIndex = content.indexOf(endTag, startIndex);
-//   }
-//   return result;
-// }
-
-
 module.exports = {
   createSource,
   generateDataFromTemplate

package/src/reStructure/TemplateData/EndpointPerService/handler/api/template.ejs

@@ -47,7 +47,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
     // invoke LambdaFunction
     let lambdaFunctionResponse = await <%- action %>Main(
       event._izContext,       // correlationId/logger/integrationTestDetail/uniqueRequestId/userId
-      event,
+      event.body,
       callingFlowSharedLib.addCallingFlowToPassOnProperties(event)
 
     );

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

@@ -253,7 +253,7 @@ module.exports.getMain = async (
 
     return getResult;
   } catch (err) {
-    _izContext.logger.error('error PersonGetMain: ', err)
+    _izContext.logger.error('error GetMain: ', err)
     throw (err)
   }
 }

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

@@ -357,7 +357,7 @@ module.exports.updateMain = async (
       errorsFound
     }
   } catch (err) {
-    _izContext.logger.error('error AddressUpdate: ', err)
+    _izContext.logger.error('error Update: ', err)
     throw (err)
   }
 }

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

@@ -143,15 +143,17 @@ module.exports.createObjectComplete = async (
           _izContext.logger.debug("Send message to OutCreateObjectComplete :::>", sendMessageOutCreateObjectComplete)
           await sns.publishAsync(_izContext, sendMessageOutCreateObjectComplete);
 
-          await asyncFlowSharedLib.removeAwaitingMultipleStep(
-            _izContext,
-            awaitingStepId,
-            pendingStepId
-          );
-          
+
           //(<afterSendMessage>)
           //(</afterSendMessage>)
         }
+        
+        await asyncFlowSharedLib.removeAwaitingMultipleStep(
+          _izContext,
+          awaitingStepId,
+          pendingStepId
+        );
+
       })
     )
     //(<beforeReturn>)

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

@@ -107,12 +107,13 @@ module.exports.updateNodeComplete = async (
           _izContext.logger.debug("Send Message to OutUpdateNodeComplete::", sendMessageToOutUpdateNodeComplete);
           await sns.publishAsync(_izContext, sendMessageToOutUpdateNodeComplete)
 
-          await asyncFlowSharedLib.removeAwaitingMultipleStep(
-            _izContext,
-            awaitingStepId,
-            pendingStepId
-          );
         }
+        
+        await asyncFlowSharedLib.removeAwaitingMultipleStep(
+          _izContext,
+          awaitingStepId,
+          pendingStepId
+        );
       })
     )
 

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

@@ -107,18 +107,19 @@ module.exports.updateNodeComplete = async (
           _izContext.logger.debug("Send Message to OutUpdateNodeComplete::", sendMessageToOutUpdateNodeComplete);
           await sns.publishAsync(_izContext, sendMessageToOutUpdateNodeComplete)
 
-          await asyncFlowSharedLib.removeAwaitingMultipleStep(
-            _izContext,
-            awaitingStepId,
-            pendingStepId
-          );
         }
+        
+        await asyncFlowSharedLib.removeAwaitingMultipleStep(
+          _izContext,
+          awaitingStepId,
+          pendingStepId
+        );
       })
     )
 
     //(<beforeReturn>)
     //(</beforeReturn>)
-    
+
     return {
       objType: returnValue.objType,
       objInstanceFull: returnValue.objInstanceFull,

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

@@ -69,7 +69,7 @@ module.exports.deleteRelationshipComplete = async (
         relationshipProperties: returnValue.relationshipProperties,
         graphServiceTag: passBackProperties.passBackProperties.graphServiceTag
       }), // hash id
-      PREFIX.createRel // prefix, use constant further
+      PREFIX.deleteRel // prefix, use constant further
     )
 
 

package/src/reStructure/libs/ValidateAddOnDataStructure.js

@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
-const { ADD_ON_DATA_STRUCTURE_TYPE } = require('@izara_project/izara-market-library-service-schemas/src/MainLibs/src/Consts');
+const { ADD_ON_DATA_STRUCTURE_TYPE } = require('../../MainLibs/src/Consts');
 
 async function validateAddOnDataStructure(
   _izContext,