@izara_project/izara-core-generate-service-code 1.0.89 → 1.0.91

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

@@ -20,7 +20,7 @@ let perRecordsValidatorSchema = {
     status: {
       type: 'string'
     },
-    errorsFound: {
+    foundErrors: {
       type: 'array'
     },
     graphServiceTag: {
@@ -31,7 +31,7 @@ let perRecordsValidatorSchema = {
     'returnValue',
     'parentFlowId',
     'status',
-    'errorsFound',
+    'foundErrors',
     'graphServiceTag'
   ]
   //(<validatorSchema>)

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

@@ -44,7 +44,7 @@ export default async function getRelationshipComplete(
       returnValue,
       parentFlowId,
       status,
-      errorsFound,
+      foundErrors,
       graphServiceTag
     } = requestParams;
 
@@ -52,7 +52,7 @@ export default async function getRelationshipComplete(
       returnValue: returnValue,
       parentFlowId: parentFlowId,
       status: status,
-      errorsFound: errorsFound,
+      foundErrors: foundErrors,
       graphServiceTag: graphServiceTag,
       passBackProperties: passBackProperties
     });
@@ -63,7 +63,7 @@ export default async function getRelationshipComplete(
       relType: returnValue.requestParams.relType,
       relationshipProperties: returnValue.requestParams.relationshipProperties,
       status: status,
-      errorsFound: errorsFound
+      foundErrors: foundErrors
     };
 
     createCompleteMsg =
@@ -110,13 +110,13 @@ export default async function getRelationshipComplete(
       _izContext,
       awaitingStepId,
       pendingStepId,
-      errorsFound
+      foundErrors
     );
 
     return {
       returnValue,
       status,
-      errorsFound
+      foundErrors
     };
   } catch (err) {
     _izContext.logger.error('error GetRelationshipComplete:', err);

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

@@ -84,7 +84,7 @@ export default async function getRelationship(
       //(</requestParamGetRel>)
     } = requestParams;
 
-    let errorsFound = [];
+    let foundErrors = [];
 
     //(<beforeValidateGetRel>)
     //(</beforeValidateGetRel>)
@@ -103,7 +103,7 @@ export default async function getRelationship(
       );
 
       if (!objectSchema) {
-        errorsFound.push(
+        foundErrors.push(
           `validateIdentifiers, not found schema of ${objTypeString}`
         );
       }
@@ -114,7 +114,7 @@ export default async function getRelationship(
         ];
         for (const identifierName of identifierNames) {
           if (!identifiersObject.hasOwnProperty(identifierName)) {
-            errorsFound.push(
+            foundErrors.push(
               `validateIdentifiers, ${objTypeString} ` +
                 `property:${identifierName} not exists`
             );
@@ -123,7 +123,7 @@ export default async function getRelationship(
               typeof identifiersObject[identifierName] !== 'string' &&
               typeof identifiersObject[identifierName] !== 'number'
             ) {
-              errorsFound.push(
+              foundErrors.push(
                 `validateIdentifiers, ${objTypeString} ` +
                   `property:${identifierName} should be string or number`
               );
@@ -227,7 +227,7 @@ export default async function getRelationship(
                         usedStorageResource.graphServerTag
                       );
                       if (!graphServiceTag) {
-                        errorsFound.push(
+                        foundErrors.push(
                           `storageResourceTag: ${storageResourceTag} ` +
                             `invalid, not found graph serviceTag from ` +
                             `graphServerTag: ${usedStorageResource.graphServerTag}`
@@ -255,15 +255,15 @@ export default async function getRelationship(
         );
 
         if (!targetStorageResources.length) {
-          errorsFound.push(`Not found link from relationship schema`);
+          foundErrors.push(`Not found link from relationship schema`);
         }
       }
     } else {
-      errorsFound.push(`relationshipSchema not exists`);
+      foundErrors.push(`relationshipSchema not exists`);
     }
 
     // if found errors will stop processing
-    if (errorsFound.length) {
+    if (foundErrors.length) {
       let getRelCompleteMsg = {
         firstObject: firstObject,
         secondObject: secondObject,
@@ -272,7 +272,7 @@ export default async function getRelationship(
         //(<inGetRelCompleteMsgCrateRel>)
         //(</inGetRelCompleteMsgCrateRel>)
         status: 'error',
-        errorsFound: errorsFound
+        foundErrors: foundErrors
       };
 
       // if have callingFlow will send to message complete

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

@@ -20,7 +20,7 @@ let perRecordsValidatorSchema = {
     status: {
       type: 'string'
     },
-    errorsFound: {
+    foundErrors: {
       type: 'array'
     },
     graphServiceTag: {
@@ -31,7 +31,7 @@ let perRecordsValidatorSchema = {
     'returnValue',
     'parentFlowId',
     'status',
-    'errorsFound',
+    'foundErrors',
     'graphServiceTag'
   ]
   //(<validatorSchema>)

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

@@ -44,7 +44,7 @@ export default async function <%- functionName %>(
       returnValue,
       parentFlowId,
       status,
-      errorsFound,
+      foundErrors,
       graphServiceTag
     } = requestParams;
 
@@ -52,7 +52,7 @@ export default async function <%- functionName %>(
       returnValue: returnValue,
       parentFlowId: parentFlowId,
       status: status,
-      errorsFound: errorsFound,
+      foundErrors: foundErrors,
       graphServiceTag: graphServiceTag,
       passBackProperties: passBackProperties
     });
@@ -76,7 +76,7 @@ export default async function <%- functionName %>(
       _izContext.logger.warn(
         `No pending step found for awaitingStepId: ${awaitingStepId}`
       );
-      return { returnValue, status, errorsFound };
+      return { returnValue, status, foundErrors };
     }
 
     const result =
@@ -84,7 +84,7 @@ export default async function <%- functionName %>(
         _izContext,
         pending.pendingStepId,
         awaitingStepId,
-        errorsFound
+        foundErrors
       );
     _izContext.logger.debug(
       '[<%- functionName %>] all awaiting steps result',
@@ -109,7 +109,7 @@ export default async function <%- functionName %>(
         moveObject: returnValue.requestParams.moveObject,
         status: status,
         parentFlowId: parentFlowId || returnValue?.parentFlowId,
-        errorsFound: errorsFound
+        foundErrors: foundErrors
       };
 
       const callingFlowConfig =
@@ -167,7 +167,7 @@ export default async function <%- functionName %>(
     return {
       returnValue,
       status,
-      errorsFound
+      foundErrors
     };
   } catch (err) {
     _izContext.logger.error('error createRelationshipComplete:', err);

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

@@ -93,7 +93,7 @@ export default async function moveRelationship(
     } = requestParams;
 
     const parentFlowId = identifierUuid();
-    let errorsFound = [];
+    let foundErrors = [];
 
     //(<beforeValidateMoveRel>)
     //(</beforeValidateMoveRel>).
@@ -110,7 +110,7 @@ export default async function moveRelationship(
       );
 
       if (!objectSchema) {
-        errorsFound.push(
+        foundErrors.push(
           `validateIdentifiers, not found schema of ${objTypeString}`
         );
       }
@@ -121,7 +121,7 @@ export default async function moveRelationship(
         ];
         for (const identifierName of identifierNames) {
           if (!identifiersObject.hasOwnProperty(identifierName)) {
-            errorsFound.push(
+            foundErrors.push(
               `validateIdentifiers, ${objTypeString} property:${identifierName} not exists`
             );
           } else {
@@ -129,7 +129,7 @@ export default async function moveRelationship(
               typeof identifiersObject[identifierName] !== 'string' &&
               typeof identifiersObject[identifierName] !== 'number'
             ) {
-              errorsFound.push(
+              foundErrors.push(
                 `validateIdentifiers, ${objTypeString} property:${identifierName} should be string or number`
               );
             }
@@ -163,13 +163,13 @@ export default async function moveRelationship(
       !relationshipSchema.hasOwnProperty('moveBy') ||
       relationshipSchema.moveBy === 'none'
     ) {
-      errorsFound.push(`relationship: ${relType.relationshipTag} can't move`);
+      foundErrors.push(`relationship: ${relType.relationshipTag} can't move`);
       // ? Legacy Code:
       /*
     } else if (relationshipSchema.moveBy === "user") {
       if (callingFlowConfig) {
         if (callingFlowConfig.callingFlow !== "ImportDataTestExternalUpdateRelationshipHdrSqs") {
-          errorsFound.push(`moveBy is user but it's not user process with importData`);
+          foundErrors.push(`moveBy is user but it's not user process with importData`);
         }
       }
     }
@@ -177,7 +177,7 @@ export default async function moveRelationship(
       // ? [Fix]: The legacy logic incorrectly blocked "user" from regular execution and allowed non-user values.
       // ? It has been corrected to require moveBy === "user" for normal execution.
     } else if (relationshipSchema.moveBy !== 'user') {
-      errorsFound.push(
+      foundErrors.push(
         `relationship: ${relType.relationshipTag} moveBy is not user`
       );
     }
@@ -199,7 +199,7 @@ export default async function moveRelationship(
     );
 
     if (!links.length) {
-      errorsFound.push(
+      foundErrors.push(
         `not found link between ${JSON.stringify({ firstObject: firstObject.objType })} ${JSON.stringify({ secondObject: secondObject.objType })}`
       );
     }
@@ -238,7 +238,7 @@ export default async function moveRelationship(
     }
 
     if (checkCorrectLink == false) {
-      errorsFound.push(`Wrong Relationship Direction`);
+      foundErrors.push(`Wrong Relationship Direction`);
     }
 
     let targetStorageResources = [];
@@ -286,7 +286,7 @@ export default async function moveRelationship(
                       usedStorageResource.graphServerTag
                     );
                     if (!graphServiceTag) {
-                      errorsFound.push(
+                      foundErrors.push(
                         `storageResourceTag: ${storageResourceTag} invalid, not found graph serviceTag from graphServerTag: ${usedStorageResource.graphServerTag}`
                       );
                     }
@@ -312,23 +312,23 @@ export default async function moveRelationship(
       );
 
       if (!targetStorageResources.length) {
-        errorsFound.push(`Not found link from relationship schema`);
+        foundErrors.push(`Not found link from relationship schema`);
       }
 
       // validate properties exists with schema
       for (const propKey in relationshipProperties) {
         if (!relationshipSchema.fieldNames.hasOwnProperty(propKey)) {
-          errorsFound.push(
+          foundErrors.push(
             `property: ${propKey} not exists in relationshipSchema`
           );
         }
       }
     } else {
-      errorsFound.push(`relationshipSchema not exists`);
+      foundErrors.push(`relationshipSchema not exists`);
     }
 
     // if found errors will stop processing
-    if (errorsFound.length) {
+    if (foundErrors.length) {
       let moveRelCompleteMsg = {
         firstObject,
         secondObject,
@@ -339,7 +339,7 @@ export default async function moveRelationship(
         //(<inMoveCompleteMsg>)
         //(</inMoveCompleteMsg>)
         status: 'error',
-        errorsFound: errorsFound,
+        foundErrors: foundErrors,
         parentFlowId: parentFlowId
       };
 

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

@@ -20,7 +20,7 @@ let perRecordsValidatorSchema = {
     status: {
       type: 'string'
     },
-    errorsFound: {
+    foundErrors: {
       type: 'array'
     },
     graphServiceTag: {
@@ -31,7 +31,7 @@ let perRecordsValidatorSchema = {
     'returnValue',
     'parentFlowId',
     'status',
-    'errorsFound',
+    'foundErrors',
     'graphServiceTag'
   ]
   //(<validatorSchema>)

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

@@ -45,7 +45,7 @@ export default async function updateRelationshipComplete(
       returnValue,
       parentFlowId,
       status,
-      errorsFound,
+      foundErrors,
       graphServiceTag
     } = requestParams;
 
@@ -53,7 +53,7 @@ export default async function updateRelationshipComplete(
       returnValue: returnValue,
       parentFlowId: parentFlowId,
       status: status,
-      errorsFound: errorsFound,
+      foundErrors: foundErrors,
       graphServiceTag: graphServiceTag,
       passBackProperties: passBackProperties
       // callingFlowConfig: callingFlowConfig
@@ -78,7 +78,7 @@ export default async function updateRelationshipComplete(
       _izContext.logger.warn(
         `No pending step found for awaitingStepId: ${awaitingStepId}`
       );
-      return { returnValue, status, errorsFound };
+      return { returnValue, status, foundErrors };
     }
 
     const result =
@@ -86,7 +86,7 @@ export default async function updateRelationshipComplete(
         _izContext,
         pending.pendingStepId,
         awaitingStepId,
-        errorsFound
+        foundErrors
       );
     _izContext.logger.debug(
       '[UpdateRelationshipComplete] all awaiting steps result',
@@ -104,7 +104,7 @@ export default async function updateRelationshipComplete(
         relId: returnValue.requestParams.relId,
         relType: returnValue.requestParams.relType,
         status: status,
-        errorsFound: errorsFound
+        foundErrors: foundErrors
         //(<inUpdateCompleteMsg>)
         //(</inUpdateCompleteMsg>)
       };
@@ -158,7 +158,7 @@ export default async function updateRelationshipComplete(
     return {
       returnValue,
       status,
-      errorsFound
+      foundErrors
     };
   } catch (err) {
     _izContext.logger.error('error updateRelationshipComplete:', err);

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

@@ -88,7 +88,7 @@ export default async function updateRelationship(
       //(</requestParamUpdateRel>)
     } = requestParams;
 
-    let errorsFound = [];
+    let foundErrors = [];
     const parentFlowId = identifierUuid();
 
     //(<beforeValidateUpdateRel>)
@@ -106,7 +106,7 @@ export default async function updateRelationship(
       );
 
       if (!objectSchema) {
-        errorsFound.push(
+        foundErrors.push(
           `validateIdentifiers, not found schema of ${objTypeString}`
         );
       }
@@ -116,7 +116,7 @@ export default async function updateRelationship(
           schemaIdentifier.fieldName || schemaIdentifier.name;
 
         if (!identifiersObject.hasOwnProperty(identifierName)) {
-          errorsFound.push(
+          foundErrors.push(
             `validateIdentifiers, ${objTypeString} property:${identifierName} not exists`
           );
         } else {
@@ -124,7 +124,7 @@ export default async function updateRelationship(
             typeof identifiersObject[identifierName] !== 'string' &&
             typeof identifiersObject[identifierName] !== 'number'
           ) {
-            errorsFound.push(
+            foundErrors.push(
               `validateIdentifiers, ${objTypeString} property:${identifierName} should be string or number`
             );
           }
@@ -225,7 +225,7 @@ export default async function updateRelationship(
                         usedStorageResource.graphServerTag
                       );
                       if (!graphServiceTag) {
-                        errorsFound.push(
+                        foundErrors.push(
                           `storageResourceTag:${storageResourceTag} invalid, not found graph serviceTag from graphServerTag:${usedStorageResource.graphServerTag}`
                         );
                       }
@@ -252,7 +252,7 @@ export default async function updateRelationship(
       );
 
       if (!targetStorageResources.length) {
-        errorsFound.push(`Not found link from relationship schema`);
+        foundErrors.push(`Not found link from relationship schema`);
       }
 
       // validate canUpdate properties relationship
@@ -269,21 +269,21 @@ export default async function updateRelationship(
                 callingFlowConfig.callingFlow !==
                 'ImportDataTestExternalUpdateRelationshipHdrSqs'
               ) {
-                errorsFound.push(
+                foundErrors.push(
                   `property:${propKey} can update  user but it's not user process with importData`
                 );
               }
             }
           }
         } else {
-          errorsFound.push(
+          foundErrors.push(
             `property:${propKey} not exists in relationshipSchema`
           );
         }
       }
 
       // if found errors will stop processing
-      if (errorsFound.length) {
+      if (foundErrors.length) {
         let updateCompleteMsg = {
           firstObject: firstObject,
           secondObject: secondObject,
@@ -291,7 +291,7 @@ export default async function updateRelationship(
           relType: relType,
           relationshipDirection,
           status: 'error',
-          errorsFound: errorsFound,
+          foundErrors: foundErrors,
           parentFlowId: parentFlowId
           //(<inUpdateCompleteMsgUpdateRel>)
           //(</inUpdateCompleteMsgUpdateRel>)
@@ -524,7 +524,7 @@ export default async function updateRelationship(
         relId: relId,
         relType: relType,
         relationshipDirection,
-        errorsFound
+        foundErrors
       };
     }
   } catch (err) {

package/src/emit/resource/emitResourceArtifacts.js

@@ -204,7 +204,7 @@ export const resourceArtifactPaths = [
 function createResourceState({ objects, relationships, flows }) {
   const crud = objects.some(isCrudObject);
   const selfRbac = objects.some(hasSelfRbacAddOn);
-  const rbac = objects.some(hasSelfRbacAddOn);
+  const rbac = objects.some((obj) => hasRbacAddOn(obj, objects));
   const crudActionPlans = createCrudActionPlans(objects, flows);
 
   const crudOwnTopics = crud ? [...CRUD_ACTIONS] : [];
@@ -244,9 +244,9 @@ function createResourceState({ objects, relationships, flows }) {
       rbacSqsQueues.push(`Process${action}HdrSqs`);
     }
   }
-  if (rbac) {
+  if (selfRbac) {
     const flowTags = [
-      ...new Set(objects.filter(hasRbacAddOn).map(rbacFlowTag))
+      ...new Set(objects.filter(hasSelfRbacAddOn).map(rbacFlowTag))
     ];
     for (const flowTag of flowTags) {
       rbacOwnTopics.push(flowTag);
@@ -433,6 +433,7 @@ function createResourceState({ objects, relationships, flows }) {
   return {
     crud,
     rbac,
+    selfRbac,
     crudActionPlans,
     crudOwnTopics: [...new Set(crudOwnTopics)].filter(Boolean).sort(),
     crudSqsQueues: [...new Set(crudSqsQueues)].filter(Boolean).sort(),
@@ -638,7 +639,7 @@ async function renderDynamo(state) {
   const [system, ...tables] = await Promise.all([
     render('SystemDynamoDB_Yaml.ejs', {
       hasS3: state.s3FlowTags.length > 0,
-      hasRbac: state.rbac
+      hasRbac: state.selfRbac
     }),
     ...state.tables.map((table) => render('DynamoDBTable_Yaml.ejs', table))
   ]);
@@ -650,7 +651,7 @@ async function renderIam(state) {
   const roles = ['ProcFindDataRole', 'RegisterRole'];
   if (state.crud) roles.push('FlowObjectsRole');
   if (state.relationships) roles.push('FlowRelationshipRole');
-  if (state.rbac) roles.push('FlowRbacRole');
+  if (state.selfRbac) roles.push('FlowRbacRole');
   if (state.websocket) roles.push('WebSocketMainRole');
   roles.push(...state.customRoles);
   const sortedRoles = roles.sort();
@@ -668,8 +669,21 @@ async function renderIam(state) {
 function getRbacValidatorServiceTags(state) {
   const tags = new Set();
   for (const obj of state.objects || []) {
-    if (obj.belongTo?.serviceTag && obj.belongTo.serviceTag !== 'Rbac') {
-      tags.add(obj.belongTo.serviceTag);
+    const targets = obj?.belongTo
+      ? Array.isArray(obj.belongTo)
+        ? obj.belongTo
+        : [obj.belongTo]
+      : [];
+    for (const target of targets) {
+      if (target?.serviceTag && target.serviceTag !== 'Rbac') {
+        tags.add(target.serviceTag);
+      }
+    }
+    if (
+      obj.belongToSchema?.serviceTag &&
+      obj.belongToSchema.serviceTag !== 'Rbac'
+    ) {
+      tags.add(obj.belongToSchema.serviceTag);
     }
   }
   return Array.from(tags).sort();
@@ -751,7 +765,7 @@ function addStatement(statements, action, resource) {
 
 function roleNeedsSchemaRead(state, roleName) {
   if (!roleName.endsWith('Role') || !roleName) return false;
-  return roleName !== 'FlowRbacRole' || state.rbac;
+  return roleName !== 'FlowRbacRole' || state.selfRbac;
 }
 
 function roleTableNames(state, roleName) {
@@ -767,7 +781,7 @@ function roleTableNames(state, roleName) {
       'AwaitingMultipleSteps',
       'AwaitingMultipleStepByPending',
       'WebSocketTask',
-      ...(state.rbac
+      ...(state.selfRbac
         ? [
             'Roles',
             'TargetRoles',
@@ -1288,20 +1302,36 @@ function hasSelfRbacAddOn(object) {
   );
 }
 
-function hasRbacAddOn(object) {
-  return hasSelfRbacAddOn(object);
+function hasRbacAddOn(object, objects = []) {
+  const selfHasRbac = hasSelfRbacAddOn(object);
+  const belongToTargets = object?.belongTo
+    ? Array.isArray(object.belongTo)
+      ? object.belongTo
+      : [object.belongTo]
+    : [];
+  const belongToHasRbac =
+    (Array.isArray(object?.belongToSchema?.addOnDataStructure) &&
+      object.belongToSchema.addOnDataStructure.some(
+        (addOn) => addOn?.type === 'rbac'
+      )) ||
+    belongToTargets.some((target) => {
+      if (target?.serviceTag === 'UserAccount') return true;
+      const matched = objects.find(
+        (candidate) =>
+          candidate?.serviceTag === target?.serviceTag &&
+          candidate?.objectType === target?.objectType
+      );
+      return hasSelfRbacAddOn(matched);
+    });
+  return selfHasRbac || belongToHasRbac;
 }
 
 /**
- * Returns the per-object RBAC flow queues (e.g. UserRbacFlowHdrSqs)
- * created for objects with an 'rbac' add-on. These are consumed by the
- * UserRbacFlow SQS functions emitted in emitRbacApplicationArtifacts.
+ * Returns the per-object RBAC flow queues created for objects with an 'rbac'
+ * add-on. ValidatorRbac uses HdrInv and HdrApi (no SQS queue).
  */
 function rbacFlowQueueNames(state) {
-  const flowTags = [
-    ...new Set((state.objects ?? []).filter(hasRbacAddOn).map(rbacFlowTag))
-  ];
-  return flowTags.map((flowTag) => `${flowTag}HdrSqs`);
+  return [];
 }
 function includesEvent(flow, event) {
   return Array.isArray(flow?.event) && flow.event.includes(event);