@izara_project/izara-market-library-service-schemas 1.0.59 → 1.0.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-market-library-service-schemas",
-  "version": "1.0.59",
+  "version": "1.0.60",
   "description": "Schemas for Izara Market project",
   "main": "index.js",
   "scripts": {
@@ -24,11 +24,11 @@
     "@izara_project/izara-core-library-core": "^1.0.20",
     "@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.84",
+    "@izara_project/izara-core-library-service-schemas": "^1.0.90",
     "@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.26",
+    "@izara_project/izara-shared-service-schemas": "^1.0.29",
     "@izara_project/izara-shared-core": "^1.0.2",
     "ejs": "^3.1.10",
     "js-beautify": "^1.15.4",

package/src/GenerateCodeLibs/src/GenerateCodeLibs.js

@@ -72,7 +72,7 @@ function validateSchemaMiddleware(
   middleware,
   // objectType,
   action,
-  bucketName = consts.OBJECT_SCHEMA_BUCKET_NAME
+  bucketName = process.env.iz_serviceSchemaBucketName
   // setting = {}
 ) {
 
@@ -108,7 +108,7 @@ async function validateSchemaPerRecord(
   lambdaFunctionName,
   objType,
   action,
-  setting = { bucketName: consts.OBJECT_SCHEMA_BUCKET_NAME, specificFieldNames: [] }
+  setting = { bucketName: process.env.iz_serviceSchemaBucketName, specificFieldNames: [] }
 ) {
   try {
     record._izContext.logger.debug("validateSchemaPerRecord: ",
@@ -350,7 +350,7 @@ async function messageToDlq(record, messageFailError, queueUrl) {
  * @param {Object} _izContext
  * @param {Object} objectSchema
  */
-async function createGetDataDetails(_izContext, objectSchema, settings = { bucketName: consts.OBJECT_SCHEMA_BUCKET_NAME }) {
+async function createGetDataDetails(_izContext, objectSchema, settings = { bucketName: process.env.iz_serviceSchemaBucketName }) {
 
   // group versionedData per storageTag
   // or should group versionedData per graph serviceTag
@@ -546,7 +546,7 @@ async function createGetDataDetails(_izContext, objectSchema, settings = { bucke
  * @param {Object} objectSchema
  * @param {Object} reqIdentifiers       - input identifier from calling function
  */
-async function generateDynamoDbIdentifiers(_izContext, objectSchema, reqIdentifiers, bucketName = consts.OBJECT_SCHEMA_BUCKET_NAME) {
+async function generateDynamoDbIdentifiers(_izContext, objectSchema, reqIdentifiers, bucketName = process.env.iz_serviceSchemaBucketName) {
 
   // start create identifiers for dynamo
   let dynamoIdentifiers = {};
@@ -617,7 +617,7 @@ const generateDynamoDbIdentifiersWithCache = inMemoryCacheLib(
  * @param {Object} dynamoStorageResource
  * @param {Object} reqIdentifiers
  */
-async function dynamoDbIdentifiersByStorageResource(_izContext, objectSchema, dynamoStorageResource, reqIdentifiers, bucketName = consts.OBJECT_SCHEMA_BUCKET_NAME) {
+async function dynamoDbIdentifiersByStorageResource(_izContext, objectSchema, dynamoStorageResource, reqIdentifiers, bucketName = process.env.iz_serviceSchemaBucketName) {
 
   let dynamoIdentifiers = await generateDynamoDbIdentifiersWithCache(_izContext, objectSchema, reqIdentifiers, bucketName)
 

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

@@ -169,40 +169,40 @@ module.exports.createMain = async (
       const identifier = objectSchemas.identifiers[0];
       _izContext.logger.debug(":::::case single identifier:::::", identifier);
 
-      if (objectSchemas.fieldNames[identifier.fieldName].hasOwnProperty("randomOnCreate")) {
-        if ((objectSchemas.fieldNames[identifier.fieldName].randomOnCreate == true)) {
-          Object.assign(requestParams.fieldNames, {
-            [identifier.fieldName]: hash({
-              fieldNames: identifier, //
-              uniqueRequestId: _izContext.uniqueRequestId,
-              callingFlowConfig: callingFlowConfig
-            })
-          });
-          _izContext.logger.debug("Assign requestParams", requestParams)
+      if (objectSchemas.fieldNames[identifier.fieldName].hasOwnProperty("randomOnCreate") && (objectSchemas.fieldNames[identifier.fieldName].randomOnCreate == true)) {
+        Object.assign(requestParams.fieldNames, {
+          [identifier.fieldName]: hash({
+            fieldNames: identifier, //
+            uniqueRequestId: _izContext.uniqueRequestId,
+            callingFlowConfig: callingFlowConfig
+          })
+        });
+        _izContext.logger.debug("Assign requestParams", requestParams)
 
-        } else if (objectSchemas.fieldNames[identifier.fieldName].randomOnCreate == false ||
-          objectSchemas.fieldNames[identifier.fieldName].randomOnCreate == null) {
+      } else if (objectSchemas.fieldNames[identifier.fieldName].hasOwnProperty("randomOnCreate") && objectSchemas.fieldNames[identifier.fieldName].randomOnCreate == false ||
+        objectSchemas.fieldNames[identifier.fieldName].randomOnCreate == null) {
 
-          if ((objectSchemas.fieldNames[identifier.fieldName].requiredOnCreate == true) &&
-            (objectSchemas.fieldNames[identifier.fieldName].canUpdate == false)) {
-            // check Fns have receive
+        if ((objectSchemas.fieldNames[identifier.fieldName].requiredOnCreate == true) &&
+          (objectSchemas.fieldNames[identifier.fieldName].canUpdate == false)) {
+          // check Fns have receive
 
-            if (requestParams.fieldNames.hasOwnProperty([identifier.fieldName])) {
-              _izContext.logger.debug("identifier is exist:", {
-                [identifier.fieldName]: requestParams.fieldNames[identifier.fieldName]
-              });
+          if (requestParams.fieldNames.hasOwnProperty([identifier.fieldName])) {
+            _izContext.logger.debug("identifier is exist:", {
+              [identifier.fieldName]: requestParams.fieldNames[identifier.fieldName]
+            });
 
-            } else {
-              errorsFound.push("[invalid]requestParams not have data fieldNames of requiredOnCreate");
-            }
+          } else {
+            errorsFound.push("[invalid]requestParams not have data fieldNames of requiredOnCreate");
           }
-        };
+        }
       } else if (objectSchemas.fieldNames[identifier.fieldName].hasOwnProperty("hashOnCreate")) {
         let hashFieldName = {}
         if (objectSchemas.fieldNames[identifier.fieldName].hashOnCreate.length &&
           objectSchemas.fieldNames[identifier.fieldName].hashOnCreate.length > 0) {
           for (const fieldName of objectSchemas.fieldNames[identifier.fieldName].hashOnCreate) {
-            Object.assign(hashFieldName, { [fieldName]: requestParams.fieldNames[fieldName] })
+            Object.assign(hashFieldName, {
+              [fieldName]: requestParams.fieldNames[fieldName]
+            })
           }
 
           Object.assign(

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

@@ -154,7 +154,7 @@ module.exports.getMain = async (
             let graphServiceName = await getGraphServiceTagWithCache(_izContext, getDataDetail.graphServiceTag);
 
             let versionedDataLabels = [];
-            if (!returnVersionedData) {
+            if (returnVersionedData) {
               if (getDataDetail.versionedDatas && Object.keys(getDataDetail.versionedDatas).length) {
                 // have versionedData
                 versionedDataLabels = Object.keys(getDataDetail.versionedDatas);
@@ -231,7 +231,6 @@ module.exports.getMain = async (
             let dataFromDynamoDb = await dynamodbSharedLib.getItem(
               _izContext,
               await dynamodbSharedLib.tableName(_izContext, getDataDetail.tableName, getDataDetail.serviceTag),
-              await dynamodbSharedLib.tableName(_izContext, getDataDetail.tableName, getDataDetail.serviceTag),
               identifiersForGetData
             );
 

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

@@ -81,7 +81,7 @@ module.exports.confirmNewReserved = async (
 
     let sendMessageToConfirmUsage = {
       Message: JSON.stringify(confirmUsageMessage),
-      TopicArn: await snsSharedLib.snsTopicArn(_izContext, 'ConfirmUsage_In', consts.EXTERNAL_SERVICE_NAME.accountLimits)
+      TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, 'ConfirmUsage_In', consts.EXTERNAL_SERVICE_NAME.accountLimits)
     };
     _izContext.logger.debug("sendMessageToConfirmUsage", sendMessageToConfirmUsage);
     await sns.publishAsync(_izContext, sendMessageToConfirmUsage);
@@ -114,7 +114,7 @@ module.exports.confirmNewReserved = async (
 
     let sendMessageToUpdateEndpoint = {
       Message: JSON.stringify(sendMessageToUpdateStatus),
-      TopicArn: await snsSharedLib.snsTopicArn(_izContext, "Update_In")
+      TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "Update_In")
     };
     _izContext.logger.debug("sendMessageToUpdateEndpoint", sendMessageToUpdateEndpoint);
     await sns.publishAsync(_izContext, sendMessageToUpdateEndpoint);

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

@@ -152,14 +152,22 @@ module.exports.createPresignUrl = async (
       await sns.publishAsync(_izContext, sendMessageToCancelReserved);
 
       await postToConnection({ message: "reserved has reach limit" }, connectionId)
+
+      //(<createIdentifiersForDeleteTask>)
+      let identifiers
+      //(</createIdentifiersForDeleteTask>)
       // after post message delete websocket task
       await dynamodbSharedLib.deleteItem(_izContext,
         await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
         {
-          taskKey: correlationId,
+          taskKey: `${createFlowTypeConcat(_izContext, { flowTag: "<%- flowTag %>", serviceTag: process.env.iz_serviceTag })}${identifiers}`,
           connectionId: connectionId
         }
       )
+
+      //(<afterCancelReservedLimit>)
+      //(</afterCancelReservedLimit>)
+
       return "reserved not pass"
     }
 
@@ -207,7 +215,7 @@ module.exports.createPresignUrl = async (
           },
           fields: {
             importBatchStatus: "waitingToUpload",
-            expiryTimestamp: (getResult.startTime + (createPresignUrlParam.expires * 1000))
+            expiryTimestamp: (getResult.fields.startTime + (createPresignUrlParam.expires * 1000))
           }
         },
         objectType: objType.objectType
@@ -232,11 +240,9 @@ module.exports.createPresignUrl = async (
       _izContext.logger.debug("sendMessageToUpdateEndpoint", sendMessageToUpdateEndpoint);
       await sns.publishAsync(_izContext, sendMessageToUpdateEndpoint);
 
-
-      //(<createIdentifiersFlow>)
+      //(<createIdentifierFlow>)
         let identifiers
-      //(</createIdentifiersFlow>)
-
+      //(</createIdentifierFlow>)
       await dynamodbSharedLib.updateItem(_izContext,
         await dynamodbSharedLib.tableName(_izContext, "WebSocketTask"),
         {
@@ -248,6 +254,10 @@ module.exports.createPresignUrl = async (
         }
       )
     }
+
+    //(<mainFunctionHookCode>)
+    //(</mainFunctionHookCode>)
+
   } catch (err) {
     _izContext.logger.error('error createPresignUrl: ', err)
     throw (err)

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

@@ -55,7 +55,7 @@ module.exports.updateNodeComplete = async (
     let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
       hash({
         objectType: returnValue.requestParams.objType.objectType,
-        serviceTag: returnValue.requestParams.objType.objectType,
+        serviceTag: returnValue.requestParams.objType.serviceTag,
         identifiers: returnValue.requestParams.objInstanceFull.identifiers,
         fields: returnValue.requestParams.objInstanceFull.fields
       }),
@@ -83,12 +83,12 @@ module.exports.updateNodeComplete = async (
 
           let updateCompleteMsg = {
             objType: {
-              objectType: returnValue.queryResult.objType.objectType,
-              serviceTag: returnValue.queryResult.objType.serviceTag
+              objectType: returnValue.requestParams.objType.objectType,
+              serviceTag: returnValue.requestParams.objType.serviceTag
             },
             objInstanceFull: {
-              identifiers: returnValue.queryResult.objInstanceFull.identifiers,
-              fields: returnValue.queryResult.objInstanceFull.fields
+              identifiers: returnValue.requestParams.objInstanceFull.identifiers,
+              fields: returnValue.requestParams.objInstanceFull.fields
             },
             status: status,
             errorsFound: errorsFound,