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

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

@@ -56,7 +56,9 @@ module.exports.createPresignUrl = async (
   returnMessage,
   errorsFound,
   passStatus,
-  passBackProperties
+  //(<additionalProperties>)
+  //(</additionalProperties>)
+  passBackProperties = {}
 ) => {
 
   try {
@@ -75,32 +77,18 @@ module.exports.createPresignUrl = async (
     const correlationId = _izContext.correlationIds.get(consts.X_CORRELATION_ID)
     const connectionId = _izContext.correlationIds.get(consts.CONNECTION_ID)
 
-    // getImportBatchMain from table
-    let importBatchMain = await lambda.invokeSync(_izContext,
+    let getResult = await lambda.invokeSync(_izContext,
       await lambdaSharedLib.lambdaFunctionName(_izContext, "GetHdrInv"),
       {
-        identifiers: {
-          importBatchId: servicePendingId
-        },
         objectType: objType.objectType
+        //(<identifiers>)
+        //(</identifiers>)
       }
     )
-    _izContext.logger.debug("importBatchMain", importBatchMain);
-
-    const {
-      importBatchId
-    } = importBatchMain.identifiers
-
-    const {
-      importBatchStatus,
-      importConfigId,
-      fileName,
-      fileSize,
-      importType,
-      startTime,
-      submittedByUserId,
-      userId
-    } = importBatchMain.fields
+    _izContext.logger.debug("getResult", getResult);
+
+    //(<afterGetResult>)
+    //(</afterGetResult>)
 
     let uniqueIdentify = getNestObject(
       _izContext,
@@ -112,10 +100,8 @@ module.exports.createPresignUrl = async (
     await dynamodbSharedLib.putItem(_izContext,
       await dynamodbSharedLib.tableName(_izContext, "ReservedDataMain"),
       {
-        servicePendingId: importBatchId, // importBatchId
-        reservedDataId: reservedDataId,
-        reservedValue: fileSize,
-        uniqueIdentify: uniqueIdentify
+        //(<createReservedDataMain>)
+        //(</createReservedDataMain>)
       }
     );
 
@@ -125,38 +111,38 @@ module.exports.createPresignUrl = async (
       _izContext.logger.debug("reserved has reach limit");
 
       errorsFound.push("reserved has reach limit")
-      // update importBatchMainTable
-      let updateImportBatchMainMsg = {
+      // update status
+      let updateStatusField = {
         objInstanceFull: {
           identifiers: {
-            importBatchId: importBatchId
+            //(<identifiers>)
+            //(</identifiers>)
           },
           fields: {
-            importBatchStatus: "error",
-            errorsFound: errorsFound
+            //(<fields>)
+            //(</fields>)
           }
         },
         objType: objType.objectType
       }
 
-      let sendMessageToUpdateImportBatch = {
-        Message: JSON.stringify(updateImportBatchMainMsg),
+      let sendMessageToUpdateEndpoint = {
+        Message: JSON.stringify(updateStatusField),
         TopicArn: await snsSharedLib.snsTopicArn(_izContext, `Update_In`)
       }
-      _izContext.logger.debug("sendMessageToUpdateImportBatch", sendMessageToUpdateImportBatch);
+      _izContext.logger.debug("sendMessageToUpdateEndpoint", sendMessageToUpdateEndpoint);
 
       // cancel reserved
 
-
       let cancelReservedMsg = {
-        userId: userId,
+        userId: _izContext.correlationIds.get(coreConsts.BASE_USER_ID),
         limitTag: returnMessage.limitTag,
         uniqueIdentify: uniqueIdentify
       };
 
       let sendMessageToCancelReserved = {
         Message: JSON.stringify(cancelReservedMsg),
-        TopicArn: await snsSharedLib.snsTopicArn(_izContext, 'InCancelUsage', EXTERNAL_SERVICE_NAME.accountLimits)
+        TopicArn: await snsSharedLib.snsTopicArn(_izContext, 'CancelUsage_In', EXTERNAL_SERVICE_NAME.accountLimits)
       };
 
       _izContext.logger.debug("sendMessageToCancelReserved", sendMessageToCancelReserved);
@@ -173,22 +159,23 @@ module.exports.createPresignUrl = async (
       )
     }
 
-    // store reservedDataId and servicePendingId in ReservedDataMain
-
-
-    const Key = `${fileName}.${importType}`
+    //(<createKeyForUploadFile>)
+      const Key = `${fileName}.${importType}`
+    //(</createKeyForUploadFile>)
 
     const maximumSize = fileSize * 1048576 // convert to byte unit for restrict
     _izContext.logger.debug("maximumSize", maximumSize);
 
     // create PresignUrl
     let createPresignUrlParam = {
-      Bucket: "generatecodetemplatebas-integration-test",
+      Bucket: "<%- bucketName %>",
       Key: Key,
       Conditions: [
+      //(<conditionCreateUrlLink>)
         ["content-length-range", 0, maximumSize],
         ["starts-with", "$Content-Type", "file/csv"],
         ["eq", "$x-amz-meta-importBatchId", importBatchId]
+      //(</conditionCreateUrlLink>)
       ],
       fields: {},
       expires: 86400
@@ -197,15 +184,18 @@ module.exports.createPresignUrl = async (
 
     const uploadUrl = await createPresignedPost(client, createPresignUrlParam);
 
-    uploadUrl.fields['x-amz-meta-importBatchId'] = importBatchId;
-    uploadUrl.fields['Content-Type'] = `file/${importType}`;
+    //(<modifyUploadLinkField>)
+      uploadUrl.fields['x-amz-meta-importBatchId'] = importBatchId;
+      uploadUrl.fields['Content-Type'] = `file/${importType}`;
+    //(</modifyUploadLinkField>)
 
     _izContext.logger.debug('uploadUrlLimitSize: ', uploadUrl) // return as object type = {url, fields}
 
     // update to waiting to upload
-    if (importBatchStatus === "processing") {
-
-      let updateImportBatchMainMsg = {
+    //(<checkStatusField>)
+    if (status === "processing") {
+    //(</checkStatusField>)
+      let messageObject = {
         objInstanceFull: {
           identifiers: {
             importBatchId: importBatchId
@@ -218,8 +208,8 @@ module.exports.createPresignUrl = async (
         objectType: objType,objectType
       }
 
-      updateImportBatchMainMsg = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
-        updateImportBatchMainMsg,
+      messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
+        messageObject,
         callingFlowSharedLib.addParentCallingFlowConfig(
           returnMessage, // resive parent callingFlowConfig.
           callingFlowSharedLib.createCallingFlowConfig( // calling flow own service
@@ -228,14 +218,14 @@ module.exports.createPresignUrl = async (
         )
       );
 
-      _izContext.logger.debug("after add callingFlow", updateImportBatchMainMsg)
+      _izContext.logger.debug("after add callingFlow", messageObject)
 
-      let sendMessageToUpdateImportBatch = {
-        Message: JSON.stringify(updateImportBatchMainMsg),
-        TopicArn: await snsSharedLib.snsTopicArn(_izContext, `In${objType.objectType}Update`)
+      let sendMessageToUpdateEndpoint = {
+        Message: JSON.stringify(messageObject),
+        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);
 
       await dynamodbSharedLib.updateItem(_izContext,
         await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),

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

@@ -78,7 +78,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       //validate message (and MessageAttributes)
       await recordHandlerSharedLib.validateRecord(
         record, // one record will send to mainFunction
-        "GetPresignUrlHdrSqs", // queue name that need to retry or send to dlq
+        "ReservedLimitHdrSqs", // queue name that need to retry or send to dlq
         perRecordsValidatorSchema, // schema for record.Message
         // messageAttributeValidatorSchema  // ----- for msgAttr default is null -> do not send this parameter if not want to validate msgAtt
       );
@@ -86,6 +86,8 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       // add argument (to invoke lambda) to passOnProperties[]
       passOnProperties.push(record.body.Message.objType)
       passOnProperties.push(record.body.Message.objInstanceFull)
+      //(<additionalProperties>)
+      //(</additionalProperties>)
       passOnProperties.push(callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(record.body.Message)) // is Ok PassBackProperties
       // passOnProperties.push(callingFlowSharedLib.addCallingFlowToPassOnProperties(record.body.Message)) // is Ok callinfFlow
       record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
@@ -94,7 +96,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       let recordPromise = recordHandlerSharedLib.recordHandler(
         record, // one record will send to mainFunction
         reservedLimit.reservedLimit, // mainFunction that need to invoke.
-        "GetPresignUrlHdrSqs", // queue name that need to retry or send to dlq
+        "ReservedLimitHdrSqs", // queue name that need to retry or send to dlq
         passOnProperties, // all parameters that mainFunction needed.
       );
       record._izContext.logger.debug('after recordPromise in handler');
@@ -114,7 +116,7 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
     Logger.debug('after Promise.all(recordPromises) in handler');
 
   } catch (err) {
-    Logger.error('Unhandled Error, updateNodeCompleteHdrSqs: ', err);
+    Logger.error('Unhandled Error, ReservedLimitHdrSqs: ', err);
     throw (err);
   }
 });

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

@@ -22,6 +22,7 @@ const path = require('path');
 const templatePath = path.join(__dirname, "./template.ejs")
 const { firstLetterUpperCase: upperCase } = require('../../../../../../../../MainLibs/src/Utils')
 const { SOURCE_PATH, FUNCTION_NAME } = require('../../../../../../../../MainLibs/src/Consts');
+const getObjectSchema = require('@izara_project/izara-core-library-service-schemas').getObjectSchema;
 
 /**
  * receive objectSchema
@@ -30,11 +31,11 @@ const { SOURCE_PATH, FUNCTION_NAME } = require('../../../../../../../../MainLibs
  * @return {{ templatePath, templateData, setting } }
  */
 
-function data(_izContext, flowSchema, srcPath) {
-  return [createSourceParams(_izContext, flowSchema, srcPath)]
+async function data(_izContext, flowSchema, srcPath) {
+  return [await createSourceParams(_izContext, flowSchema, srcPath)]
 }
 
-function createSourceParams(_izContext, flowSchema, srcPath) {
+async function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(FUNCTION_NAME.reservedLimit)
   return {
     templatePath: templatePath,

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

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
 const lambdaSharedLib = require('@izara_project/izara-core-library-lambda');
 const snsSharedLib = require('@izara_project/izara-core-library-sns');
-
+const asyncFlowSharedLib = require("@izara_project/izara-core-library-asynchronous-flow")
 const externalRequest = require('@izara_project/izara-core-library-external-request')
 const sns = externalRequest.sns;
 const lambda = externalRequest.lambda
@@ -45,6 +45,8 @@ module.exports.reservedLimit = async (
   _izContext,
   objType,
   objInstanceFull,
+  //(<additionalProperties>)
+  //(</additionalProperties>)
   callingFlowConfig = {}
 ) => {
 
@@ -55,19 +57,9 @@ module.exports.reservedLimit = async (
       objInstanceFull,
       callingFlowConfig
     });
-    const {
-      userId,
-      submittedByUserId,
-      importConfigId,
-      importBatchStatus,
-      importType,
-      fileName,
-      fileSize,
-      startTime
-    } = objInstanceFull.fields
-    const {
-      importBatchId
-    } = objInstanceFull.identifiers
+
+    //(<beforeReserved>)
+    //(</beforeReserved>)
 
     let connectionId = _izContext.correlationIds.get(coreConsts.CONNECTION_ID)
     //* hard code
@@ -75,23 +67,16 @@ module.exports.reservedLimit = async (
 
     // get static
     let payloadBeforeInvokeStaticLimit = {
-      userId: userId,
-      limitTag: consts.LIMIT_TAG.uploadData,
-      value: fileSize,
-      rbacType: consts.RBAC_TYPE.appLevel,
-      targetUserId: submittedByUserId,
-      callingFlow: "BasDev",
-      callingFlowProperties: {}
+      userId: _izContext.correlationIds.get(coreConsts.BASE_USER_ID),
+      targetUserId: _izContext.correlationIds.get(coreConsts.TARGET_ID),
+      //(<additionalPropertiesStaticLimit>)
+      //(</additionalPropertiesStaticLimit>)
     }
 
-    let res = await importDataLibs.getDataFromInvokeFunctionWithCache(_izContext,
+    let res = await importDataLibs.processStaticLimit(_izContext,
       await lambdaSharedLib.lambdaFunctionName(_izContext, "StaticLimitProcessHdrInv", consts.EXTERNAL_SERVICE_NAME.accountLimits),
       payloadBeforeInvokeStaticLimit
     )
-    // let res = await lambda.invokeSync(_izContext,
-    //   await lambdaSharedLib.lambdaFunctionName(_izContext, "StaticLimitProcessHdrInv", consts.EXTERNAL_SERVICE_NAME.accountLimits),
-    //   payloadBeforeInvokeStaticLimit
-    // )
 
     _izContext.logger.debug("res::", res);
 
@@ -99,27 +84,20 @@ module.exports.reservedLimit = async (
       importDataLibs.postToConnection({ message: "static limit over" }, connectionId)
     }
 
-
     // reservedDynamic
 
     let sendMsgReservedDynamic = {
-      userId: userId,
-      limitTag: consts.LIMIT_TAG.uploadData,
-      value: fileSize,
-      rbacType: consts.RBAC_TYPE.appLevel,
-      usedTimestamp: startTime,
-      targetUserId: submittedByUserId
+      userId: _izContext.correlationIds.get(coreConsts.BASE_USER_ID),
+      targetUserId: _izContext.correlationIds.get(coreConsts.TARGET_ID)
+      //(<additionalPropertiesReservedDynamic>)
+      //(</additionalPropertiesReservedDynamic>)
     }
 
     const reservedDataId = `${consts.ACCOUNTLIMIT_TAG.reservedDynamic}_${userId}_${consts.LIMIT_TAG.uploadData}`
 
     let callingFlowProperties = {
-      identifier: {
-        servicePendingId: importBatchId,
-        reservedDataId: reservedDataId
-      },
-      importConfigId: importConfigId,
-      objType: objType
+      //(<baseCallingFlowProperties>)
+      //(</baseCallingFlowProperties>)
     }
 
     _izContext.logger.debug("callingFlowProperties", callingFlowProperties);
@@ -149,9 +127,22 @@ module.exports.reservedLimit = async (
       );
     }
 
+    // create awaitingSteps
+    await asyncFlowSharedLib.createAwaitingStep(_izContext,
+      asyncFlowSharedLib.createAwaitingStepId(
+        //(<createAwaitStepId>)
+        //(</createAwaitStepId>)
+      ),
+      asyncFlowSharedLib.createPendingStepId(
+        //(<createPendingStepId>)
+        //(</createPendingStepId>)
+      )
+    )
+
+
     let sendMessageToReservedDynamic = {
       Message: JSON.stringify(sendMsgReservedDynamic),
-      TopicArn: await snsSharedLib.snsTopicArn(_izContext, "InReservedDynamicUsage", consts.EXTERNAL_SERVICE_NAME.accountLimits)
+      TopicArn: await snsSharedLib.snsTopicArn(_izContext, "ReservedDynamicUsage_In", consts.EXTERNAL_SERVICE_NAME.accountLimits)
     };
     _izContext.logger.debug("sendMessageToReservedDynamic", sendMessageToReservedDynamic);
     await sns.publishAsync(_izContext, sendMessageToReservedDynamic);

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

@@ -37,6 +37,8 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
       event._izContext,       // correlationId/logger/integrationTestDetail/uniqueRequestId/userId
       event.Records[0].s3.bucket,
       event.Records[0].s3.object,
+      //(<additionalProperties>)
+      //(</additionalProperties>)
     );
 
     if (processImageResponse instanceof Error) {
@@ -49,20 +51,4 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
     event._izContext.logger.error('Error, processAfterUploadHdrS3: ', err);
     return (izara.response.failure(err));
   }
-});
-
-//
-// s3: {
-//   s3SchemaVersion: '1.0',
-//   configurationId: 'ImageStandardTestProcessImageFileHdrS3-68a737133cefb25bff959852b8f04754',
-//   bucket: {
-//     name: 'image-test-importdata',
-//     ownerIdentity: { principalId: 'A3CDE97VJKTOJ0' },
-//     arn: 'arn:aws:s3:::image-test-importdata'
-//   },
-//   object: {
-//     key: 'image_8733685.png',
-//     size: 2974746,
-//     eTag: '93e940d895c26ef90b7542da54d61898',
-//     sequencer: '00650D4EEAD0F63EB5'
-//   }
+});