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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.55",
+  "version": "1.0.56",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -857,6 +857,7 @@ async function createDataDetailsLib(_izContext, objectSchemas, settings = { buck
               [eachStorageResourceTag]: {
                 storageType: consts.STORAGE_TYPES.dynamoDB,
                 tableName: storageResources[eachStorageResourceTag].tableName,
+                serviceTag: process.env.iz_serviceTag,
                 fieldNames: [keyFieldName]
               }
             });

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

@@ -16,21 +16,20 @@ 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 { <%- action %>Main } =require('./<%- firstLetterUpperCase(action) %>_Main.js')
 
-//(<globalVarible>
-//</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
-//validate event params in middleware before into main function
-validateSchemaMiddleware(
-  middleware,
+//validate event params in middlewareHandler before into main function
+validatorSchema.validateSchemaMiddleware(
   "<%- action %>",
   //(<validateSchemaSetting>
   //</validateSchemaSetting>)
@@ -41,7 +40,7 @@ validateSchemaMiddleware(
 //(</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
@@ -55,15 +54,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(action) %>_<%- firstLetterUpperCase(handler) %>: ', err);
-    return (izara.response.failure(err));
+    return (response.failure(err));
   }
 });
 <%_ function firstLetterUpperCase(text){

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

@@ -16,24 +16,27 @@ 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 } = require("@izara_project/izara-middleware");
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const Logger = require('@izara_project/izara-core-library-logger');
-const {validateSchemaPerRecord} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs')
+const { validateSchemaPerRecord } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs')
 const recordHandlerSharedLib = require('@izara_project/izara-core-library-record-handler');
 
+//(<optionalRequire>)
+//(</optionalRequire>)
+
 const { <%- action %>Main } =require('./<%- firstLetterUpperCase(action) %>_Main.js')
 
-//(<globalVarible>
-//</globalVarible>)
+//(<globalVariable>
+//</globalVariable>)
 
 //validate event params in middleware before into main function
