@izara_project/izara-core-generate-service-code 1.0.78 → 1.0.80

package/src/emit/crud/templates/UpdateLogicalLib.ejs

@@ -0,0 +1,477 @@
+/*
+Copyright (C) 2020 Sven Mason <http: //izara.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as
+published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Affero General Public License for more details.
+
+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 />.
+*/
+
+// ==================== Shared Core Utilities ====================
+import {
+  objectHash as hash,
+  identifierUuid
+} from '@izara_project/izara-shared-core';
+import {
+  consts as coreConsts,
+  NoRetryError
+} from '@izara_project/izara-core-library-core';
+
+// ==================== Core Service Schemas ====================
+import {
+  getObjectSchema,
+  consts,
+  utils,
+  identifiersObject,
+  dataDetailsLib,
+  uploadUseCase
+} from '@izara_project/izara-core-library-service-schemas';
+const { createObjType } = utils;
+const { dynamoDbIdentifiersByStorageResource } = identifiersObject;
+const { createUpdateDataDetail } = dataDetailsLib;
+const { PREFIX, TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER } = consts;
+
+// ==================== Shared Libraries ====================
+import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
+import snsSharedLib from '@izara_project/izara-core-library-sns';
+import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow';
+import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+import lambdaSharedLib from '@izara_project/izara-core-library-lambda';
+
+// ==================== External Services ====================
+import {
+  sns,
+  lambda
+} from '@izara_project/izara-core-library-external-request';
+
+//(<optionalRequire>)
+//(</optionalRequire>)
+
+/**
+ * Core logical processing library
+ * @param {Object} _izContext - Context object with logger
+ * @param {Object} requestParams - { objectType, objInstanceFull, versionedDataIds, additionalParams }
+ * @param {Object} callingFlowConfig - Calling flow configuration
+ * @param {Object} phaseResults - Results from preceding phases
+ * @returns {Promise<Object>}
+ */
+export async function <%- flowTag %>LogicalLib(
+  _izContext,
+  requestParams,
+  callingFlowConfig = {},
+  errorsFound = [],
+  phaseResults = {}
+) {
+  try {
+    _izContext.logger.debug('[<%- flowTag %>LogicalLib] started', {
+      requestParams,
+      callingFlowConfig,
+      phaseResults
+    });
+
+    //(<beforeUpdateMainLogical>)
+    //(</beforeUpdateMainLogical>)
+
+    // ── Settings ──────────────────────────────────────────────────────────────
+    const settings = requestParams.additionalParams?.settings ?? {};
+    const returnSystemFieldsName = settings.returnSystemFieldsName === true;
+    const returnOldData = settings.returnOldData === true;
+
+    const objType = createObjType(requestParams.objectType);
+    const identifiers = requestParams.objInstanceFull.identifiers;
+    const fields = requestParams.objInstanceFull.fields;
+    const versionedDataIds = requestParams.versionedDataIds ?? {};
+    const parentFlowId = identifierUuid();
+    // ── Load schema ───────────────────────────────────────────────────────────
+    const objectSchema = await getObjectSchema.getObjSchemaS3WithHierarchy(
+      _izContext,
+      objType
+    );
+    _izContext.logger.debug('objectSchema', objectSchema);
+
+    const objectSchemas =
+      await uploadUseCase.generateObjectSchemaForCombineFieldNames(
+        _izContext,
+        objectSchema
+      );
+    _izContext.logger.debug('objectSchemas', objectSchemas);
+
+    // ── Build updateDataDetails ───────────────────────────────────────────────
+    const updateDataDetails = await createUpdateDataDetail(
+      _izContext,
+      objectSchemas
+    );
+    _izContext.logger.debug('updateDataDetails', updateDataDetails);
+
+    const originTimestamp = Date.now();
+
+    // ── Validate versionedDataIds ─────────────────────────────────────────────
+    const haveVersionedDataIdsToUpdate =
+      Object.keys(versionedDataIds).length > 0;
+    if (haveVersionedDataIdsToUpdate) {
+      const updateMainNodeData = {};
+      const updateVersionedData = {};
+
+      for (const [fieldProp, fieldVal] of Object.entries(
+        requestParams.objInstanceFull.fields
+      )) {
+        const fieldSetting = objectSchema.fieldNames[fieldProp];
+        if (fieldSetting.hasOwnProperty('versionedDataLabel')) {
+          updateVersionedData[fieldSetting.versionedDataLabel] ??= {};
+          Object.assign(updateVersionedData[fieldSetting.versionedDataLabel], {
+            [fieldProp]: fieldVal
+          });
+        } else {
+          Object.assign(updateMainNodeData, { [fieldProp]: fieldVal });
+        }
+      }
+
+      _izContext.logger.debug('updateMainNodeData::', updateMainNodeData);
+      _izContext.logger.debug('updateVersionedData::', updateVersionedData);
+
+      const versionedDataIdLabelKeys = Object.keys(versionedDataIds);
+      const updateVersionedDataLabelKeys = Object.keys(updateVersionedData);
+
+      const missingVersionedDataIdLabels = updateVersionedDataLabelKeys.filter(
+        (l) => !versionedDataIdLabelKeys.includes(l)
+      );
+      const missingDataVersionedDataLabels = versionedDataIdLabelKeys.filter(
+        (l) => !updateVersionedDataLabelKeys.includes(l)
+      );
+
+      if (missingVersionedDataIdLabels.length)
+        errorsFound.push(
+          `missing versionedDataIds of versionedDataLabel '${missingVersionedDataIdLabels.join(', ')}'`
+        );
+      if (missingDataVersionedDataLabels.length)
+        errorsFound.push(
+          `missing data of versionedDataLabels '${missingDataVersionedDataLabels.join(', ')}'`
+        );
+      if (Object.keys(updateMainNodeData).length)
+        errorsFound.push('cannot update mainNode if have versionedDataIds');
+    }
+
+    //(<validateBeforeUpdate>)
+    //(</validateBeforeUpdate>)
+
+    // ── Early exit on errors ──────────────────────────────────────────────────
+    if (errorsFound.length) {
+      const updateNodeCompleteMessage =
+        callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(
+          callingFlowConfig,
+          {
+            objType,
+            objInstanceFull: { identifiers, fields },
+            versionedDataIds,
+            status: 'error',
+            errorsFound
+          }
+        );
+
+      _izContext.logger.debug(
+        'messageParams OutUpdateNodeComplete:::',
+        updateNodeCompleteMessage
+      );
+      await sns.publishAsync(_izContext, {
+        Message: JSON.stringify(updateNodeCompleteMessage),
+        MessageAttributes: sns.createStringMessageAttributes(
+          _izContext,
+          callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(
+            callingFlowConfig,
+            {}
+          )
+        ),
+        TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
+          _izContext,
+          TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete
+        )
+      });
+
+      return updateNodeCompleteMessage;
+    }
+
+    // ── Helper: extract fields per storageTag ─────────────────────────────────
+    function createObjInstanceFullFieldsByStorageTag(
+      _izContext,
+      storageTag,
+      updateDataDetail
+    ) {
+      const result = {};
+      for (const fieldName of Object.keys(
+        requestParams.objInstanceFull.fields
+      )) {
+        if (
+          updateDataDetails[storageTag].fieldNames.includes(fieldName) &&
+          updateDataDetail.fieldNames.includes(fieldName) &&
+          !identifiers.hasOwnProperty(fieldName) &&
+          !result.hasOwnProperty(fieldName)
+        ) {
+          Object.assign(result, {
+            [fieldName]: requestParams.objInstanceFull.fields[fieldName]
+          });
+        }
+      }
+      return result;
+    }
+
+    // ── Helper: build objInstanceFull from updateItem ─────────────────────────
+    function createObjInstanceFullFromParams(object, requestParams) {
+      const objInstanceFull = { identifiers: {}, fields: {} };
+      for (const field of Object.keys(object)) {
+        if (requestParams.objInstanceFull.identifiers.hasOwnProperty(field)) {
+          Object.assign(objInstanceFull.identifiers, {
+            [field]: requestParams.objInstanceFull.identifiers[field]
+          });
+        }
+        if (requestParams.objInstanceFull.fields.hasOwnProperty(field)) {
+          Object.assign(objInstanceFull.fields, {
+            [field]: requestParams.objInstanceFull.fields[field]
+          });
+        }
+      }
+      return objInstanceFull;
+    }
+
+    // ── Process storage resources ─────────────────────────────────────────────
+    const awaitingStepIds = [];
+    const listOfRecords = [];
+    let updateItem;
+
+    await Promise.all(
+      Object.entries(updateDataDetails).map(
+        async ([storageTag, updateDataDetail]) => {
+          // ── Graph ─────────────────────────────────────────────────────────────
+          if (updateDataDetail.storageType === consts.STORAGE_TYPES.graph) {
+            //(<beforeUpdateGraph>)
+            //(</beforeUpdateGraph>)
+
+            const graphFields = createObjInstanceFullFieldsByStorageTag(
+              _izContext,
+              storageTag,
+              updateDataDetail
+            );
+            if (!Object.keys(graphFields).length) return;
+
+            //(<beforeUpdateNode>)
+            //(</beforeUpdateNode>)
+
+            //(<additionalAttributes>)
+            const additionalAttributes = {};
+            //(</additionalAttributes>)
+
+            const records = awaitingStepIds.length === 0 ? listOfRecords : [];
+            awaitingStepIds.push({
+              awaitingStepId: asyncFlowSharedLib.createAwaitingStepId(
+                parentFlowId,
+                PREFIX.updateNode
+              ),
+              additionalAttributes: {
+                listOfRecords: records,
+                additionalAttributes: additionalAttributes
+              }
+            });
+
+            if (awaitingStepIds.length) {
+              const awaitingMultipleStep =
+                await asyncFlowSharedLib.createAwaitingMultipleSteps(
+                  _izContext,
+                  asyncFlowSharedLib.createPendingStepId(
+                    _izContext.uniqueRequestId
+                  ),
+                  awaitingStepIds,
+                  {
+                    additionalAttributes: {
+                      callingFlowConfig
+                    }
+                  }
+                );
+              _izContext.logger.debug(
+                'awaitingMultipleStep',
+                awaitingMultipleStep
+              );
+            }
+
+            let updateNodeParams = {
+              objType,
+              objInstanceFull: { identifiers, fields: graphFields },
+              versionedDataIds,
+              originTimestamp,
+              settings: { returnSystemFieldsName, returnOldData },
+              parentFlowId
+            };
+
+            updateNodeParams =
+              callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
+                updateNodeParams,
+                callingFlowSharedLib.addParentCallingFlowConfig(
+                  callingFlowConfig,
+                  callingFlowSharedLib.createCallingFlowConfig(
+                    //(<callingFlowProperties>)
+                    await lambdaSharedLib.lambdaFunctionName(
+                      _izContext,
+                      TOPIC_NAME_GENERATE_CODE.updateNodeComplete
+                    ),
+                    {}
+                    //(</callingFlowProperties>)
+                  )
+                )
+              );
+
+            _izContext.logger.debug(
+              'messageObject before send message:',
+              updateNodeParams
+            );
+
+            const resSNS = await sns.publishAsync(_izContext, {
+              Message: JSON.stringify(updateNodeParams),
+              MessageAttributes: sns.createStringMessageAttributes(
+                _izContext,
+                callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(
+                  callingFlowConfig,
+                  {}
+                )
+              ),
+              TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
+                _izContext,
+                TOPIC_NAME_GRAPH_HANDLER.inUpdateNode,
+                storageTag
+              )
+            });
+            _izContext.logger.debug(
+              'resSNS send to topic InUpdateNode finish!',
+              resSNS
+            );
+
+            // ── DynamoDB ──────────────────────────────────────────────────────────
+          } else if (
+            updateDataDetail.storageType === consts.STORAGE_TYPES.dynamoDB
+          ) {
+            const dynamoFields = createObjInstanceFullFieldsByStorageTag(
+              _izContext,
+              storageTag,
+              updateDataDetail
+            );
+            if (!Object.keys(dynamoFields).length) return;
+
+            //(<beforeUpdateDynamoDb>)
+            //(</beforeUpdateDynamoDb>)
+
+            const identifiersForUpdateData =
+              await dynamoDbIdentifiersByStorageResource(
+                _izContext,
+                objectSchema,
+                updateDataDetail,
+                identifiers
+              );
+            _izContext.logger.debug(
+              'identifiersForUpdateData',
+              identifiersForUpdateData
+            );
+
+            if (
+              Object.values(updateDataDetails).some(
+                (updateDataDetail) =>
+                  updateDataDetail.storageType === consts.STORAGE_TYPES.graph
+              )
+            ) {
+              _izContext.logger.debug('must process graph first');
+              listOfRecords.push({
+                [storageTag]: {
+                  serviceTag: updateDataDetail.serviceTag,
+                  tableName: updateDataDetail.tableName,
+                  objInstanceFull: {
+                    identifiers: identifiersForUpdateData,
+                    fields: dynamoFields
+                  }
+                }
+              });
+            } else {
+              _izContext.logger.debug('can process record dynamo');
+              updateItem = await dynamodbSharedLib.updateItem(
+                _izContext,
+                await dynamodbSharedLib.tableName(
+                  _izContext,
+                  updateDataDetail.tableName,
+                  updateDataDetail.serviceTag
+                ),
+                identifiersForUpdateData,
+                dynamoFields,
+                { returnValues: 'ALL_NEW' }
+              );
+
+              _izContext.logger.debug('updateItem:', updateItem);
+            }
+          }
+        }
+      )
+    );
+
+    // ── DynamoDB-only complete path ───────────────────────────────────────────
+    if (awaitingStepIds.length === 0) {
+      let messageObject = {
+        objType,
+        objInstanceFull: createObjInstanceFullFromParams(
+          updateItem,
+          requestParams
+        )
+      };
+
+      //(<additionalProperties>)
+      //(</additionalProperties>)
+
+      if (
+        callingFlowConfig[
+          callingFlowSharedLib.consts.CALLINGFLOWPROPERTIES_PROPERTYNAME
+        ]
+      ) {
+        _izContext.logger.debug('HAVE CALLING FLOW');
+        messageObject =
+          callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(
+            callingFlowConfig,
+            messageObject
+          );
+
+        _izContext.logger.debug('after create callingFlow', messageObject);
+        await sns.publishAsync(_izContext, {
+          Message: JSON.stringify(messageObject),
+          MessageAttributes: sns.createStringMessageAttributes(
+            _izContext,
+            callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(
+              callingFlowConfig,
+              {}
+            )
+          ),
+          TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
+            _izContext,
+            TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete
+          )
+        });
+      }
+    }
+
+    return {
+      returnValues: {
+        objType,
+        objInstanceFull: { identifiers, fields },
+        versionedDataIds
+      },
+      status: 'complete',
+      errorsFound
+    };
+  } catch (err) {
+    _izContext.logger.error('[<%- flowTag %>LogicalLib] error:', err);
+    throw err;
+  }
+}
+
+export const <%- flowTag %>MainLogical = <%- flowTag %>LogicalLib;
+export default <%- flowTag %>LogicalLib;

