@izara_project/izara-market-library-service-schemas 1.0.38 → 1.0.39

package/package.json

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

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComponent/mainFunction/template.ejs

@@ -86,20 +86,7 @@ module.exports.<%- functionName %> = async (
       <%- include(statusFieldTemplate) %>
     <% } else if (statusType === "storedCache") { %>
       <%- include(storedCacheTemplate, {tableName:tableName,flowSchemaComplete:flowSchemaComplete}) %>
-    <% } else if (statusType === "none") { %>
-
-      let messageObject = requestParams
-
-      // create callingFlow
-      messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
-        messageObject,
-        callingFlowSharedLib.addParentCallingFlowConfig(
-          callingFlowConfig,
-          callingFlowSharedLib.createCallingFlowConfig(
-            await lambdaSharedLib.lambdaFunctionName(_izContext, TOPIC_NAME_GENERATE_CODE.flowSchemaOwnTopicComplete), {}
-          )
-        )
-      )
+
     <% } else if (statusType === "triggerCache") { %>
       <%- include(triggerCacheTemplate, {
         tableName: tableName,

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/sns-in/data.js

@@ -74,13 +74,14 @@ function createDataForDefaultSnsInSqs(_izContext, flowSchema, srcPath) {
 
   if (flowSchema.outputTopic) {
     if (flowSteps.includes("Out")) {
-      let topicOut = `${upperCase(flowSchema.flowTag)}`;
-      defaultDsqQueueDataList.push({
-        queueName: `WebSocketComplete` + upperCase(HANDLER.hdrSqs),
-        subscribeTo: topicOut
+      if (flowSchema.outputTopic) {
+        let topicOut = `${upperCase(flowSchema.flowTag)}`;
+        defaultDsqQueueDataList.push({
+          queueName: `WebSocketComplete` + upperCase(HANDLER.hdrSqs),
+          subscribeTo: topicOut
+        }
+        )
       }
-      )
-
     }
   }
 

package/src/reStructure/TemplateData/flowSchema/flowSchemaOwnTopic/sns-out/data.js

@@ -48,14 +48,16 @@ function createDataForSnsOut(_izContext, flowSchema, srcPath) {
   let resultsForCreateDefaultSnsInSqs = [];
 
   let generatedSnsTopicOutForFlowSchema = []
+  let flowSteps = Object.keys(flowSchema.flowSteps);
   let topicOut = `${upperCase(flowSchema.flowTag)}`
-  if (flowSchema.outputTopic) {
-    generatedSnsTopicOutForFlowSchema.push(
-      {
-        queueName: upperCase(topicOut)
-      }
-    )
-
+  if (flowSteps.includes("Out")) {
+    if (flowSchema.outputTopic) {
+      generatedSnsTopicOutForFlowSchema.push(
+        {
+          queueName: upperCase(topicOut)
+        }
+      )
+    }
     for (let defaultSnsOutData of generatedSnsTopicOutForFlowSchema) {
       resultsForCreateDefaultSnsInSqs.push({
         templatePath: templatePath,

package/src/reStructure/TemplateData/flowSchema/generateTemplateData.js

@@ -114,15 +114,15 @@ const createCreateObjectCompleteHandler = require('./CreateRecordComplete/handle
 const createCreateObjectCompleteMainFunction = require('./CreateRecordComplete/mainFunction/data');
 const createCreateObjectCompleteQueue = require('./CreateRecordComplete/queue/data');// flowSchema Register component //
 
-const createFlowSchemaRegisterHandlerComplete = require('./createRecordByStatusType/complete/handler/data');
-const createFlowSchemaRegisterMainCompleteFunc = require('./createRecordByStatusType/complete/mainFunction/data');
-const createFlowSchemaRegisterHandlerWbsFunc = require('./createRecordByStatusType/wbs/handler/data');
-const createFlowSchemaRegisterMainWbsFunc = require('./createRecordByStatusType/wbs/mainFunction/data');
-const createFlowSchemaRegisterMainCompleteFuncYaml = require('./createRecordByStatusType/complete/functionYaml/data');
-const createFlowSchemaRegisterMainWbsFuncYaml = require('./createRecordByStatusType/wbs/functionYaml/data');
-const createFlowSchemaRegisterSubscribeOutAll = require('./createRecordByStatusType/subscriptionOutAll/data');
-const createFlowSchemaRegisterSnsInSqs = require('./createRecordByStatusType/sns-in/data');
-const createFlowSchemaRegisterDynamoDb = require('./createRecordByStatusType/dynamoDB/register');
+const createFlowSchemaRegisterHandlerComplete = require('./register/complete/handler/data');
+const createFlowSchemaRegisterMainCompleteFunc = require('./register/complete/mainFunction/data');
+const createFlowSchemaRegisterHandlerWbsFunc = require('./register/wbs/handler/data');
+const createFlowSchemaRegisterMainWbsFunc = require('./register/wbs/mainFunction/data');
+const createFlowSchemaRegisterMainCompleteFuncYaml = require('./register/complete/functionYaml/data');
+const createFlowSchemaRegisterMainWbsFuncYaml = require('./register/wbs/functionYaml/data');
+const createFlowSchemaRegisterSubscribeOutAll = require('./register/subscriptionOutAll/data');
+const createFlowSchemaRegisterSnsInSqs = require('./register/sns-in/data');
+const createFlowSchemaRegisterDynamoDb = require('./register/dynamoDB/register');
 
 /**
  * Generates code with templates for different actions

package/src/reStructure/TemplateData/flowSchema/templateBystatusType/statusFieldTemplate.ejs

@@ -19,9 +19,4 @@ let result = await lambda.invokeSync(_izContext,
 
   _izContext.logger.debug("result from createRecordByStatusType", result)
 
-let messageObject = {
-  requestParams: requestParams
-  //(<messageObject>)
-  //(</messageObject>)
-}
 

package/src/reStructure/TemplateData/flowSchema/templateBystatusType/storedCacheTemplate.ejs

@@ -22,17 +22,3 @@ if (cacheMainStatus !== "process") {
   }
 }
 
-let messageObject = requestParams
-
-//(<beforeSendMessage>)
-//(</beforeSendMessage>)
-// create callingFlow
-messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
-  messageObject,
-  callingFlowSharedLib.addParentCallingFlowConfig(
-    callingFlowConfig,
-    callingFlowSharedLib.createCallingFlowConfig(
-      await lambdaSharedLib.lambdaFunctionName(_izContext, "<%- flowSchemaComplete %>"), {}
-    )
-  )
-)

package/src/reStructure/TemplateData/flowSchema/templateBystatusType/triggerCacheTemplate.ejs

@@ -1,5 +1,4 @@
-<% if (triggerType === 'storedCache') { %>
-  let [mustValidate, validateCache] = await triggeredCacheSharedLib.checkTriggeredCache(
+  let [triggerCacheStatus, triggerCache] = await triggeredCacheSharedLib.checkTriggeredCache(
     _izContext,
     <%- tableName %>,
     {
@@ -9,31 +8,13 @@
     //(<triggerCacheConfig>)
     //(</triggerCacheConfig>)
   )
-<% } else if (triggerType === "switch") { %>
-
-<% } %>
 
 //(<afterCheckTriggerCache>)
 //(</afterCheckTriggerCache>)
 
-if (mustValidate !== "process") {
-  if (mustValidate === "error" || mustValidate === "complete") {
+if (triggerCacheStatus !== "process") {
+  if (triggerCacheStatus === "error" || triggerCacheStatus === "complete") {
     //(<afterValidateTriggerCacheStatus>)
     //(</afterValidateTriggerCacheStatus>)
   }
 }
-
-let messageObject = requestParams
-
-//(<beforeSendMessage>)
-//(</beforeSendMessage>)
-// create callingFlow
-messageObject = callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
-  messageObject,
-  callingFlowSharedLib.addParentCallingFlowConfig(
-    callingFlowConfig,
-    callingFlowSharedLib.createCallingFlowConfig(
-      await lambdaSharedLib.lambdaFunctionName(_izContext, "<%- flowSchemaComplete %>"), {}
-    )
-  )
-)

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

@@ -37,18 +37,13 @@ const { NoRetryError } = require("@izara_project/izara-core-library-core");
 async function filterCreateResourceYaml(_izContext, createSourceParams, objSchemaPath) {
   let tableNamesToFilter = new Set();
   const allLocalFlowSchema = await getObjectSchema.getAllLocalFlowSchemas(_izContext, objSchemaPath);
-  for (const flowSchema of allLocalFlowSchema.records) {
+  await Promise.all(allLocalFlowSchema.records.map(async (flowSchema) => {
     if (flowSchema.statusType === "storedCache") {
-      const objectSchema = await getObjectSchema.getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], objSchemaPath).then(res => res.records[0])
-      if (objectSchema) {
-        for (const storageResource of Object.values(objectSchema.storageResources)) {
-          tableNamesToFilter.add(storageResource.tableName);
-        }
-      } else {
-        throw new NoRetryError('not have objectSchema in service to get')
-      }
+      tableNamesToFilter.add(...await getStoredCacheTableFromFlowSchema(_izContext, flowSchema))
+    } else if (flowSchema.statusType === "triggerCache" && flowSchema?.triggerType === "storedCache") {
+      tableNamesToFilter.add(...await getStoredCacheTableFromFlowSchema(_izContext, flowSchema))
     }
-  }
+  }))
 
   const filteredCreateSourceParams = createSourceParams.filter(
     (result) => !tableNamesToFilter.has(result.templateData.tableName)
@@ -58,4 +53,18 @@ async function filterCreateResourceYaml(_izContext, createSourceParams, objSchem
   return filteredCreateSourceParams
 }
 
-module.exports = filterCreateResourceYaml;
+module.exports = filterCreateResourceYaml;
+
+async function getStoredCacheTableFromFlowSchema(_izContext, flowSchema) {
+  let tableNameStoredCache = new Set();
+  const objectSchema = await getObjectSchema.getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], objSchemaPath).then(res => res.records[0])
+  if (objectSchema) {
+    for (const storageResource of Object.values(objectSchema.storageResources)) {
+      if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
+        tableNameStoredCache.add(storageResource.tableName);
+      }
+    }
+  } else {
+    throw new NoRetryError('not have objectSchema in service to get')
+  }
+}