@izara_project/izara-market-library-service-schemas 1.0.55 → 1.0.57

package/src/reStructure/TemplateData/relationshipPerAction/update/action/handler/api/template.ejs

@@ -16,16 +16,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
-const izara = require("@izara_project/izara-middleware");
-const middleware = izara.middlewareHandler;
+
+const { middlewareHandler, validatorSchema, response } = require("@izara_project/izara-middleware");
+
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
-const {
-  validateSchemaMiddleware
-} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
+
+//(<optionalRequire>)
+//(</optionalRequire>)
 
 const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>_Main');
-// validate event params in middleware before into function
-let validatorSchema = {
+
+// validate event params in middlewareHandler before into function
+let basicValidatorSchema = {
   type: "object",
   required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection","relId"],
   properties: {
@@ -37,8 +39,8 @@ let validatorSchema = {
           type: "object",
           required: ["serviceTag","objectType"],
           properties: {
-            serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty(),
+            serviceTag: validatorSchema.stringNotEmpty(),
+            objectType: validatorSchema.stringNotEmpty(),
           }
         },
         identifiers: {
@@ -55,8 +57,8 @@ let validatorSchema = {
         type: "object",
         required: ["serviceTag","objectType"],
         properties: {
-          serviceTag: izara.validatorSchema.stringNotEmpty(),
-          objectType: izara.validatorSchema.stringNotEmpty(),
+          serviceTag: validatorSchema.stringNotEmpty(),
+          objectType: validatorSchema.stringNotEmpty(),
         }
       },
       identifiers: {
@@ -69,7 +71,7 @@ let validatorSchema = {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
       properties: {
-        relationshipTag: izara.validatorSchema.stringNotEmpty(),
+        relationshipTag: validatorSchema.stringNotEmpty(),
         serviceTag: {
           type: 'string',
           pattern: "^[a-zA-Z0-9_-]+$",
@@ -77,7 +79,7 @@ let validatorSchema = {
         }
       }
     },
-    relId: izara.validatorSchema.stringNotEmpty(),
+    relId: validatorSchema.stringNotEmpty(),
     relationshipProperties: {
       type: "object",
       minProperties: 1
@@ -90,19 +92,19 @@ let validatorSchema = {
 };
 
 
-//(<globalVarible>
-//</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
-// validate event params in middleware before into main function
-validatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(validatorSchema);
-middleware.setValidatorSchema(validatorSchema)
+// validate event params in middlewareHandler before into main function
+basicValidatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(basicValidatorSchema);
+middlewareHandler.setValidatorSchema(basicValidatorSchema)
 // if need to validate authorizer or additional params , add code to hook tag below
 
 //(<afterValidateWith>)
 //(</afterValidateWith>)
 
 
-module.exports.main = middleware.wrap(async (event, context, callback) => {
+module.exports.main = middlewareHandler.wrap(async (event, context, callback) => {
   event._izContext.logger.debug('Event:', event);
   try {
     // invoke LambdaFunction
@@ -121,15 +123,15 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
 
     // return error to client
     if (lambdaFunctionResponse instanceof Error) {
-      return (izara.response.failure(lambdaFunctionResponse));
+      return (response.failure(lambdaFunctionResponse));
     }
 
     // return success to client
-    return (izara.response.success(lambdaFunctionResponse));
+    return (response.success(lambdaFunctionResponse));
 
   } catch (err) {
     event._izContext.logger.error('Error, <%- functionName %>HdrApi: ', err);
-    return (izara.response.failure(err));
+    return (response.failure(err));
   }
 });
 <%_ function firstLetterUpperCase(text) {

package/src/reStructure/TemplateData/relationshipPerAction/update/action/handler/dsq/template.ejs

@@ -16,8 +16,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
-const izara = require("@izara_project/izara-middleware");
-const middleware = izara.middlewareHandler;
+
+const { middlewareHandler, validatorSchema, response } = require("@izara_project/izara-middleware");
 
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 
@@ -26,10 +26,14 @@ const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-
 // const IntegrationTestDetail = require('@izara_project/izara-core-library-integration-tests')
 const recordHandlerSharedLib = require('@izara_project/izara-core-library-record-handler');
 const Logger = require("@izara_project/izara-core-library-logger/src/Logger");
+
+//(<optionalRequire>)
+//(</optionalRequire>)
+
 const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>_Main');
 
 // validate event properties in body.Message of sqs event
-middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
+middlewareHandler.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
   {
     type: "object",
     required: ['body', 'messageAttributes'],
@@ -44,8 +48,8 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema(
   }
 ));
 
-// validate event params in middleware before into function
-let validatorSchema = {
+// validate event params in middlewareHandler before into function
+let basicValidatorSchema = {
   type: "object",
   required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection","relId"],
   properties: {
@@ -57,8 +61,8 @@ let validatorSchema = {
           type: "object",
           required: ["serviceTag","objectType"],
           properties: {
-            serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty(),
+            serviceTag: validatorSchema.stringNotEmpty(),
+            objectType: validatorSchema.stringNotEmpty(),
           }
         },
         identifiers: {
@@ -75,8 +79,8 @@ let validatorSchema = {
         type: "object",
         required: ["serviceTag","objectType"],
         properties: {
-          serviceTag: izara.validatorSchema.stringNotEmpty(),
-          objectType: izara.validatorSchema.stringNotEmpty(),
+          serviceTag: validatorSchema.stringNotEmpty(),
+          objectType: validatorSchema.stringNotEmpty(),
         }
       },
       identifiers: {
@@ -89,7 +93,7 @@ let validatorSchema = {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
       properties: {
-        relationshipTag: izara.validatorSchema.stringNotEmpty(),
+        relationshipTag: validatorSchema.stringNotEmpty(),
         serviceTag: {
           type: 'string',
           pattern: "^[a-zA-Z0-9_-]+$",
@@ -97,7 +101,7 @@ let validatorSchema = {
         }
       }
     },
-    relId: izara.validatorSchema.stringNotEmpty(),
+    relId: validatorSchema.stringNotEmpty(),
     relationshipProperties: {
       type: "object",
       minProperties: 1
@@ -110,18 +114,18 @@ let validatorSchema = {
 };
 
 
-//(<globalVarible>
-//</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
-// validate event params in middleware before into main function
-validatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(validatorSchema);
+// validate event params in middlewareHandler before into main function
+basicValidatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(basicValidatorSchema);
 // if need to validate authorizer or additional params , add code to hook tag below
 
 //(<afterValidateWith>)
 //(</afterValidateWith>)
 
 
-module.exports.main = middleware.wrap(async (event, context, callback) => {
+module.exports.main = middlewareHandler.wrap(async (event, context, callback) => {
   Logger.debug('event:', event);
   Logger.debug('context:', context);
   try {
@@ -141,7 +145,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       await recordHandlerSharedLib.validateRecord(
         record, // one record will send to mainFunction
         "<%- queueName %>",                       // queue name that need to retry or send to dlq
-        validatorSchema, // schema for record.Message
+        basicValidatorSchema, // schema for record.Message
         // messageAttributeValidatorSchema        // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
       );
 

package/src/reStructure/TemplateData/relationshipPerAction/update/action/handler/inv/template.ejs

@@ -15,8 +15,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const izara = require("@izara_project/izara-middleware");
-const middleware = izara.middlewareHandler;
+const { middlewareHandler, validatorSchema, response } = require("@izara_project/izara-middleware");
 
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 
@@ -24,10 +23,13 @@ const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-
 // const Logger = require('@izara_project/izara-core-library-logger');
 // const IntegrationTestDetail = require('@izara_project/izara-core-library-integration-tests')
 
+//(<optionalRequire>)
+//(</optionalRequire>)
+
 const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>_Main');
 
-// validate event params in middlewware before into function.
-let validatorSchema = {
+// validate event params in middlewareHandler before into function.
+let basicValidatorSchema = {
   type: "object",
   required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection","relId"],
   properties: {
@@ -39,8 +41,8 @@ let validatorSchema = {
           type: "object",
           required: ["serviceTag","objectType"],
           properties: {
-            serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty(),
+            serviceTag: validatorSchema.stringNotEmpty(),
+            objectType: validatorSchema.stringNotEmpty(),
           }
         },
         identifiers: {
@@ -57,8 +59,8 @@ let validatorSchema = {
         type: "object",
         required: ["serviceTag","objectType"],
         properties: {
-          serviceTag: izara.validatorSchema.stringNotEmpty(),
-          objectType: izara.validatorSchema.stringNotEmpty(),
+          serviceTag: validatorSchema.stringNotEmpty(),
+          objectType: validatorSchema.stringNotEmpty(),
         }
       },
       identifiers: {
@@ -71,7 +73,7 @@ let validatorSchema = {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
       properties: {
-        relationshipTag: izara.validatorSchema.stringNotEmpty(),
+        relationshipTag: validatorSchema.stringNotEmpty(),
         serviceTag: {
           type: 'string',
           pattern: "^[a-zA-Z0-9_-]+$",
@@ -79,7 +81,7 @@ let validatorSchema = {
         }
       }
     },
-    relId: izara.validatorSchema.stringNotEmpty(),
+    relId: validatorSchema.stringNotEmpty(),
     relationshipProperties: {
       type: "object",
       minProperties: 1
@@ -91,19 +93,19 @@ let validatorSchema = {
   }
 };
 
-//(<globalVarible>
-//</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
-// validate event params in middleware before into main function
-validatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(validatorSchema);
-middleware.setValidatorSchema(validatorSchema)
+// validate event params in middlewareHandler before into main function
+basicValidatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(basicValidatorSchema);
+middlewareHandler.setValidatorSchema(basicValidatorSchema)
 // if need to validate authorizer or additional params , add code to hook tag below
 
 //(<afterValidateWith>)
 //(</afterValidateWith>)
 
 
-module.exports.main = middleware.wrap(async (event, context, callback) => {
+module.exports.main = middlewareHandler.wrap(async (event, context, callback) => {
   event._izContext.logger.debug('Event:', event);
   event._izContext.logger.debug('context:',context);
 
@@ -126,15 +128,15 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
 
     // return error to client
     if (lambdaFunctionResponse instanceof Error) {
-      return (izara.response.failure(lambdaFunctionResponse));
+      return (response.failure(lambdaFunctionResponse));
     }
 
     // return success to client
-    return (izara.response.success(lambdaFunctionResponse));
+    return (response.success(lambdaFunctionResponse));
 
   } catch (err) {
     event._izContext.logger.error('Error, <%- firstLetterUpperCase(functionName) %>HdrInv: ', err);
-    return (izara.response.failure(err));
+    return (response.failure(err));
   }
 });
 <%_ function firstLetterUpperCase(text){

package/src/reStructure/TemplateData/relationshipPerAction/update/action/handler/sqs/template.ejs

@@ -16,21 +16,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 'use strict';
-const izara = require("@izara_project/izara-middleware");
-const middleware = izara.middlewareHandler;
+
+const { middlewareHandler, validatorSchema, response } = require("@izara_project/izara-middleware");
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
-const {
-  validateSchemaMiddleware
-} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
 const Logger = require('@izara_project/izara-core-library-logger');
 const recordHandlerSharedLib = require('@izara_project/izara-core-library-record-handler');
 
+//(<optionalRequire>)
+//(</optionalRequire>)
+
 const <%- functionName %> = require('./<%- firstLetterUpperCase(functionName) %>_Main');
 
-middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
+middlewareHandler.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
-// validate event params in middleware before into function
-let validatorSchema = {
+// validate event params in middlewareHandler before into function
+let basicValidatorSchema = {
   type: "object",
   required: ["firstObject","secondObject", "relType", "relationshipProperties","relationshipDirection","relId"],
   properties: {
@@ -42,8 +42,8 @@ let validatorSchema = {
           type: "object",
           required: ["serviceTag","objectType"],
           properties: {
-            serviceTag: izara.validatorSchema.stringNotEmpty(),
-            objectType: izara.validatorSchema.stringNotEmpty(),
+            serviceTag: validatorSchema.stringNotEmpty(),
+            objectType: validatorSchema.stringNotEmpty(),
           }
         },
         identifiers: {
@@ -60,8 +60,8 @@ let validatorSchema = {
         type: "object",
         required: ["serviceTag","objectType"],
         properties: {
-          serviceTag: izara.validatorSchema.stringNotEmpty(),
-          objectType: izara.validatorSchema.stringNotEmpty(),
+          serviceTag: validatorSchema.stringNotEmpty(),
+          objectType: validatorSchema.stringNotEmpty(),
         }
       },
       identifiers: {
@@ -74,7 +74,7 @@ let validatorSchema = {
       type: "object",
       required: ["relationshipTag", "serviceTag"],
       properties: {
-        relationshipTag: izara.validatorSchema.stringNotEmpty(),
+        relationshipTag: validatorSchema.stringNotEmpty(),
         serviceTag: {
           type: 'string',
           pattern: "^[a-zA-Z0-9_-]+$",
@@ -82,7 +82,7 @@ let validatorSchema = {
         }
       }
     },
-    relId: izara.validatorSchema.stringNotEmpty(),
+    relId: validatorSchema.stringNotEmpty(),
     relationshipProperties: {
       type: "object",
       minProperties: 1
@@ -94,17 +94,17 @@ let validatorSchema = {
   }
 };
 
-//(<globalVarible>
-//</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
-// validate event params in middleware before into main function
-validatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(validatorSchema);
+// validate event params in middlewareHandler before into main function
+basicValidatorSchema = callingFlowSharedLib.addOptionalCallingFlowToValidatorSchema(basicValidatorSchema);
 // if need to validate authorizer or additional params , add code to hook tag below
 
 //(<afterValidateWith>)
 //(</afterValidateWith>)
 
-module.exports.main = middleware.wrap(async (event, context, callback) => {
+module.exports.main = middlewareHandler.wrap(async (event, context, callback) => {
 
   try {
 
@@ -119,7 +119,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       await recordHandlerSharedLib.validateRecord(
         record, // one record will send to mainFunction
         "<%- queueName %>",                       // queue name that need to retry or send to dlq
-        validatorSchema, // schema for record.Message
+        basicValidatorSchema, // schema for record.Message
         // messageAttributeValidatorSchema        // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
       );
 

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

@@ -327,7 +327,7 @@ module.exports.updateRelationship = async (
               updateRelMessageBody,
               callingFlowSharedLib.addParentCallingFlowConfig(
                 callingFlowConfig, // receive parent callingFlowConfig.
-                callingFlowSharedLib.createCallingFlowConfig( // callinfflow own service
+                callingFlowSharedLib.createCallingFlowConfig( // callingFlow own service
                 //(<callingFlowProperties>)
                   await lambdaSharedLib.lambdaFunctionName(_izContext, TOPIC_NAME_GENERATE_CODE.updateRelComplete),
                 //(</callingFlowProperties>)

package/src/reStructure/TemplateData/relationshipPerAction/update/complete/handler/sqs/template.ejs

@@ -96,7 +96,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       passOnProperties.push(record.body.Message.errorsFound)
       passOnProperties.push(record.body.Message.graphServiceTag)
       passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message)) // is Ok PassBackProperties
-      // passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message)) // is Ok callinfFlow
+      // passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message)) // is Ok callingFlow
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
       //(<afterSendParamToMainFunction>)
       //(</afterSendParamToMainFunction>)

package/src/reStructure/TemplateData/resourceYaml/filterGenerateResource/data.js

@@ -30,7 +30,7 @@ const STORAGE_TYPES = {
   graph: "graph"
 }
 const { SOURCE_PATH, SAVE_FILE_NAME } = require('../../../../MainLibs/src/Consts')
-const { firstUpperCase: upperCase } = require('../../../../MainLibs/src/Utils')
+const { firstUpperCase: upperCase, getLocalConfig } = require('../../../../MainLibs/src/Utils')
 const getObjectSchema = require('@izara_project/izara-core-library-service-schemas/src/GetObjectSchema');
 const { NoRetryError } = require("@izara_project/izara-core-library-core");
 
@@ -45,7 +45,13 @@ async function filterCreateResourceYaml(_izContext, createSourceParams, objSchem
     }
   }))
 
-  const filteredCreateSourceParams = createSourceParams.filter(
+  const allLocalObjSchema = await getObjectSchema.getAllLocalObjectSchemasWithHierarchy(_izContext, objSchemaPath);
+  await Promise.all(allLocalObjSchema.records.map(async (objSchema) => {
+    if (objSchema.hasOwnProperty("extendObjType")) {
+      tableNamesToFilter.add(...await getParentTableFromObjSchema(_izContext, objSchema, objSchemaPath))
+    }
+  }))
+  let filteredCreateSourceParams = createSourceParams.filter(
     (result) => !tableNamesToFilter.has(result.templateData.tableName)
   )
 
@@ -69,3 +75,17 @@ async function getStoredCacheTableFromFlowSchema(_izContext, flowSchema, objSche
   }
   return tableNameStoredCache;
 }
+
+async function getParentTableFromObjSchema(_izContext, objSchema, objSchemaPath) {
+  let parentTableNames = new Set();
+  let ownServiceTag = getLocalConfig(path.join(objSchemaPath, "../../"), "iz_serviceTag")
+  for (const storageResource of Object.values(objSchema.storageResources)) {
+    if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
+      if (storageResource.serviceTag && storageResource.serviceTag !== ownServiceTag) {
+        parentTableNames.add(storageResource.tableName)
+      }
+    }
+  }
+
+  return parentTableNames
+}