@izara_project/izara-core-generate-service-code 1.0.74 → 1.0.76

package/src/emit/rbac/emitRbacApplicationArtifacts.js

@@ -21,11 +21,16 @@ export async function emitRbacApplicationArtifacts(objects) {
     return [];
   }
 
+  const hasSelfRbac = objects.some(hasSelfRbacAddOn);
   const handlers = await Promise.all([
-    createTargetRoleHandler(),
-    ...LIST_DEFINITIONS.map(createListHandler),
-    ...MUTATION_DEFINITIONS.map(createMutationHandler),
-    ...USER_ROLE_MUTATIONS.map(createUserRoleMutationHandler),
+    ...(hasSelfRbac
+      ? [
+          createTargetRoleHandler(),
+          ...LIST_DEFINITIONS.map(createListHandler),
+          ...MUTATION_DEFINITIONS.map(createMutationHandler),
+          ...USER_ROLE_MUTATIONS.map(createUserRoleMutationHandler)
+        ]
+      : []),
     ...objects.filter(hasRbacAddOn).map(createUserRbacFlowHandler)
   ]);
   return [
@@ -83,49 +88,42 @@ const USER_ROLE_MUTATIONS = [
   { flowTag: 'DeleteUserFromRole', operation: 'Delete' }
 ];
 
+const STATIC_RBAC_APPLICATION_PATHS = [
+  'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_Main.js',
+  'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_HdrSqs.js',
+  'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_WbsMain.js',
+  'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_HdrWbs.js',
+  ...LIST_DEFINITIONS.flatMap(({ flowTag }) => [
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_Main.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrSqs.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrApi.js`
+  ]),
+  ...MUTATION_DEFINITIONS.flatMap(({ flowTag }) => [
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_Main.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrSqs.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_WbsMain.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrWbs.js`
+  ]),
+  ...USER_ROLE_MUTATIONS.flatMap(({ flowTag }) => [
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_Main.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrSqs.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_WbsMain.js`,
+    `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrWbs.js`
+  ]),
+  FLOW_RBAC_YAML_PATH
+];
+
 export function rbacApplicationManagedPaths(objects = []) {
   if (!Array.isArray(objects)) {
     throw new TypeError('objects must be an array');
   }
-  return [
-    'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_Main.js',
-    'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_HdrSqs.js',
-    'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_WbsMain.js',
-    'app/src/generatedCode/FlowRbac/CreateTargetRole/source/CreateTargetRole_HdrWbs.js',
-    ...LIST_DEFINITIONS.flatMap(({ flowTag }) => [
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_Main.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrSqs.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrApi.js`
-    ]),
-    ...MUTATION_DEFINITIONS.flatMap(({ flowTag }) => [
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_Main.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrSqs.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_WbsMain.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrWbs.js`
-    ]),
-    ...USER_ROLE_MUTATIONS.flatMap(({ flowTag }) => [
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_Main.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrSqs.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_WbsMain.js`,
-      `app/src/generatedCode/FlowRbac/${flowTag}/source/${flowTag}_HdrWbs.js`
-    ]),
-    ...objects.filter(hasRbacAddOn).flatMap((object) => {
-      const flowTag = rbacFlowTag(object);
-      const sourcePath = `app/src/generatedCode/FlowRbac/${flowTag}/source`;
-      return [
-        `${sourcePath}/${flowTag}_Main.js`,
-        `${sourcePath}/${flowTag}_HdrSqs.js`
-      ];
-    }),
-    FLOW_RBAC_YAML_PATH
-  ];
-}
-
-function hasRbacAddOn(object) {
-  return (
-    Array.isArray(object?.addOnDataStructure) &&
-    object.addOnDataStructure.some((addOn) => addOn?.type === 'rbac')
-  );
+  const rbacObjects = objects.filter(hasRbacAddOn);
+  const sourcePaths = rbacObjects.flatMap((object) => {
+    const flowTag = rbacFlowTag(object);
+    const sourcePath = `app/src/generatedCode/FlowRbac/${flowTag}/source`;
+    return [`${sourcePath}/${flowTag}_Main.js`, `${sourcePath}/${flowTag}_HdrSqs.js`];
+  });
+  return [...STATIC_RBAC_APPLICATION_PATHS, ...sourcePaths];
 }
 
 async function createTargetRoleHandler() {
@@ -367,3 +365,20 @@ async function renderTemplate(templateUrl, templateName, data) {
     data
   );
 }
+
+function hasSelfRbacAddOn(object) {
+  return (
+    Array.isArray(object?.addOnDataStructure) &&
+    object.addOnDataStructure.some((addOn) => addOn?.type === 'rbac')
+  );
+}
+
+function hasRbacAddOn(object) {
+  const selfHasRbac = hasSelfRbacAddOn(object);
+  const belongToHasRbac =
+    Array.isArray(object?.belongToSchema?.addOnDataStructure) &&
+    object.belongToSchema.addOnDataStructure.some(
+      (addOn) => addOn?.type === 'rbac'
+    );
+  return selfHasRbac || belongToHasRbac;
+}

