@izara_project/izara-core-generate-service-code 1.0.13 → 1.0.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Code for locally generating per service files",
   "main": "index.js",
   "scripts": {

package/src/TemplateData/findData/GetByStorage/getByDynamo.ejs

@@ -43,6 +43,7 @@ await findDataSharedLib.completeFindDataMain(
   findDataMain.objType,
   findDataMain.identifiers,
   dataValue,
+  overWriteCache,
   callingFlow,
   'complete'
 );

package/src/TemplateData/findData/GetByStorage/getByGraph.ejs

@@ -72,6 +72,7 @@ await findDataSharedLib.completeFindDataMain(
   findDataMain.objType,
   findDataMain.identifiers,
   dataValue,
+  overWriteCache,
   callingFlow,
   'complete'
 );

package/src/TemplateData/findData/handler/template.ejs

@@ -30,7 +30,7 @@ middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 // set schema for record.body.Message
 const perRecordsValidatorSchema = {
   type: 'object',
-  required: ['fieldName', 'objType', 'identifiers'],
+  required: ['fieldName', 'objType', 'identifiers', 'overWriteCache'],
   properties: {
     fieldName: {
       type: 'object'
@@ -49,6 +49,9 @@ const perRecordsValidatorSchema = {
     identifiers: {
       type: 'object'
     },
+    overWriteCache: {
+      type: 'boolean'
+    },
     callingFlow: {
       type: 'string',
       default: ''
@@ -94,6 +97,7 @@ export const main = middleware.wrap(async (event, context) => {
         passOnProperties.push(record.body.Message.fieldName);
         passOnProperties.push(record.body.Message.objType);
         passOnProperties.push(record.body.Message.identifiers);
+        passOnProperties.push(record.body.Message.overWriteCache);
         passOnProperties.push(record.body.Message.callingFlow);
         record._izContext.logger.debug(
           'passOnProperties in handler',
@@ -128,4 +132,4 @@ export const main = middleware.wrap(async (event, context) => {
     Logger.error('Unhandled Error, FindDataHdrSqs: ', err);
     throw err;
   }
-});
+});

package/src/TemplateData/findData/mainFunction/template.ejs

@@ -15,8 +15,6 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-'use strict';
-
 import findDataSharedLib from '@izara_project/izara-core-library-find-data';
 import graphSharedLib from '@izara_project/izara-core-library-graph-service';
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb'
@@ -32,6 +30,7 @@ import { serviceConfig, identifiersObject as identifierObj } from '@izara_projec
  * @param {string} fieldName
  * @param {Object} objType
  * @param {Object} identifiers
+ * @param {Boolean} overWriteCache
  *
  * @returns {object} description of return value
  */
@@ -41,7 +40,9 @@ export default async function findData(
   fieldName,
   objType,
   identifiers,
+  overWriteCache,
   callingFlow,
+
   //(<additionalParams>)
   //(</additionalParams>)
 ) {
@@ -52,6 +53,7 @@ export default async function findData(
       fieldName: fieldName,
       objType: objType,
       identifiers: identifiers,
+      overWriteCache: overWriteCache,
       callingFlow: callingFlow
     });
 
@@ -60,6 +62,8 @@ export default async function findData(
     //(<removeAttributes>)
     //(</removeAttributes>)
 
+    let deleteDataTableOnExpired = [];
+
     // Check/create FindDataMain status
     let [findDataMainStatus, findDataId, findDataMain] = await findDataSharedLib.checkFindDataMainStatus(
       _izContext,
@@ -67,7 +71,8 @@ export default async function findData(
       objType,
       identifiers,
       callingFlow,
-      removeAttributes
+      removeAttributes,
+      overWriteCache
     );
     _izContext.logger.debug('result after checkFindDataMainStatus is', {
       findDataMainStatus: findDataMainStatus,
@@ -90,6 +95,7 @@ export default async function findData(
       objType,
       identifiers,
       null,
+      overWriteCache,
       callingFlow,
       'error'
     ];

package/src/TemplateData/flowSchema/flowStep/afterPluginHook/templateMain.ejs

@@ -61,9 +61,12 @@ export default async function <%- functionName %>Main (
     //(</hookCode>)
 
     <% if (typeof afterPlugInHookTag !== 'undefined' && afterPlugInHookTag) { %>
-    await handlePlugInHookTag(
+    await handlerPlugInHookTag(
       _izContext,
-      '<%- afterPlugInHookTag %>',
+      '<%- plugHookTag %>',
+      '<%- flowTag %>',
+      '<%- flowStepName %>',
+      '<%- flowStepIndex %>',
       <%- (function(){
         const s = JSON.stringify(objType, null, 2);
         if (s === '{}') return '{\n      }';
@@ -71,9 +74,9 @@ export default async function <%- functionName %>Main (
         const t = s.replace(/"([^\"]+)":\s*"([^\"]*)"/g, "$1: '$2'");
         return t.replace(/\n/g, '\n      ');
       })() %>,
-      '<%- functionName %>HdrDsq',
-      requestParams,
-      callingFlowConfig,
+      '<%- queueNameDsq %>',
+      plugInIdentifiers,
+      plugInAdditionalRequest
     );
     <% } %>
     return '<%- functionName %> completed successfully';

package/src/TemplateData/flowSchema/flowStep/firstFlowStep/templateMain.ejs

@@ -64,9 +64,12 @@ export default async function <%- functionName %>Main (
     //(<hookCodePlugin>)
     //(</hookCodePlugin>)
 
-    await handlePlugInHookTag(
+    await handlerPlugInHookTag(
       _izContext,
       '<%- plugHookTag %>',
+      '<%- flowTag %>',
+      '<%- flowStepName %>',
+      '<%- flowStepIndex %>',
       <%- (function(){
         const s = JSON.stringify(objType, null, 2);
         if (s === '{}') return '{\n      }';

package/src/TemplateData/flowSchema/flowStep/flowStep.js

@@ -214,6 +214,9 @@ function buildFlowStepResources(_izContext, flowSchema, saveFilePath) {
                   functionName: `${lowerCase(flowStepName)}${firstIndex}`,
                   plugHookTag: flowStepConfig.plugInHooks[0].plugInHookTag,
                   objType: flowStepConfig.plugInHooks[0].objType,
+                  flowTag: flowTag,
+                  flowStepName: flowStepName,
+                  flowStepIndex: firstIndex,
                   queueNameDsq: `${upperCase(flowTag)}${upperCase(flowStepName)}${currentIndex}HdrDsq`
                 },
                 setting: {
@@ -388,8 +391,11 @@ function buildFlowStepResources(_izContext, flowSchema, saveFilePath) {
                 functionName: `${lowerCase(flowStepName)}${currentIndex}`,
                 afterPlugInHookTag: afterPlugInHookTag,
                 plugInHookTag: plugInHookTag,
-                objType: pluginHook.objType
-                // queueNameDsq: `${upperCase(flowTag)}${upperCase(flowStepName)}${currentIndex}HdrDsq`
+                objType: pluginHook.objType,
+                queueNameDsq: `${upperCase(flowTag)}${upperCase(flowStepName)}${currentIndex}HdrDsq`,
+                flowTag: flowTag,
+                flowStepName: flowStepName,
+                flowStepIndex: firstIndex
               },
               setting: {
                 savePath: path.join(flowSchemaSourcePath),

package/src/TemplateData/processLogical/handler/template.ejs

@@ -15,42 +15,39 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-
-
-import { middlewareHandler as middleware } from "@izara_project/izara-middleware";
+import { middlewareHandler as middleware } from '@izara_project/izara-middleware';
 import Logger from '@izara_project/izara-core-library-logger';
-import { recordHandlerSharedLib } from "@izara_project/izara-core-library-record-handler";
+import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record-handler';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 
 import processLogical from './ProcessLogical_Main.js';
 
-
 // validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
 // set schema for record.body.Message
 const perRecordsValidatorSchema = {
-  type: "object",
-  required: [
-    'objType',
-    'element'
-  ],
+  type: 'object',
+  required: ['objType', 'element', 'overWriteCache'],
   properties: {
     objType: {
       type: 'object',
-      required: ["serviceTag", "objectType"],
+      required: ['serviceTag', 'objectType'],
       properties: {
         serviceTag: {
-          type: "string",
+          type: 'string',
           enum: [process.env.iz_serviceTag]
         },
         objectType: {
-          type: "string"
+          type: 'string'
         }
       }
     },
     element: {
-      type: "object"
+      type: 'object'
+    },
+    overWriteCache: {
+      type: 'boolean'
     },
     callingFlow: {
       type: 'string',
@@ -74,56 +71,61 @@ const perRecordsValidatorSchema = {
 // };
 
 export const main = middleware.wrap(async (event, context, callback) => {
-
   try {
-
     let recordPromises = [];
 
     // loop each record and send to mainFunction
-    await Promise.all(event.Records.map(async record => { // promise.all for map() function
-
-      let passOnProperties = []
-      record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
-
-      // validate message (and MessageAttributes)
-      await recordHandlerSharedLib.validateRecord(
-        record, // one record will send to mainFunction
-        "ProcessLogicalHdrSqs", // 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
-      );
-
-      // add argument (to invoke lambda) to passOnProperties[]
-      passOnProperties.push(record.body.Message.objType)
-      passOnProperties.push(record.body.Message.element)
-      passOnProperties.push(record.body.Message.callingFlow)
-      record._izContext.logger.debug('passOnProperties in handler', passOnProperties);
-
-      // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
-      let recordPromise = recordHandlerSharedLib.recordHandler(
-        record, // one record will send to mainFunction
-        processLogical, // mainFunction that need to invoke.
-        "ProcessLogicalHdrSqs", // queue name that need to retry or send to dlq
-        passOnProperties, // all parameters that mainFunction needed.
-      );
-      record._izContext.logger.debug('after recordPromise in handler');
-      recordPromises.push(recordPromise); // push promise to recordPromises
-    }))
+    await Promise.all(
+      event.Records.map(async record => {
+        // promise.all for map() function
+
+        let passOnProperties = [];
+        record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
+
+        // validate message (and MessageAttributes)
+        await recordHandlerSharedLib.validateRecord(
+          record, // one record will send to mainFunction
+          'ProcessLogicalHdrSqs', // 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
+        );
+
+        // add argument (to invoke lambda) to passOnProperties[]
+        passOnProperties.push(record.body.Message.objType);
+        passOnProperties.push(record.body.Message.element);
+        passOnProperties.push(record.body.Message.overWriteCache);
+        passOnProperties.push(record.body.Message.callingFlow);
+        record._izContext.logger.debug(
+          'passOnProperties in handler',
+          passOnProperties
+        );
+
+        // call recordHandlerSharedLib.recordHandler with 3 parameters and return promise(resolve)
+        let recordPromise = recordHandlerSharedLib.recordHandler(
+          record, // one record will send to mainFunction
+          processLogical, // mainFunction that need to invoke.
+          'ProcessLogicalHdrSqs', // queue name that need to retry or send to dlq
+          passOnProperties // all parameters that mainFunction needed.
+        );
+        record._izContext.logger.debug('after recordPromise in handler');
+        recordPromises.push(recordPromise); // push promise to recordPromises
+      })
+    );
 
     Logger.debug('before Promise.all(recordPromises) in handler');
     try {
       // --- main await all promises
       await Promise.all(recordPromises); // await all promises
 
-      return event.Records // return all for local testing
-
+      return event.Records; // return all for local testing
     } catch {
-      Logger.debug('Promise.all(recordPromises) in handler threw error (at least one record did no resolve)');
+      Logger.debug(
+        'Promise.all(recordPromises) in handler threw error (at least one record did no resolve)'
+      );
     }
     Logger.debug('after Promise.all(recordPromises) in handler');
-
   } catch (err) {
     Logger.error('Unhandled Error, ProcessLogicalHdrSqs: ', err);
-    throw (err);
+    throw err;
   }
-});
+});

package/src/TemplateData/processLogical/mainFunction/template.ejs

@@ -46,6 +46,7 @@ import { identifiersObject as identifierObj } from '@izara_project/izara-core-li
  * @param {Object} [element.sortKeyValues] - value of fieldNames that is sortKey. (optional)
  * @param {string} [element.comparison] - use for query in queryElements.sortKeyCondition. (optional)
  * @param {string} [element.conditionalFieldValues] - user after query for filter data before save to logicalData table. (optional)
+ * @param {boolean} overWriteCache
  *
  * @returns {string} description of return value
  */
@@ -54,12 +55,14 @@ export default async function processLogical(
   _izContext,
   objType,
   element,
+  overWriteCache,
   callingFlow
 ) {
   try {
     _izContext.logger.debug('----- ProcessLogical event params -----', {
       objType: objType,
       element: element,
+      overWriteCache: overWriteCache,
       callingFlow: callingFlow
     });
 
@@ -75,7 +78,8 @@ export default async function processLogical(
         element, // for create logicalResultId
         objType,
         callingFlow,
-        removeAttributes
+        removeAttributes,
+        overWriteCache
       );
     _izContext.logger.debug('After check logicalMainStatus: ', {
       logicalResultsMainStatus: logicalResultsMainStatus,
@@ -99,6 +103,7 @@ export default async function processLogical(
       logicalResultId,
       logicalResultMain.logicalElement,
       logicalResultMain.objType,
+      overWriteCache,
       callingFlow,
       'error'
     ];
@@ -284,6 +289,7 @@ export default async function processLogical(
             sortKeyFieldName: sortKeyFieldName,
             dynamoDbIdentifiers: dynamoDbIdentifiers,
             comparison: comparison,
+            overWriteCache: overWriteCache,
             callingFlow: callingFlow
           }),
           TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(
@@ -361,6 +367,7 @@ export default async function processLogical(
             partitionKeyFieldName: partitionKeyFieldName,
             sortKeyFieldName: sortKeyFieldName,
             dynamoDbIdentifiers: dynamoDbIdentifiers,
+            overWriteCache: overWriteCache,
             callingFlow: callingFlow
           }),
           TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(
@@ -424,6 +431,7 @@ export default async function processLogical(
       logicalResultId,
       element,
       objType,
+      overWriteCache,
       callingFlow,
       'complete',
       []

package/src/TemplateData/processLogicalPagination/handler/dsq/template.ejs

@@ -48,7 +48,8 @@ const perRecordsValidatorSchema = {
     'sortKeyFieldName',
     'dynamoDbIdentifiers',
     'startKey',
-    'overwriteUniqueRequestId'
+    'overwriteUniqueRequestId',
+    'overWriteCache'
   ],
   properties: {
     logicalResultId: {
@@ -76,6 +77,9 @@ const perRecordsValidatorSchema = {
     overwriteUniqueRequestId: {
       type: 'string'
     },
+    overWriteCache: {
+      type: 'boolean'
+    },
     callingFlow: {
       type: 'string',
       default: ''
@@ -85,14 +89,14 @@ const perRecordsValidatorSchema = {
 
 // set schema for record.body.MessageAttributes
 // const messageAttributeValidatorSchema = {
-//   type: "object",
+//   type: 'object',
 //   required: ['msgAtrrParam1', 'msgAtrrParam2'],
 //   properties: {
 //     msgAtrrParam1: {
-//       type: "string"
+//       type: 'string'
 //     },
 //     msgAtrrParam2: {
-//       type: "object"
+//       type: 'object'
 //     }
 //   }
 // };
@@ -135,6 +139,7 @@ export const main = middleware.wrap(async (event, context, callback) => {
         passOnProperties.push(record.body.Message.comparison);
         passOnProperties.push(record.body.Message.startKey);
         passOnProperties.push(record.body.Message.overwriteUniqueRequestId);
+        passOnProperties.push(record.body.Message.overWriteCache);
         passOnProperties.push(record.body.Message.callingFlow);
         record._izContext.logger.debug(
           'passOnProperties in handler',

package/src/TemplateData/processLogicalPagination/handler/sqs/template.ejs

@@ -33,7 +33,8 @@ const perRecordsValidatorSchema = {
     'tableName',
     'partitionKeyFieldName',
     'sortKeyFieldName',
-    'dynamoDbIdentifiers'
+    'dynamoDbIdentifiers',
+    'overWriteCache'
   ],
   properties: {
     logicalResultId: {
@@ -63,6 +64,9 @@ const perRecordsValidatorSchema = {
       type: 'string',
       default: ''
     },
+    overWriteCache: {
+      type: 'boolean'
+    },
     callingFlow: {
       type: 'string',
       default: ''
@@ -72,14 +76,14 @@ const perRecordsValidatorSchema = {
 
 // set schema for record.body.MessageAttributes
 // const messageAttributeValidatorSchema = {
-//   type: "object",
+//   type: 'object',
 //   required: ['msgAtrrParam1', 'msgAtrrParam2'],
 //   properties: {
 //     msgAtrrParam1: {
-//       type: "string"
+//       type: 'string'
 //     },
 //     msgAtrrParam2: {
-//       type: "object"
+//       type: 'object'
 //     }
 //   }
 // };
@@ -113,6 +117,7 @@ export const main = middleware.wrap(async (event, context, callback) => {
         passOnProperties.push(record.body.Message.comparison);
         passOnProperties.push(record.body.Message.startKey);
         passOnProperties.push(record.body.Message.overwriteUniqueRequestId);
+        passOnProperties.push(record.body.Message.overWriteCache);
         passOnProperties.push(record.body.Message.callingFlow);
         record._izContext.logger.debug(
           'passOnProperties in handler',

package/src/TemplateData/processLogicalPagination/mainFunction/template.ejs

@@ -38,6 +38,7 @@ const limit = 2;
  * @param {string} comparison
  * @param {Object} startKey
  * @param {string} overwriteUniqueRequestId
+ * @param {boolean} overwriteCache
  * @param {string} callingFlow
  *
  * @returns {string} description of return value
@@ -53,6 +54,7 @@ export default async function paginateProcessLogical(
   comparison, // optional
   startKey, // optional
   overwriteUniqueRequestId, // optional
+  overWriteCache,
   callingFlow // optional
 ) {
   try {
@@ -65,6 +67,7 @@ export default async function paginateProcessLogical(
       comparison: comparison,
       startKey: startKey,
       overwriteUniqueRequestId: overwriteUniqueRequestId,
+      overWriteCache: overWriteCache,
       callingFlow: callingFlow
     });
 
@@ -101,6 +104,7 @@ export default async function paginateProcessLogical(
       logicalResultId,
       logicalResultsMain.logicalElement,
       logicalResultsMain.objType,
+      overWriteCache,
       callingFlow,
       'error'
     ];
@@ -247,9 +251,9 @@ export default async function paginateProcessLogical(
         logicalResultId,
         logicalResultsMain.logicalElement,
         logicalResultsMain.objType,
+        overWriteCache,
         callingFlow,
-        'complete',
-        []
+        'complete'
       );
     }