package/src/emit/custom/customFlows.js

@@ -198,10 +198,36 @@ export function customFlowNextSteps(flows) {
     const roleName = upperFirst(flow.flowTag);
     const steps = flow.flowSteps ?? [];
     const nextStepsList = [];
+    const seenKeys = new Set();
     for (const step of steps) {
       const items = _stepNextSteps(step);
       for (const item of items) {
-        nextStepsList.push(item);
+        const topicVal = item.topicName || item.topic;
+        const functionVal = item.functionName || item.topicName || item.topic;
+        const targetType = item.targetType || '';
+        const serviceTag = item.serviceTag || '';
+        let targetVal = '';
+        if (targetType === 'lambdaSyncInv') {
+          targetVal = functionVal;
+        } else if (targetType === 'extTopic' || targetType === 'ownTopic') {
+          targetVal = topicVal;
+        } else {
+          targetVal = topicVal || functionVal;
+        }
+        let typeCategory = targetType;
+        if (targetType === 'extTopic' || targetType === 'ownTopic') {
+          typeCategory = 'sns';
+        }
+        const dedupeKey = `${typeCategory}:${serviceTag}:${targetVal}`;
+        if (!seenKeys.has(dedupeKey)) {
+          seenKeys.add(dedupeKey);
+          nextStepsList.push({
+            ...item,
+            topic: topicVal,
+            topicName: topicVal,
+            functionName: functionVal
+          });
+        }
       }
     }
     if (nextStepsList.length > 0) {
@@ -214,4 +240,3 @@ export function customFlowNextSteps(flows) {
   }
   return results;
 }
-

package/src/emit/custom/emitCustomFlowApplicationArtifacts.js

@@ -646,8 +646,7 @@ function _startConfig(flow) {
     ) ??
     steps.find(
       (s) =>
-        typeof s?.stepName === 'string' &&
-        s.stepName.toLowerCase() === 'start'
+        typeof s?.stepName === 'string' && s.stepName.toLowerCase() === 'start'
     ) ??
     steps[0];
   if (start) {

package/src/emit/custom/templates/FlowEndpoint_Main.ejs

@@ -61,7 +61,7 @@ const { createFlowTypeConcat } = utils;
 export default async function <%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>(
   _izContext,
   requestParams,
-  callingFlowConfig = {}
+  callingFlowConfig = {},
   //(<additionalParams>)
   //(</additionalParams>)
 ) {
@@ -109,7 +109,7 @@ export default async function <%- typeof functionName !== 'undefined' ? function
       //(</checkStoredCacheHook>)
     }
 <% } -%>
-<% if (typeof flow !== 'undefined' && flow.isRbac) { -%>
+<% if (typeof flow !== 'undefined' && flow.isRbac && !flow.generatedCodeConfig) { -%>
 
     const { checkRbacPermission } =
       await import('@izara_project/izara-authorization');
@@ -121,7 +121,14 @@ export default async function <%- typeof functionName !== 'undefined' ? function
     const resultPermissionCheck = await checkRbacPermission(
       _izContext,
       { flowTag: '<%- flow.flowTag %>', serviceTag: '<%- flow.serviceTag || (flow.objType ? flow.objType.serviceTag : "") %>' },
-      parameterGroups
+      parameterGroups,
+      {
+        rbacObjType: {
+          serviceTag: '<%- (flow.objType?.belongTo ? (Array.isArray(flow.objType.belongTo) ? flow.objType.belongTo[0]?.serviceTag : flow.objType.belongTo?.serviceTag) : null) || flow.serviceTag || (flow.objType ? flow.objType.serviceTag : "") %>'
+        },
+        requestParams: typeof requestParams !== 'undefined' ? requestParams : {},
+        nextFlowStepName: '<%- flow.flowTag %>RbacCallback'
+      }
     );
 
     _izContext.logger.debug(

package/src/emit/custom/templates/FlowStep_Main.ejs

@@ -37,7 +37,7 @@ import { identifierUuid } from '@izara_project/izara-shared-core';
 export default async function <%= functionName %>(
   _izContext,
   requestParams,
-  callingFlowConfig = {}
+  callingFlowConfig = {},
   //(<additionalParams>)
   //(</additionalParams>)
 ) {

package/src/emit/custom/templates/s3/CreateObject_Main.ejs

@@ -51,7 +51,7 @@ const { TOPIC_NAME_GENERATE_CODE } = schemaConsts;
 export default async function createObject(
   _izContext,
   requestParams,
-  callingFlowConfig = {}
+  callingFlowConfig = {},
   //(<additionalParams>)
   //(</additionalParams>)
 ) {

package/src/emit/custom/templates/triggerCache/CheckTriggerCache_HdrSqs.ejs

@@ -11,7 +11,7 @@ let perRecordsValidatorSchema = {
   properties: {
 <%_ startConfig.properties.forEach((prop, index) => { _%>
     <%- /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(prop.propertyName) ? prop.propertyName : `'${prop.propertyName}'` %>: {
-      type: '<%- prop.type || 'string' %>'<% if (typeof prop.default !== 'undefined') { %>,
+      type: <%- prop.type === 'mixed' ? "['string', 'number', 'integer', 'boolean', 'null', 'object', 'array']" : `'${prop.type || 'string'}'` %><% if (typeof prop.default !== 'undefined') { %>,
       default: <%- typeof prop.default === 'string' ? `'${prop.default.replace(/'/g, "\\'")}'` : JSON.stringify(prop.default) %><% } %>
     }<%- index < startConfig.properties.length - 1 ? ',' : '' %>
 <%_ }) _%>
@@ -29,7 +29,7 @@ let messageAttributeValidatorSchema = {
       type: 'object',
       properties: {
         Type: { type: 'string' },
-        Value: { type: '<%- prop.type || 'string' %>' }
+        Value: { type: <%- prop.type === 'mixed' ? "['string', 'number', 'integer', 'boolean', 'null', 'object', 'array']" : `'${prop.type || 'string'}'` %> }
       },
       required: ['Type', 'Value']
     }<%- index < startConfig.messageAttributes.length - 1 ? ',' : '' %>

package/src/emit/rbac/emitDynamicRbacFlowSchemas.js

@@ -74,13 +74,7 @@ function _hasSelfRbacAddOn(object) {
 }
 
 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;
+  return _hasSelfRbacAddOn(object);
 }
 
 async function _artifact(flowTag, flow) {
@@ -108,7 +102,7 @@ function _createSharedRbacFlow(flowTag, event) {
     },
     flowSteps: [
       {
-        stepName: 'start',
+        stepName: 'Start',
         properties: [],
         messageAttributes: [],
         returnValues: {
@@ -135,7 +129,7 @@ function _createUserRbacFlow(flowTag, serviceTag, objectType) {
     },
     flowSteps: [
       {
-        stepName: 'start',
+        stepName: 'Start',
         messageAttributes: ['userId', 'correlationId']
       }
     ]