@izara_project/izara-core-generate-service-code 1.0.86 → 1.0.88

package/src/emit/rbac/emitRbacApplicationArtifacts.js

@@ -52,11 +52,7 @@ export async function emitRbacApplicationArtifacts(objects) {
 
   const limitHandlers = await Promise.all(
     hasSelfRbac
-      ? [
-          ...LIMIT_LIST_DEFINITIONS.map(createLimitListHandler),
-          ...LIMIT_MUTATION_DEFINITIONS.map(createLimitMutationHandler),
-          ...ACCOUNT_LIMIT_HANDLERS.map(createAccountLimitHandler)
-        ]
+      ? ACCOUNT_LIMIT_HANDLERS.map(createAccountLimitHandler)
       : []
   );
 
@@ -104,14 +100,6 @@ const LIST_DEFINITIONS = [
   }
 ];
 
-const LIMIT_LIST_DEFINITIONS = [
-  {
-    flowTag: 'ListRoleLimits',
-    tableName: 'RoleLimit',
-    requestProperty: 'roleLimitId'
-  }
-];
-
 const MUTATION_DEFINITIONS = [
   {
     flowTag: 'CreateRolePermissions',
@@ -127,21 +115,6 @@ const MUTATION_DEFINITIONS = [
   }
 ];
 
-const LIMIT_MUTATION_DEFINITIONS = [
-  {
-    flowTag: 'CreateRoleLimit',
-    tableName: 'RoleLimit',
-    method: 'putItem',
-    fields: ['roleLimitId', 'limitType', 'limitValue', 'actionType']
-  },
-  {
-    flowTag: 'DeleteRoleLimit',
-    tableName: 'RoleLimit',
-    method: 'deleteItem',
-    fields: ['roleLimitId', 'limitType']
-  }
-];
-
 const USER_ROLE_MUTATIONS = [
   { flowTag: 'CreateUserRole', operation: 'Put' },
   { flowTag: 'DeleteUserFromRole', operation: 'Delete' }
@@ -197,17 +170,6 @@ const STATIC_RBAC_APPLICATION_PATHS = [
 ];
 
 const STATIC_LIMIT_APPLICATION_PATHS = [
-  ...LIMIT_LIST_DEFINITIONS.flatMap(({ flowTag }) => [
-    `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_Main.js`,
-    `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrSqs.js`,
-    `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrApi.js`
-  ]),
-  ...LIMIT_MUTATION_DEFINITIONS.flatMap(({ flowTag }) => [
-    `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_Main.js`,
-    `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrSqs.js`,
-    `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_WbsMain.js`,
-    `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrWbs.js`
-  ]),
   ...ACCOUNT_LIMIT_HANDLERS.flatMap((flowTag) => [
     `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_Main.js`,
     `app/src/generatedCode/FlowLimit/${flowTag}/source/${flowTag}_HdrSqs.js`,
@@ -274,83 +236,6 @@ async function createAccountLimitHandler(flowTag) {
   };
 }
 
-async function createLimitListHandler(definition) {
-  const sourcePath = `app/src/generatedCode/FlowLimit/${definition.flowTag}/source`;
-  const handlerPath = `src/generatedCode/FlowLimit/${definition.flowTag}/source`;
-  return {
-    artifacts: [
-      {
-        path: `${sourcePath}/${definition.flowTag}_Main.js`,
-        content: await renderRbacTemplate('ListRbac_Main.ejs', {
-          ...definition,
-          useContextUserId: definition.useContextUserId ?? false
-        })
-      },
-      {
-        path: `${sourcePath}/${definition.flowTag}_HdrSqs.js`,
-        content: await renderRbacTemplate('ListRbac_HdrSqs.ejs', definition)
-      },
-      {
-        path: `${sourcePath}/${definition.flowTag}_HdrApi.js`,
-        content: await renderRbacTemplate('ListRbac_HdrApi.ejs', definition)
-      }
-    ],
-    functions: [
-      {
-        type: 'sqs',
-        functionName: `${definition.flowTag}HdrSqs`,
-        handlerPath: `${handlerPath}/${definition.flowTag}_HdrSqs.main`,
-        roleName: 'FlowRbacRole',
-        queueName: `${definition.flowTag}HdrSqs`,
-        flowTag: definition.flowTag,
-        flowStepName: ''
-      },
-      {
-        type: 'api',
-        functionName: `${definition.flowTag}HdrApi`,
-        handlerPath: `${handlerPath}/${definition.flowTag}_HdrApi.main`,
-        roleName: 'FlowRbacRole',
-        flowTag: definition.flowTag,
-        flowStepName: ''
-      }
-    ]
-  };
-}
-
-async function createLimitMutationHandler(definition) {
-  const sourcePath = `app/src/generatedCode/FlowLimit/${definition.flowTag}/source`;
-  const handlerPath = `src/generatedCode/FlowLimit/${definition.flowTag}/source`;
-  const webSocket = await createWebSocketEntry(
-    definition.flowTag,
-    sourcePath,
-    handlerPath
-  );
-  return {
-    artifacts: [
-      {
-        path: `${sourcePath}/${definition.flowTag}_Main.js`,
-        content: await renderRbacTemplate('RbacMutation_Main.ejs', definition)
-      },
-      {
-        path: `${sourcePath}/${definition.flowTag}_HdrSqs.js`,
-        content: await renderRbacTemplate('ListRbac_HdrSqs.ejs', definition)
-      },
-      ...webSocket.artifacts
-    ],
-    functions: [
-      {
-        type: 'sqs',
-        functionName: `${definition.flowTag}HdrSqs`,
-        handlerPath: `${handlerPath}/${definition.flowTag}_HdrSqs.main`,
-        roleName: 'FlowRbacRole',
-        queueName: `${definition.flowTag}HdrSqs`,
-        flowTag: definition.flowTag,
-        flowStepName: ''
-      },
-      ...webSocket.functions
-    ]
-  };
-}
 
 async function createCustomRbacOwnTopicHandler(flowTag, mainTemplateName) {
   const sourcePath = `app/src/generatedCode/FlowRbac/${flowTag}/source`;

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

@@ -39,21 +39,25 @@ export default async function CancelUsage(_izContext, requestParams) {
       requestParams?.limitTag;
 
     const targetIdentifiers = requestParams?.targetIdentifiers;
-    let identifiersConcat = requestParams?.identifiersConcat;
+    let identifiersConcat =
+      requestParams?.identifiersConcat || requestParams?.identifierConcat;
     if (!identifiersConcat && targetIdentifiers && typeof targetIdentifiers === 'object') {
-      if (targetIdentifiers.identifierConcat) {
-        identifiersConcat = targetIdentifiers.identifierConcat;
+      if (targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat) {
+        identifiersConcat =
+          targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat;
       } else {
-        const sortedKeys = Object.keys(targetIdentifiers).sort();
+        const sortedKeys = Object.keys(targetIdentifiers)
+          .filter(
+            (k) =>
+              k !== 'submittedByUserId' &&
+              k !== 'identifierConcat' &&
+              k !== 'identifiersConcat'
+          )
+          .sort();
         const parts = [];
         for (const key of sortedKeys) {
           const value = targetIdentifiers[key];
-          if (
-            key !== 'submittedByUserId' &&
-            key !== 'identifierConcat' &&
-            value !== undefined &&
-            value !== null
-          ) {
+          if (value !== undefined && value !== null) {
             parts.push(`${key}#${value}`);
           }
         }

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

@@ -39,21 +39,25 @@ export default async function ConfirmUsage(_izContext, requestParams) {
       requestParams?.limitTag;
 
     const targetIdentifiers = requestParams?.targetIdentifiers;
-    let identifiersConcat = requestParams?.identifiersConcat;
+    let identifiersConcat =
+      requestParams?.identifiersConcat || requestParams?.identifierConcat;
     if (!identifiersConcat && targetIdentifiers && typeof targetIdentifiers === 'object') {
-      if (targetIdentifiers.identifierConcat) {
-        identifiersConcat = targetIdentifiers.identifierConcat;
+      if (targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat) {
+        identifiersConcat =
+          targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat;
       } else {
-        const sortedKeys = Object.keys(targetIdentifiers).sort();
+        const sortedKeys = Object.keys(targetIdentifiers)
+          .filter(
+            (k) =>
+              k !== 'submittedByUserId' &&
+              k !== 'identifierConcat' &&
+              k !== 'identifiersConcat'
+          )
+          .sort();
         const parts = [];
         for (const key of sortedKeys) {
           const value = targetIdentifiers[key];
-          if (
-            key !== 'submittedByUserId' &&
-            key !== 'identifierConcat' &&
-            value !== undefined &&
-            value !== null
-          ) {
+          if (value !== undefined && value !== null) {
             parts.push(`${key}#${value}`);
           }
         }

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

@@ -28,21 +28,25 @@ export default async function CreateTargetRole(_izContext, requestParams) {
       _izContext.correlationIds?.get(consts.SUBMITTED_BY_USER_ID);
 
     const targetIdentifiers = requestParams.targetIdentifiers;
-    let identifiersConcat = requestParams.identifiersConcat;
+    let identifiersConcat =
+      requestParams.identifiersConcat || requestParams.identifierConcat;
     if (!identifiersConcat && targetIdentifiers && typeof targetIdentifiers === 'object') {
-      if (targetIdentifiers.identifierConcat) {
-        identifiersConcat = targetIdentifiers.identifierConcat;
+      if (targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat) {
+        identifiersConcat =
+          targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat;
       } else {
-        const sortedKeys = Object.keys(targetIdentifiers).sort();
+        const sortedKeys = Object.keys(targetIdentifiers)
+          .filter(
+            (k) =>
+              k !== 'submittedByUserId' &&
+              k !== 'identifierConcat' &&
+              k !== 'identifiersConcat'
+          )
+          .sort();
         const parts = [];
         for (const key of sortedKeys) {
           const value = targetIdentifiers[key];
-          if (
-            key !== 'submittedByUserId' &&
-            key !== 'identifierConcat' &&
-            value !== undefined &&
-            value !== null
-          ) {
+          if (value !== undefined && value !== null) {
             parts.push(`${key}#${value}`);
           }
         }
@@ -61,7 +65,11 @@ export default async function CreateTargetRole(_izContext, requestParams) {
       permissions = [],
       assignUserIds = []
     } = requestParams;
-    const roleId = inputRoleId || roleName || identifierUuid();
+    let defaultRoleId = identifierUuid();
+    if (roleName === 'owner') {
+      defaultRoleId = 'owner';
+    }
+    const roleId = inputRoleId || defaultRoleId;
     const roleIdKey = `${identifiersConcat}_${roleId}`;
 
     await dynamodbSharedLib.putItem(
@@ -70,8 +78,10 @@ export default async function CreateTargetRole(_izContext, requestParams) {
       {
         identifiersConcat,
         roleIdKey,
+        roleType: 'tenant_role',
         roleName,
-        submittedByUserId
+        submittedByUserId,
+        createdAt: new Date().toISOString()
       }
     );
 

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

@@ -31,21 +31,25 @@ export default async function GetMyPermissions(_izContext, requestParams) {
     }
 
     const targetIdentifiers = requestParams.targetIdentifiers;
-    let identifiersConcat = requestParams.identifiersConcat;
+    let identifiersConcat =
+      requestParams.identifiersConcat || requestParams.identifierConcat;
     if (!identifiersConcat && targetIdentifiers && typeof targetIdentifiers === 'object') {
-      if (targetIdentifiers.identifierConcat) {
-        identifiersConcat = targetIdentifiers.identifierConcat;
+      if (targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat) {
+        identifiersConcat =
+          targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat;
       } else {
-        const sortedKeys = Object.keys(targetIdentifiers).sort();
+        const sortedKeys = Object.keys(targetIdentifiers)
+          .filter(
+            (k) =>
+              k !== 'submittedByUserId' &&
+              k !== 'identifierConcat' &&
+              k !== 'identifiersConcat'
+          )
+          .sort();
         const parts = [];
         for (const key of sortedKeys) {
           const value = targetIdentifiers[key];
-          if (
-            key !== 'submittedByUserId' &&
-            key !== 'identifierConcat' &&
-            value !== undefined &&
-            value !== null
-          ) {
+          if (value !== undefined && value !== null) {
             parts.push(`${key}#${value}`);
           }
         }

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

@@ -35,21 +35,25 @@ export default async function ReservedDynamicUsage(_izContext, requestParams) {
     } = requestParams;
 
     const targetIdentifiers = requestParams.targetIdentifiers;
-    let identifiersConcat = requestParams.identifiersConcat;
+    let identifiersConcat =
+      requestParams.identifiersConcat || requestParams.identifierConcat;
     if (!identifiersConcat && targetIdentifiers && typeof targetIdentifiers === 'object') {
-      if (targetIdentifiers.identifierConcat) {
-        identifiersConcat = targetIdentifiers.identifierConcat;
+      if (targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat) {
+        identifiersConcat =
+          targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat;
       } else {
-        const sortedKeys = Object.keys(targetIdentifiers).sort();
+        const sortedKeys = Object.keys(targetIdentifiers)
+          .filter(
+            (k) =>
+              k !== 'submittedByUserId' &&
+              k !== 'identifierConcat' &&
+              k !== 'identifiersConcat'
+          )
+          .sort();
         const parts = [];
         for (const key of sortedKeys) {
           const value = targetIdentifiers[key];
-          if (
-            key !== 'submittedByUserId' &&
-            key !== 'identifierConcat' &&
-            value !== undefined &&
-            value !== null
-          ) {
+          if (value !== undefined && value !== null) {
             parts.push(`${key}#${value}`);
           }
         }
@@ -70,41 +74,79 @@ export default async function ReservedDynamicUsage(_izContext, requestParams) {
     }
 
     const uniqueIdentify = `${usedTimestamp}_${_izContext.uniqueRequestId || Date.now()}`;
-    const roleLimitKeys = Array.isArray(requestParams.roleLimitIds)
-      ? requestParams.roleLimitIds
-      : [roleLimitId || `${identifiersConcat}_${flowTypeConcat}`];
 
-    let maxLimit = Infinity;
-    const limitRecords = [];
-
-    for (const key of roleLimitKeys) {
-      const record = await dynamodbSharedLib.getItem(
+    let targetPlanTier = requestParams.planTier || null;
+    if (!targetPlanTier && identifiersConcat) {
+      const targetRolesResult = await dynamodbSharedLib.query(
         _izContext,
-        dynamodbSharedLib.tableName(_izContext, 'RoleLimit'),
-        { roleLimitId: key, limitType: 'runningTotal' }
+        dynamodbSharedLib.tableName(_izContext, 'TargetRoles'),
+        { identifiersConcat }
       );
-      if (record && typeof record.limitValue === 'number') {
-        limitRecords.push(record);
+      let targetRoleItems = [];
+      if (Array.isArray(targetRolesResult)) {
+        targetRoleItems = targetRolesResult;
+      } else if (targetRolesResult && targetRolesResult.Items) {
+        targetRoleItems = targetRolesResult.Items;
+      }
+      for (const roleItem of targetRoleItems) {
+        if (roleItem.roleType === 'plan_tier') {
+          targetPlanTier = roleItem.roleIdKey;
+          break;
+        }
+      }
+    }
+    if (!targetPlanTier) {
+      targetPlanTier = 'tier-free';
+    }
+
+    const limitRecords = [];
+    const tierPermission = await dynamodbSharedLib.getItem(
+      _izContext,
+      dynamodbSharedLib.tableName(_izContext, 'RolePermissions'),
+      { roleIdKey: targetPlanTier, flowTypeConcat }
+    );
+    if (tierPermission && typeof tierPermission.limitValue === 'number') {
+      limitRecords.push(tierPermission);
+    }
+
+    if (Array.isArray(requestParams.roleIdKeys)) {
+      for (const rKey of requestParams.roleIdKeys) {
+        const perm = await dynamodbSharedLib.getItem(
+          _izContext,
+          dynamodbSharedLib.tableName(_izContext, 'RolePermissions'),
+          { roleIdKey: rKey, flowTypeConcat }
+        );
+        if (perm && typeof perm.limitValue === 'number') {
+          limitRecords.push(perm);
+        }
       }
     }
 
+    let maxLimit = Infinity;
     if (limitRecords.length > 0) {
-      const isDecrease = (rec) =>
-        rec.effect === 'decrease' ||
-        rec.actionType === 'decrease' ||
-        rec.action === 'decrease';
+      const isDecrease = function (rec) {
+        if (
+          rec.effect === 'decrease' ||
+          rec.actionType === 'decrease' ||
+          rec.action === 'decrease'
+        ) {
+          return true;
+        }
+        return false;
+      };
 
       const increaseLimits = limitRecords.filter((rec) => !isDecrease(rec));
       const decreaseLimits = limitRecords.filter((rec) => isDecrease(rec));
 
-      const maxIncrease =
-        increaseLimits.length > 0
-          ? Math.max(...increaseLimits.map((r) => r.limitValue))
-          : Infinity;
-      const minDecrease =
-        decreaseLimits.length > 0
-          ? Math.min(...decreaseLimits.map((r) => r.limitValue))
-          : Infinity;
+      let maxIncrease = Infinity;
+      if (increaseLimits.length > 0) {
+        maxIncrease = Math.max(...increaseLimits.map((r) => r.limitValue));
+      }
+
+      let minDecrease = Infinity;
+      if (decreaseLimits.length > 0) {
+        minDecrease = Math.min(...decreaseLimits.map((r) => r.limitValue));
+      }
 
       maxLimit = Math.min(maxIncrease, minDecrease);
     }

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

@@ -101,19 +101,22 @@ export default async function <%- flowTag %>(_izContext, requestParams = {}) {
     if (typeof targetIdentifiers === 'string') {
       targetId = targetIdentifiers;
     } else if (typeof targetIdentifiers === 'object') {
-      if (targetIdentifiers.identifierConcat) {
-        targetId = targetIdentifiers.identifierConcat;
+      if (targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat) {
+        targetId =
+          targetIdentifiers.identifiersConcat || targetIdentifiers.identifierConcat;
       } else {
-        const sortedKeys = Object.keys(targetIdentifiers).sort();
+        const sortedKeys = Object.keys(targetIdentifiers)
+          .filter(
+            (k) =>
+              k !== 'submittedByUserId' &&
+              k !== 'identifierConcat' &&
+              k !== 'identifiersConcat'
+          )
+          .sort();
         const parts = [];
         for (const key of sortedKeys) {
           const value = targetIdentifiers[key];
-          if (
-            key !== 'submittedByUserId' &&
-            key !== 'identifierConcat' &&
-            value !== undefined &&
-            value !== null
-          ) {
+          if (value !== undefined && value !== null) {
             parts.push(`${key}#${value}`);
           }
         }