-middleware.setValidatorSchema(
-  recordHandlerSharedLib.baseValidatorSchema(),
+// middleware.setValidatorSchema(
+//  recordHandlerSharedLib.baseValidatorSchemaS3(),
   //(<middlewareSettings>)
   //(</middlewareSettings>)
-)
+// )
 
 /*
 const perRecordsValidatorSchema = {
@@ -55,11 +58,11 @@ module.exports.main = middleware.wrap(async (event,context, callback) => {
     let recordPromises = [];
 
     await Promise.all(event.Records.map(async record => {
-      record._izContext.logger.debug('record RecieveMsgOutHdrSqs', record);
+      record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
 
       let passOnProperties = [];
 
-      const OBJTYPE = {
+      const object = {
         objectType: record.body.Message.objectType,
         serviceTag: process.env.iz_serviceTag
       }
@@ -68,7 +71,7 @@ module.exports.main = middleware.wrap(async (event,context, callback) => {
       await validateSchemaPerRecord(
         record,
         "<%- firstLetterUpperCase(action) %><%- firstLetterUpperCase(handler) %>",
-        OBJTYPE,
+        object,
         "<%- action %>",
         //(<validateSchemaSetting>)
         //(</validateSchemaSetting>)

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

@@ -17,12 +17,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 'use strict';
 
-const middleware = require("@izara_project/izara-middleware/src/MiddlewareCore/MiddlewareHandler");
-
+const { middlewareHandler, validatorSchema } = 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 { <%- action %>Main } =require('./<%- firstLetterUpperCase(action) %>_Main.js')
 
@@ -30,20 +29,19 @@ const { <%- action %>Main } =require('./<%- firstLetterUpperCase(action) %>_Main
 //</globalVariable>)
 
 
-//validate event params in middleware before into main function
-validateSchemaMiddleware(
-  middleware,
+//validate event params in middlewareHandler before into main function
+validatorSchema.validateSchemaMiddleware(
   "<%- action %>",
   //(<validateSchemaSetting>
   //</validateSchemaSetting>)
 )
   // if need to validate authorizer or additional params, add code to hook tag below
 
-  //(<afterValidateWithGenereatedSchema>)
-  //(</afterValidateWithGenereatedSchema>)
+//(<afterValidateWithGeneratedSchema>)
+//(</afterValidateWithGeneratedSchema>)
 
 
-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);
 

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

@@ -16,24 +16,27 @@ 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 } = require("@izara_project/izara-middleware");
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const Logger = require('@izara_project/izara-core-library-logger');
-const {validateSchemaPerRecord} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs')
+const { validateSchemaPerRecord } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs')
 const recordHandlerSharedLib = require('@izara_project/izara-core-library-record-handler');
 
+//(<optionalRequire>)
+//(</optionalRequire>)
+
 const { <%- action %>Main } =require('./<%- firstLetterUpperCase(action) %>_Main.js')
 
-//(<globalVarible>)
-//(</globalVarible>)
+//(<globalVariable>)
+//(</globalVariable>)
 
-//validate event params in middleware before into main function
-middleware.setValidatorSchema(
-  recordHandlerSharedLib.baseValidatorSchema(),
+//validate event params in middlewareHandler before into main function
+// middlewareHandler.setValidatorSchema(
+//  recordHandlerSharedLib.baseValidatorSchemaS3(),
   //(<middlewareSettings>)
   //(</middlewareSettings>)
-)
+// )
 /*
 const perRecordsValidatorSchema = {
   type: "object",
@@ -46,18 +49,18 @@ const perRecordsValidatorSchema = {
 
 // if need to validate authorizer or additional params , add code to hook tag below
 
-module.exports.main = middleware.wrap(async (event,context, callback) => {
+module.exports.main = middlewareHandler.wrap(async (event,context, callback) => {
 
   try {
 
     let recordPromises = [];
 
     await Promise.all(event.Records.map(async record => {
-      record._izContext.logger.debug('record RecieveMsgOutHdrSqs', record);
+      record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
 
       let passOnProperties = [];
 
-      const OBJTYPE = {
+      const object = {
         objectType: record.body.Message.objectType,
         serviceTag: process.env.iz_serviceTag
       }
@@ -65,7 +68,7 @@ module.exports.main = middleware.wrap(async (event,context, callback) => {
       await validateSchemaPerRecord(
         record,
         "<%- firstLetterUpperCase(action) %><%- firstLetterUpperCase(handler) %>",
-        OBJTYPE,
+        object,
         "<%- action %>",
         //(<validateSchemaSetting>)
         //(</validateSchemaSetting>)

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

@@ -53,9 +53,11 @@ const {
   TOPIC_NAME_GRAPH_HANDLER,
   GRAPH_HANDLER_SERVICE_NAME,
 } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts');
+
 const {
-  createDataDetailsLib,
-} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
+  generateCodeLibs: { generateCodeLibs: { createDataDetailsLib } },
+  utils: { utils: { firstLetterUpperCase } }
+} = require('@izara_project/izara-market-library-service-schemas');
 
 //(<optionalRequire>)
 //(</optionalRequire>)
@@ -314,6 +316,9 @@ module.exports.createMain = async (
               ...objInstanceFullForDynamoDb.fields
             }
           );
+
+          objInstanceFullForDynamoDb.fields = {} // prevent using fieldNames from other tableName
+
           //(<afterCreateRecordDynamo>)
           //(</afterCreateRecordDynamo>)
         } else if (createDataDetail.storageType == consts.STORAGE_TYPES.graph) {
@@ -349,11 +354,16 @@ module.exports.createMain = async (
         }
 
         if (objectSchema.hasOwnProperty("extendObjType")) {
-          if (createDataDetail.storageType === consts.STORAGE_TYPES.dynamoDB && createDataDetail.serviceTag !== process.env.iz_serviceTag) {
+          if (createDataDetail.storageType === consts.STORAGE_TYPES.dynamoDB &&
+            createDataDetail.tableName.includes(`${firstLetterUpperCase(objectSchema.extendObjType.objectType)}Records`) &&
+            createDataDetail.serviceTag !== process.env.iz_serviceTag
+          ) {
             let objInstanceFullForParentDynamoDb = lodash.cloneDeep(objInstanceFull)
             Object.assign(objInstanceFullForParentDynamoDb.fields, createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail))
             _izContext.logger.debug("objInstanceFull before create item in dynamoDB in parent", objInstanceFullForParentDynamoDb)
 
+            Object.assign(objInstanceFullForParentDynamoDb.fields, { [`${objectSchema.extendObjType.objectType}HandlerServiceTag`]: process.env.iz_serviceTag })
+
             let identifiersForCreateData = await dynamoDbIdentifiersByStorageResource(
               _izContext,
               objectSchema,
@@ -448,7 +458,8 @@ module.exports.createMain = async (
               Date.now(),
               { updatePropertiesOnMatch: false },
             )
-          return createNodeResult
+            return createNodeResult
+
           } else {
             _izContext.logger.debug("not have userAgent will send Message to GraphHandler")
             messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(

package/src/reStructure/TemplateData/EndpointPerService/yaml/data.js

@@ -159,31 +159,34 @@ async function createParamForCreateSource(_izContext, allObjSchemas, action, han
   const configPath = path.join(srcPath, '../../config/serverless.config.yml');
   const serverlessConfig = fs.readFileSync(configPath, 'utf8');
   const config = yaml.parse(serverlessConfig);
-  const serviceTag = config.main_config.iz_serviceTag;
+  const ownServiceTag = config.main_config.iz_serviceTag;
+  let parentTables = [];
   // create lambdaRole for parent dynamo table if able
   for (const objectSchema of allObjSchemas.records) {
     if (objectSchema.hasOwnProperty("extendObjType")) {
       for (const storageResource of Object.values(objectSchema.storageResources)) {
         if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
-          if (storageResource.serviceTag) {
-            if (storageResource.serviceTag !== serviceTag) {
-              additionalResourcePermission.push(
-                createIamRole(
-                  {
-                    [RESOURCE_CLASSES.dynamoDbTable]: Object.values(DYNAMO_RESOURCE)
-                  },
-                  [
-                    externalResourceYaml(RESOURCE_CLASSES.dynamoDbAcrossService, upperCase(storageResource.tableName), storageResource.serviceTag)
-                  ]
-                )
-              )
-            }
+          if (storageResource.serviceTag && storageResource.serviceTag !== ownServiceTag) {
+            parentTables.push({ tableName: storageResource.tableName, serviceTag: storageResource.serviceTag })
           }
         }
       }
     }
   }
 
+  if (parentTables) {
+    additionalResourcePermission.push(
+      createIamRole(
+        {
+          [RESOURCE_CLASSES.dynamoDbTable]: Object.values(DYNAMO_RESOURCE)
+        },
+        parentTables.map(parentTable =>
+          externalResourceYaml(RESOURCE_CLASSES.dynamoDbAcrossService, upperCase(parentTable.tableName), parentTable.serviceTag)
+        )
+      )
+    )
+  }
+
   let resourceApis = [];
   if (handler === HANDLER.hdrApi) {
     for (const objectSchema of allObjSchemas.records) {
@@ -205,7 +208,7 @@ async function createParamForCreateSource(_izContext, allObjSchemas, action, han
       action: action,
       functionNameConfig,
       resourceApis,
-      serviceTag: serviceTag
+      serviceTag: ownServiceTag
     },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.appYaml),

package/src/reStructure/TemplateData/flowSchema/components/upload/confirmReserved/handler/template.ejs

@@ -92,6 +92,8 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       passOnProperties.push(record.body.Message.returnMessage)
       passOnProperties.push(record.body.Message.errorsFound)
       passOnProperties.push(record.body.Message.passStatus)
+      //(<additionalProperties>)
+      //(</additionalProperties>)
       passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message))
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
 

package/src/reStructure/TemplateData/flowSchema/components/upload/confirmReserved/mainFunction/template.ejs

@@ -22,6 +22,7 @@ const snsSharedLib = require('@izara_project/izara-core-library-sns')
 const sns = require('@izara_project/izara-core-library-external-request').sns
 const consts = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
 const { getNestObject } = require('../../../../libs/source/GenerateCodeLibs');
+
 //(<optionalRequired>)
 //(</optionalRequired>)
 /**
@@ -44,7 +45,9 @@ module.exports.confirmNewReserved = async (
   returnMessage,
   errorsFound,
   passStatus,
-  passBackProperties
+  //(<additionalProperties>)
+  //(</additionalProperties>)
+  passBackProperties = {}
 
 ) => {
   try {
@@ -76,7 +79,7 @@ module.exports.confirmNewReserved = async (
 
     let sendMessageToConfirmUsage = {
       Message: JSON.stringify(confirmUsageMessage),
-      TopicArn: await snsSharedLib.snsTopicArn(_izContext, 'InConfirmUsage', consts.EXTERNAL_SERVICE_NAME.accountLimits)
+      TopicArn: await snsSharedLib.snsTopicArn(_izContext, 'ConfirmUsage_In', consts.EXTERNAL_SERVICE_NAME.accountLimits)
     };
     _izContext.logger.debug("sendMessageToConfirmUsage", sendMessageToConfirmUsage);
     await sns.publishAsync(_izContext, sendMessageToConfirmUsage);
@@ -94,24 +97,25 @@ module.exports.confirmNewReserved = async (
       }
     )
 
-    // update importBatchMainTable
-    let sendMessageToUpdateImportBatchStatus = {
+    let sendMessageToUpdateStatus = {
       objInstanceFull: {
         identifiers: {
-          importBatchId: servicePendingId
+          //(<identifiers>)
+          //(</identifiers>)
         },
         fields: {
-          importBatchStatus: 'uploadComplete'
+          //(<fields>)
+          //(</fields>)
         }
       }
     }
 
-    let sendMessageToUpdateImportBatch = {
+    let sendMessageToUpdateEndpoint = {
       Message: JSON.stringify(sendMessageToUpdateImportBatchStatus),
-      TopicArn: await snsSharedLib.snsTopicArn(_izContext, `InImportBatchMainUpdate`)
+      TopicArn: await snsSharedLib.snsTopicArn(_izContext, "Update_In")
     };
-    _izContext.logger.debug("sendMessageToUpdateImportBatch", sendMessageToUpdateImportBatch);
-    await sns.publishAsync(_izContext, sendMessageToUpdateImportBatch);
+    _izContext.logger.debug("sendMessageToUpdateEndpoint", sendMessageToUpdateEndpoint);
+    await sns.publishAsync(_izContext, sendMessageToUpdateEndpoint);
 
     return { returnResponse: 'success' }
 

package/src/reStructure/TemplateData/flowSchema/components/upload/createObject/mainFunction/data.js

@@ -38,11 +38,28 @@ async function data(_izContext, flowSchema, srcPath) {
 
 async function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.createObjectS3)
-  // let objectSchema = await getObjectSchema.getObjectSchemaCombineFieldNamesWithCache(_izContext, flowSchema.objType)
-  // let fieldNames = Object.keys(objectSchema.fieldNames)
+  let objectSchema = await getObjectSchema.getObjectSchemaCombineFieldNamesWithCache(_izContext, flowSchema.objType)
+  let objectType = flowSchema.objType.objectType
+  let createdFieldNames = [];
+  let statusFieldNames = [];
+  for (const [fieldNames, fieldSettings] of Object.entries(objectSchema.fieldNames)) {
+    if (fieldSettings.hasOwnProperty("requiredOnCreate") && fieldSettings.requiredOnCreate === true) {
+      createdFieldNames.push(fieldNames);
+    }
+
+    if (fieldSettings.hasOwnProperty("statusField") && fieldSettings.statusField === true) {
+      statusFieldNames.push(fieldNames)
+    }
+  }
+
   return {
     templatePath: templatePath,
-    templateData: { flowTag: flowSchema.flowTag },
+    templateData: {
+      flowTag: flowSchema.flowTag,
+      createdFieldNames: createdFieldNames,
+      statusFieldNames: statusFieldNames,
+      objectType
+    },
     setting: {
       savePath: path.join(srcPath, SOURCE_PATH.webSocket, flowSchema.flowTag, "source/"),
       saveFileName: `${functionName}_Main`,

package/src/reStructure/TemplateData/flowSchema/components/upload/createObject/mainFunction/template.ejs

@@ -35,8 +35,10 @@ const NoRetryError = require('@izara_project/izara-core-library-core').NoRetryEr
 const { v4: uuidv4 } = require('uuid')
 const coreConsts = require("@izara_project/izara-core-library-core/src/Consts");
 const { TOPIC_NAME_GENERATE_CODE } = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/Consts')
+
 //(<optionalRequired>)
 //(</optionalRequired>)
+
 /**
  *
  *
@@ -65,9 +67,6 @@ module.exports.createObject = async (
     _izContext.logger.debug("WebSocketInvoke requestParams", requestParams)
     _izContext.logger.debug("WebSocketInvoke callingFlowConfig", callingFlowConfig)
 
-    _izContext.correlationIds.set(coreConsts.BASE_USER_ID, "BasDev");
-    _izContext.correlationIds.set(coreConsts.TARGET_ID, "BasDevTarget");
-
     let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(_izContext, {
       flowTag: "<%- flowTag %>",
       serviceTag: process.env.iz_serviceTag
@@ -75,6 +74,8 @@ module.exports.createObject = async (
 
     _izContext.logger.debug("getFlowSchema", flowSchema)
 
+    let userId = _izContext.correlationIds.get(coreConsts.BASE_USER_ID)
+    let submittedByUserId = _izContext.correlationIds.get(coreConsts.TARGET_ID);
 
     if (!flowSchema) {
       throw new NoRetryError(`flowTag not found ${requestParams.flowTag}`)
@@ -96,17 +97,10 @@ module.exports.createObject = async (
     //(</beforeCreateHook>)
     // create message Object to create Endpoint
     let messageObject = {
+      objectType: <%- objectType %>
       fieldNames: {
-        userId: _izContext.correlationIds.get(coreConsts.BASE_USER_ID),
-        // userId: "mockUserId",
-        submittedByUserId: _izContext.correlationIds.get(coreConsts.TARGET_ID),
-        // submittedByUserId: "mockSubmittedByUserId",
-        startTime: Date.now(),
-        importConfigId: requestParams.importConfigId,
-        importBatchStatus: "processing",
-        importType: requestParams.importType,
-        fileName: requestParams.fileName,
-        fileSize: requestParams.fileSize
+        //(<fieldNamesHook>)
+        //(</fieldNamesHook>)
       }
     }
     // create callingFlow
@@ -120,7 +114,7 @@ module.exports.createObject = async (
       )
     )
 
-    // send message to ImportBatchCreateHdrSqs
+    // send message to Create endpoint
     let sendMessageToCreateEndpoint = {
       Message: JSON.stringify(messageObject),
       TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "Create_In")

package/src/reStructure/TemplateData/flowSchema/components/upload/preSignUrl/createPresignUrl/handler/template.ejs

@@ -92,6 +92,8 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       passOnProperties.push(record.body.Message.returnMessage)
       passOnProperties.push(record.body.Message.errorsFound)
       passOnProperties.push(record.body.Message.passStatus)
+      //(<additionalProperties>)
+      //(</additionalProperties>)
       passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message))
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);