package/src/emit/rbac/templates/CreateTargetRole_HdrSqs.ejs

@@ -15,33 +15,81 @@ 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,
+  validatorSchema
+} from '@izara_project/izara-middleware';
 import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record-handler';
+import Logger from '@izara_project/izara-core-library-logger';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+
 import CreateTargetRole from './CreateTargetRole_Main.js';
 
+// validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
 
-export const main = middleware.wrap(async (event) =>
-  Promise.all(
-    event.Records.map(async (record) => {
-      await recordHandlerSharedLib.validateRecord(
-        record,
-        'CreateTargetRoleHdrSqs',
-        {},
-        null
-      );
-      return recordHandlerSharedLib.recordHandler(
-        record,
-        CreateTargetRole,
-        'CreateTargetRoleHdrSqs',
-        [
-          record.body.Message,
+let perRecordsValidatorSchema = {
+  type: 'object',
+  properties: {}
+};
+
+export const main = middleware.wrap(async (event, context) => {
+  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
+          'CreateTargetRoleHdrSqs', // queue name that need to retry or send to dlq
+          perRecordsValidatorSchema // schema for record.Message
+        );
+
+        // add argument (to invoke lambda) to passOnProperties[]
+        passOnProperties.push(record.body.Message);
+        passOnProperties.push(
           callingFlowSharedLib.addCallingFlowToPassOnProperties(
             record.body.Message
           )
-        ]
+        );
+        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
+          CreateTargetRole, // mainFunction that need to invoke.
+          'CreateTargetRoleHdrSqs', // 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
+    } catch {
+      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, LambdaFunctionHdrSqs: ', err);
+    throw err;
+  }
+});

package/src/emit/rbac/templates/ListRbac_HdrSqs.ejs

@@ -15,32 +15,81 @@ 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,
+  validatorSchema
+} from '@izara_project/izara-middleware';
 import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record-handler';
+import Logger from '@izara_project/izara-core-library-logger';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+
 import <%- flowTag %> from './<%- flowTag %>_Main.js';
 
+// validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
-export const main = middleware.wrap(async (event) =>
-  Promise.all(
-    event.Records.map(async (record) => {
-      await recordHandlerSharedLib.validateRecord(
-        record,
-        '<%- flowTag %>HdrSqs',
-        {},
-        null
-      );
-      return recordHandlerSharedLib.recordHandler(
-        record,
-        <%- flowTag %>,
-        '<%- flowTag %>HdrSqs',
-        [
-          record.body.Message,
+
+let perRecordsValidatorSchema = {
+  type: 'object',
+  properties: {}
+};
+
+export const main = middleware.wrap(async (event, context) => {
+  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
+          '<%- flowTag %>HdrSqs', // queue name that need to retry or send to dlq
+          perRecordsValidatorSchema // schema for record.Message
+        );
+
+        // add argument (to invoke lambda) to passOnProperties[]
+        passOnProperties.push(record.body.Message);
+        passOnProperties.push(
           callingFlowSharedLib.addCallingFlowToPassOnProperties(
             record.body.Message
           )
-        ]
+        );
+        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
+          <%- flowTag %>, // mainFunction that need to invoke.
+          '<%- flowTag %>HdrSqs', // 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
+    } catch {
+      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, LambdaFunctionHdrSqs: ', err);
+    throw err;
+  }
+});

package/src/emit/rbac/templates/UserRbacFlow_HdrSqs.ejs

@@ -15,32 +15,81 @@ 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,
+  validatorSchema
+} from '@izara_project/izara-middleware';
 import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record-handler';
+import Logger from '@izara_project/izara-core-library-logger';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+
 import <%- flowTag %> from './<%- flowTag %>_Main.js';
 
+// validate event properties in body.Message of sqs event
 middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
-export const main = middleware.wrap(async (event) =>
-  Promise.all(
-    event.Records.map(async (record) => {
-      await recordHandlerSharedLib.validateRecord(
-        record,
-        '<%- flowTag %>HdrSqs',
-        {},
-        null
-      );
-      return recordHandlerSharedLib.recordHandler(
-        record,
-        <%- flowTag %>,
-        '<%- flowTag %>HdrSqs',
-        [
-          record.body.Message,
+
+let perRecordsValidatorSchema = {
+  type: 'object',
+  properties: {}
+};
+
+export const main = middleware.wrap(async (event, context) => {
+  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
+          '<%- flowTag %>HdrSqs', // queue name that need to retry or send to dlq
+          perRecordsValidatorSchema // schema for record.Message
+        );
+
+        // add argument (to invoke lambda) to passOnProperties[]
+        passOnProperties.push(record.body.Message);
+        passOnProperties.push(
           callingFlowSharedLib.addCallingFlowToPassOnProperties(
             record.body.Message
           )
-        ]
+        );
+        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
+          <%- flowTag %>, // mainFunction that need to invoke.
+          '<%- flowTag %>HdrSqs', // 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
+    } catch {
+      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, LambdaFunctionHdrSqs: ', err);
+    throw err;
+  }
+});

package/src/emit/relationship/emitDynamicRelationshipFlowSchemas.js

@@ -41,6 +41,15 @@ function createDynamicRelationshipFlow(action) {
   const flowSteps = [
     {
       stepName: 'start',
+      ...(outputTopic
+        ? {
+            nextSteps: [
+              {
+                stepName: 'Complete'
+              }
+            ]
+          }
+        : {}),
       properties: [],
       messageAttributes: MESSAGE_ATTRIBUTES,
       ...(outputTopic
@@ -58,7 +67,18 @@ function createDynamicRelationshipFlow(action) {
     flowSteps.push({
       stepName: 'Complete',
       event: ['extTopic'],
-      properties: [],
+      previousSteps: [
+        {
+          stepName: 'start'
+        }
+      ],
+      properties: [
+        'returnValue',
+        'parentFlowId',
+        'status',
+        'errorsFound',
+        'graphServiceTag'
+      ],
       messageAttributes: MESSAGE_ATTRIBUTES
     });
   }

package/src/emit/relationship/emitRelationshipApplicationArtifacts.js

@@ -158,7 +158,7 @@ async function emitAction(action, relationships, flows, serviceTag) {
     },
     {
       path: `${source}/${complete}_HdrSqs.js`,
-      content: await renderShared('FlowHandler_HdrSqs.ejs', {
+      content: await render(`${action}Complete_HdrSqs.ejs`, {
         ...shared,
         flowStepName: 'Complete',
         mainFileName: `${complete}_Main`,

package/src/emit/relationship/templates/ChangeRelationshipComplete_HdrSqs.ejs

@@ -0,0 +1,99 @@
+import { middlewareHandler as middleware } from '@izara_project/izara-middleware';
+import { recordHandlerSharedLib } from '@izara_project/izara-core-library-record-handler';
+import Logger from '@izara_project/izara-core-library-logger';
+import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+import ChangeRelationshipComplete from './ChangeRelationshipComplete_Main.js';
+
+//(<optionalRequire>)
+//(</optionalRequire>)
+
+// validate event properties in body.Message of sqs event
+let perRecordsValidatorSchema = {
+  type: 'object',
+  properties: {
+    returnValue: {
+      type: 'object'
+    },
+    parentFlowId: {
+      type: 'string'
+    },
+    status: {
+      type: 'string'
+    },
+    errorsFound: {
+      type: 'array'
+    },
+    graphServiceTag: {
+      type: 'string'
+    }
+  },
+  required: [
+    'returnValue',
+    'parentFlowId',
+    'status',
+    'errorsFound',
+    'graphServiceTag'
+  ]
+  //(<validatorSchema>)
+  //(</validatorSchema>)
+};
+
+let messageAttributeValidatorSchema = null;
+middleware.setValidatorSchema(recordHandlerSharedLib.baseValidatorSchema());
+
+export const main = middleware.wrap(async (event, context) => {
+  try {
+    let recordPromises = [];
+
+    // loop each record and send to mainFunction
+    await Promise.all(
+      event.Records.map(async (record) => {
+        let passOnProperties = [];
+        record._izContext.logger.debug('record ReceiveMsgOutHdrSqs', record);
+
+        //validate message (and MessageAttributes)
+        await recordHandlerSharedLib.validateRecord(
+          record, // one record will send to mainFunction
+          'ChangeRelationshipCompleteHdrSqs', // queue name that need to retry or send to dlq
+          perRecordsValidatorSchema, // schema for record.Message
+          messageAttributeValidatorSchema
+        );
+
+        // add argument (to invoke lambda) to passOnProperties[]
+        passOnProperties.push(record.body.Message);
+        passOnProperties.push(
+          callingFlowSharedLib.addPassBackPropertiesToPassOnProperties(
+            record.body.Message
+          )
+        );
+        //(<additionalParams>)
+        //(</additionalParams>)
+        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
+          ChangeRelationshipComplete, // mainFunction that need to invoke.
+          'ChangeRelationshipCompleteHdrSqs', // 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
+      })
+    );
+    try {
+      await Promise.all(recordPromises);
+      return event.Records;
+    } catch {
+      Logger.debug(
+        'Promise.all(recordPromises) in handler threw error (at least one record did no resolve)'
+      );
+    }
+  } catch (error) {
+    Logger.error('Unhandled Error, ChangeRelationshipComplete_HdrSqs: ', error);
+    throw error;
+  }
+});