@izara_project/izara-core-generate-service-code 1.0.2 → 1.0.3

package/src/TemplateData/flowSchema/components/upload/relate/sns-out/data.js

@@ -20,7 +20,8 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts, utils } from '../../../../../../../MainLibs/index.js';
+import consts from '../../../../../../libs/Consts.js';
+import utils from '../../../../../../libs/Utils.js';
 const { firstLetterUpperCase: upperCase } = utils;
 const { SOURCE_PATH, SAVE_FILE_NAME } = consts;
 

package/src/TemplateData/flowSchema/components/websocket/connect/functionYaml/data.js

@@ -20,18 +20,23 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts, utils } from '../../../../../../../MainLibs/index.js';
+import consts from '../../../../../../libs/Consts.js';
+import utils from '../../../../../../libs/Utils.js';
+import libs from '../../../../../../libs/Libs.js'
+
 const { firstLetterUpperCase: upperCase } = utils;
 const {
   SOURCE_PATH,
   SAVE_FILE_NAME,
-  defaultIamRolePerAction,
-  createIamRole,
   RESOURCE_CLASSES,
   DYNAMO_RESOURCE,
-  resourceNames
 } = consts;
 
+const {
+  defaultIamRolePerAction,
+  createIamRole,
+  resourceNames
+} = libs;
 const templatePath = path.join(__dirname, 'template.ejs');
 
 /**

package/src/TemplateData/flowSchema/components/websocket/connect/handler/data.js

@@ -20,7 +20,7 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts } from '../../../../../../../MainLibs/index.js';
+import consts from '../../../../../../libs/Consts.js';
 
 const { SOURCE_PATH } = consts;
 

package/src/TemplateData/flowSchema/components/websocket/dynamoDb/ReservedTableData.js

@@ -20,8 +20,7 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts } from '../../../../../../MainLibs/index.js';
-
+import consts from '../../../../../libs/Consts.js';
 const { SOURCE_PATH, SAVE_FILE_NAME } = consts;
 
 const templatePath = path.join(

package/src/TemplateData/flowSchema/components/websocket/dynamoDb/WebSocketTaskData.js

@@ -20,7 +20,7 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts } from '../../../../../../MainLibs/index.js';
+import consts from '../../../../../libs/Consts.js';
 
 const { SOURCE_PATH, SAVE_FILE_NAME } = consts;
 

package/src/TemplateData/flowSchema/components/websocket/dynamoDb/userUploadRecords.js

@@ -20,7 +20,7 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts } from '../../../../../../MainLibs/index.js';
+import consts from '../../../../../libs/Consts.js';
 
 const { SOURCE_PATH, SAVE_FILE_NAME } = consts;
 

package/src/TemplateData/flowSchema/dynamoDb/data.js

@@ -20,7 +20,8 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts, utils } from '../../../../MainLibs/index.js';
+import consts from '../../../libs/Consts.js';
+import utils from '../../../libs/Utils.js'
 const { SOURCE_PATH, SAVE_FILE_NAME } = consts;
 const { firstLetterUpperCase: upperCase } = utils;
 

package/src/TemplateData/flowSchema/eventBridge/functionYaml/data.js

@@ -20,15 +20,14 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts, utils } from '../../../../../MainLibs/index.js';
+import consts from '../../../../libs/Consts.js';
+import utils from '../../../../libs/Utils.js'
+import libs from '../../../../libs/Libs.js'
 
 const { firstLetterUpperCase: upperCase } = utils;
 const {
   SOURCE_PATH,
-  defaultIamRolePerAction,
-  createIamRole,
   RESOURCE_CLASSES,
-  resourceNames,
   DYNAMO_RESOURCE,
   SAVE_FILE_NAME,
   FUNCTION_NAME,
@@ -36,6 +35,12 @@ const {
   HANDLER
 } = consts;
 
+const {
+  defaultIamRolePerAction,
+  createIamRole,
+  resourceNames
+} = libs;
+
 const templatePath = path.join(__dirname, 'template.ejs');
 /**
  * receive objectSchema

package/src/TemplateData/flowSchema/eventBridge/handler/inv/data.js

@@ -20,7 +20,8 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts, utils } from '../../../../../../MainLibs/index.js';
+import consts from '../../../../../libs/Consts.js';
+import utils from '../../../../../libs/Utils.js'
 const { firstLetterUpperCase: upperCase } = utils;
 const { SOURCE_PATH, HANDLER } = consts;
 

package/src/TemplateData/flowSchema/eventBridge/mainFunction/data.js

@@ -20,7 +20,8 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts, utils } from '../../../../../MainLibs/index.js';
+import consts from '../../../../libs/Consts.js';
+import utils from '../../../../libs/Utils.js'
 const { firstLetterUpperCase: upperCase } = utils;
 const { SOURCE_PATH, SOURCE_GENERATE_IAM_ROLE } = consts;
 

package/src/TemplateData/flowSchema/externalTopic/Complete/functionYaml/data.js

@@ -20,23 +20,26 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts, utils } from '../../../../../../MainLibs/index.js';
+import consts from '../../../../../libs/Consts.js';
+import utils from '../../../../../libs/Utils.js';
+import libs from '../../../../../libs/Libs.js'
 
 const {
   HANDLER,
   SOURCE_PATH,
-  defaultIamRolePerAction,
-  createIamRole,
   RESOURCE_CLASSES,
   SNS_RESOURCE,
-  resourceNames,
   SAVE_FILE_NAME,
-  shortNameHandler,
   SQS_RESOURCE
 } = consts;
 
 const { firstLetterUpperCase: upperCase } = utils;
-
+const {
+  defaultIamRolePerAction,
+  createIamRole,
+  resourceNames,
+  shortNameHandler
+} = libs;
 const templatePath = path.join(__dirname, 'template.ejs');
 /**
  * receive objectSchema

package/src/TemplateData/flowSchema/externalTopic/Complete/handler/data.js

@@ -20,16 +20,12 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts, utils } from '../../../../../../MainLibs/index.js';
+import consts from '../../../../../libs/Consts.js';
+import utils from '../../../../../libs/Utils.js';
 
 const {
   HANDLER,
   SOURCE_PATH,
-  defaultIamRolePerAction,
-  createIamRole,
-  RESOURCE_CLASSES,
-  resourceNames,
-  SQS_RESOURCE
 } = consts;
 
 const { firstLetterUpperCase: upperCase } = utils;
@@ -54,21 +50,8 @@ function data(_izContext, flowSchema, srcPath) {
 function createSourceParams(_izContext, flowSchema, srcPath) {
   let functionName = upperCase(flowSchema.flowTag) + 'Complete';
   let handlerType = upperCase(HANDLER.hdrSqs);
-  let additionalResourcePermission = defaultIamRolePerAction();
   let queueName = functionName + handlerType;
 
-  additionalResourcePermission.push(
-    createIamRole(
-      {
-        [RESOURCE_CLASSES.sqs]: Object.values(SQS_RESOURCE)
-      },
-      [
-        resourceNames(RESOURCE_CLASSES.sqs, queueName),
-        resourceNames(RESOURCE_CLASSES.sqs, queueName + 'DLQ')
-      ]
-    )
-  );
-
   return {
     templatePath: templatePath,
     templateData: {

package/src/TemplateData/flowSchema/externalTopic/Complete/mainFunction/data.js

@@ -19,7 +19,9 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-import { consts, utils } from '../../../../../../MainLibs/index.js';
+
+import consts from '../../../../../libs/Consts.js';
+import utils from '../../../../../libs/Utils.js';
 
 const { SOURCE_PATH } = consts;
 

package/src/TemplateData/flowSchema/externalTopic/Process/functionYaml/data.js

@@ -21,27 +21,34 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 import { NoRetryError } from '@izara_project/izara-core-library-core';
 import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
-import { consts, utils } from '../../../../../../MainLibs/index.js';
+
+import consts from '../../../../../libs/Consts.js';
+import utils from '../../../../../libs/Utils.js';
+import libs from '../../../../../libs/Libs.js'
 
 const {
   HANDLER,
   STORAGE_TYPES,
   SOURCE_PATH,
-  defaultIamRolePerAction,
-  createIamRole,
   RESOURCE_CLASSES,
   SNS_RESOURCE,
-  resourceNames,
   DYNAMO_RESOURCE,
   SAVE_FILE_NAME,
-  shortNameHandler,
   SQS_RESOURCE,
   LAMBDA_RESOURCE
 } = consts;
 
 const { firstLetterUpperCase: upperCase } = utils;
 
+const {
+  shortNameHandler,
+  resourceNames,
+  defaultIamRolePerAction,
+  createIamRole
+} = libs;
+
 const templatePath = path.join(__dirname, 'template.ejs');
+
 /**
  * receive objectSchema
  * create data for WebScoket handler template

package/src/TemplateData/flowSchema/externalTopic/Process/handler/data.js

@@ -20,9 +20,12 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts, utils } from '../../../../../../MainLibs/index.js';
+import consts from '../../../../../libs/Consts.js';
+import utils from '../../../../../libs/Utils.js';
+
 const { SOURCE_PATH, HANDLER } = consts;
 const { firstLetterUpperCase: upperCase } = utils;
+
 const templatePath = path.join(__dirname, 'template.ejs');
 /**
  * receive objectSchema

package/src/TemplateData/flowSchema/externalTopic/sns-in-sqs/data.js

@@ -20,7 +20,9 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts, utils } from '../../../../../MainLibs/index.js';
+import consts from '../../../../libs/Consts.js';
+import utils from '../../../../libs/Utils.js';
+
 const { SOURCE_PATH, HANDLER, SAVE_FILE_NAME } = consts;
 const { firstLetterUpperCase: upperCase } = utils;
 const templatePath = path.join(__dirname, 'template.ejs');

package/src/TemplateData/flowSchema/externalTopic/sns-out/data.js

@@ -20,13 +20,12 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts, utils } from '../../../../../MainLibs/index.js';
-const { SOURCE_PATH, HANDLER, SAVE_FILE_NAME } = consts;
+import consts from '../../../../libs/Consts.js';
+import utils from '../../../../libs/Utils.js';
+const { SOURCE_PATH, SAVE_FILE_NAME } = consts;
 const { firstLetterUpperCase: upperCase } = utils;
-const templatePath = path.join(
-  __dirname,
-  '../../../resourceYaml/sns-out/template.ejs'
-);
+
+const templatePath = path.join(__dirname, '../../../resourceYaml/sns-out/template.ejs');
 
 /**
  * create data for dynamoDbYaml tempalte from objectSchema

package/src/TemplateData/flowSchema/flowSchemaMainFunction/data.js

@@ -21,12 +21,11 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 import { NoRetryError } from '@izara_project/izara-core-library-core';
-import {
-  getObjectSchema,
-  utils as coreUtils
-} from '@izara_project/izara-core-library-service-schemas';
+import { getObjectSchema, utils as coreUtils } from '@izara_project/izara-core-library-service-schemas';
 const { createFlowTypeConcat } = coreUtils;
-import { consts, utils } from '../../../../MainLibs/index.js';
+
+import consts from '../../../libs/Consts.js';
+import utils from '../../../libs/Utils.js';
 const { SOURCE_PATH, STORAGE_TYPES } = consts;
 const { firstLetterUpperCase: upperCase, getLocalConfig } = utils;
 
@@ -82,10 +81,7 @@ async function createParamsForCreateSource(_izContext, flowSchema, srcPath) {
   }
 
   let triggerType;
-  if (
-    flowSchema.statusType === 'triggerCache' &&
-    flowSchema.hasOwnProperty('triggerType')
-  ) {
+  if (flowSchema.statusType === 'triggerCache' && flowSchema.hasOwnProperty('triggerType')) {
     triggerType = flowSchema.triggerType;
   }
   let flowSchemaComplete = upperCase(flowSchema.flowTag);

package/src/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComplete/functionYaml/data.js

@@ -20,23 +20,28 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts, utils } from '../../../../../../MainLibs/index.js';
+import consts from '../../../../../libs/Consts.js';
+import utils from '../../../../../libs/Utils.js';
+import libs from '../../../../../libs/Libs.js'
 
 const {
   HANDLER,
   SOURCE_PATH,
-  defaultIamRolePerAction,
-  createIamRole,
   RESOURCE_CLASSES,
   SNS_RESOURCE,
-  resourceNames,
   SAVE_FILE_NAME,
-  shortNameHandler,
   SQS_RESOURCE
 } = consts;
 
 const { firstLetterUpperCase: upperCase } = utils;
 
+const {
+  defaultIamRolePerAction,
+  createIamRole,
+  resourceNames,
+  shortNameHandler
+} = libs;
+
 const templatePath = path.join(__dirname, 'template.ejs');
 /**
  * receive objectSchema

package/src/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComplete/handler/data.js

@@ -20,11 +20,11 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts, utils } from '../../../../../../MainLibs/index.js';
+import consts from '../../../../../libs/Consts.js';
+import utils from '../../../../../libs/Utils.js';
 
 const { SOURCE_PATH, HANDLER } = consts;
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } =
-  utils;
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = utils;
 const templatePath = path.join(__dirname, 'template.ejs');
 
 /**

package/src/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComplete/mainFunction/data.js

@@ -20,12 +20,12 @@ import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-import { consts, utils } from '../../../../../../MainLibs/index.js';
+import consts from '../../../../../libs/Consts.js';
+import utils from '../../../../../libs/Utils.js';
 
 const { SOURCE_PATH } = consts;
 
-const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } =
-  utils;
+const { firstLetterLowerCase: lowerCase, firstLetterUpperCase: upperCase } = utils;
 const templatePath = path.join(__dirname, 'template.ejs');
 
 /**

package/src/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComponent/functionYaml/data.js

@@ -22,23 +22,27 @@ const __dirname = path.dirname(__filename);
 
 import { NoRetryError } from '@izara_project/izara-core-library-core';
 import { getObjectSchema } from '@izara_project/izara-core-library-service-schemas';
-import { consts, utils } from '../../../../../../MainLibs/index.js';
+import consts from '../../../../../libs/Consts.js';
+import utils from '../../../../../libs/Utils.js';
+import libs from '../../../../../libs/Libs.js'
 
 const {
   HANDLER,
-  STORAGE_TYPES,
   SOURCE_PATH,
-  defaultIamRolePerAction,
-  createIamRole,
   RESOURCE_CLASSES,
-  resourceNames,
-  DYNAMO_RESOURCE,
   SAVE_FILE_NAME,
-  shortNameHandler,
   SQS_RESOURCE,
   LAMBDA_RESOURCE
 } = consts;
 
+const {
+  defaultIamRolePerAction,
+  createIamRole,
+  shortNameHandler,
+  resourceNames,
+  tableRoleForFlowSchema
+} = libs;
+
 const { firstLetterUpperCase: upperCase } = utils;
 
 const templatePath = path.join(__dirname, 'template.ejs');
@@ -51,15 +55,39 @@ const templatePath = path.join(__dirname, 'template.ejs');
  */
 
 async function data(_izContext, flowSchema, srcPath) {
-  return [await createSourceParams(_izContext, flowSchema, srcPath)];
+  return await createSourceParams(_izContext, flowSchema, srcPath);
 }
 
 async function createSourceParams(_izContext, flowSchema, srcPath) {
+  let createSources = [];
   let functionName = 'Process' + upperCase(flowSchema.flowTag);
   let handlerType = upperCase(HANDLER.hdrSqs);
   let additionalResourcePermission = defaultIamRolePerAction();
   let route = upperCase(flowSchema.flowTag);
   let queueName = upperCase(flowSchema.flowTag) + handlerType;
+  let objectSchema;
+
+
+  let setting = {
+    savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+    saveFileName: upperCase(SAVE_FILE_NAME.flowSchema),
+    fileExtension: '.yml',
+    isAppend: true
+  }
+  let baseTemplateData = {
+    resourceLocation: path.join(SOURCE_PATH.resourceLocationFlowSchema, upperCase(flowSchema.flowTag), 'source/'),
+    functionName,
+    additionalResourcePermission,
+    roleName: upperCase(flowSchema.flowTag),
+  }
+
+  // getObjectSchema
+  if (flowSchema.statusType === 'storedCache' || flowSchema.statusType === 'triggerCache' || flowSchema.statusType === 'statusField') {
+    objectSchema = await getObjectSchema.getLocalObjectSchemas(_izContext, [flowSchema.objType.objectType], path.join(srcPath, './schemas')).then(res => res.records[0]);
+    if (!objectSchema) {
+      throw new NoRetryError('ObjectSchema not found');
+    }
+  }
 
   additionalResourcePermission.push(
     createIamRole(
@@ -74,37 +102,7 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
   );
 
   if (flowSchema.statusType === 'storedCache') {
-    let tableStoredCache = [];
-    let objectSchema = await getObjectSchema
-      .getLocalObjectSchemas(
-        _izContext,
-        [flowSchema.objType.objectType],
-        path.join(srcPath, './schemas')
-      )
-      .then(res => res.records[0]);
-    if (!objectSchema) {
-      throw new NoRetryError('ObjectSchema not found');
-    }
-    for (const storageResource of Object.values(
-      objectSchema.storageResources
-    )) {
-      if (storageResource.storageType === STORAGE_TYPES.dynamoDB) {
-        if (!tableStoredCache.includes(storageResource.tableName)) {
-          tableStoredCache.push(storageResource.tableName);
-        }
-      }
-    }
-
-    additionalResourcePermission.push(
-      createIamRole(
-        {
-          [RESOURCE_CLASSES.dynamoDbTable]: Object.values(DYNAMO_RESOURCE)
-        },
-        tableStoredCache.map(tableName =>
-          resourceNames(RESOURCE_CLASSES.dynamoDbTable, tableName)
-        )
-      )
-    );
+    additionalResourcePermission.push(...tableRoleForFlowSchema(objectSchema));
   } else if (flowSchema.statusType === 'statusField') {
     additionalResourcePermission.push(
       createIamRole(
@@ -114,32 +112,41 @@ async function createSourceParams(_izContext, flowSchema, srcPath) {
         [resourceNames(RESOURCE_CLASSES.lambda, 'CreateHdrInv')]
       )
     );
+  } else if (flowSchema.statusType === 'triggerCache') {
+    let dsqQueueName = upperCase(flowSchema.flowTag) + upperCase(HANDLER.hdrDsq);
+    additionalResourcePermission.push(...tableRoleForFlowSchema(objectSchema));
+    additionalResourcePermission.push(
+      createIamRole({
+        [RESOURCE_CLASSES.sqs]: Object.values(SQS_RESOURCE)
+      }, [
+        resourceNames(RESOURCE_CLASSES.sqs, dsqQueueName),
+        resourceNames(RESOURCE_CLASSES.sqs, dsqQueueName + 'DLQ')
+      ]
+      )
+    )
+    createSources.push({
+      templatePath: templatePath,
+      templateData: {
+        ...baseTemplateData,
+        handlerType: upperCase(HANDLER.hdrDsq),
+        functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(HANDLER.hdrDsq)),
+        queueName: dsqQueueName
+      },
+      setting: setting
+    })
   }
 
-  return {
+  createSources.push({
     templatePath: templatePath,
     templateData: {
-      resourceLocation: path.join(
-        SOURCE_PATH.resourceLocationFlowSchema,
-        upperCase(flowSchema.flowTag),
-        'source/'
-      ),
-      functionName,
+      ...baseTemplateData,
       handlerType,
-      additionalResourcePermission,
-      route,
-      functionNameConfig:
-        upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
-      roleName: upperCase(flowSchema.flowTag),
+      functionNameConfig: upperCase(functionName) + upperCase(shortNameHandler(handlerType)),
       queueName
     },
-    setting: {
-      savePath: path.join(srcPath, SOURCE_PATH.appYaml),
-      saveFileName: upperCase(SAVE_FILE_NAME.flowSchema),
-      fileExtension: '.yml',
-      isAppend: true
-    }
-  };
+    setting: setting
+  });
+  return createSources;
 }
 
 export default data;

package/src/TemplateData/flowSchema/flowSchemaOwnTopic/EndpointComponent/functionYaml/template.ejs

@@ -9,10 +9,6 @@
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- queueName %>
         batchSize: 10
-        filterPatterns: #**** need to update serverless framework upper v.2.69.1
-          - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%- functionName %>"]}}} # functionName of callingFlow
-          - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
-
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>