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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.74",
+  "version": "1.0.76",
   "description": "Code for locally generating per service files",
   "homepage": "https://bitbucket.org/izara-core-support-services/izara-core-support-services-generate-service-code#readme",
   "repository": {

package/src/compile/loadSchemas.js

@@ -159,41 +159,47 @@ export async function resolveExtendedObjectSchemas(
       }
     }
 
-    /*
     if (
       currentSchema.hasOwnProperty('belongTo') &&
-      currentSchema.belongTo &&
-      currentSchema.belongTo.serviceTag &&
-      currentSchema.belongTo.objectType
+      currentSchema.belongTo
     ) {
-      try {
-        Logger.debug(
-          `[DEBUG] [resolveExtendedObjectSchemas] Fetching belongTo schema for objectType=${currentSchema.objectType}`,
-          { belongTo: currentSchema.belongTo }
-        );
-        const belongToObjType = {
-          serviceTag: currentSchema.belongTo.serviceTag,
-          objectType: currentSchema.belongTo.objectType
-        };
-        const belongToSchema = await getObjectSchema.getObjSchemaS3(
-          { logger: Logger },
-          belongToObjType,
-          false,
-          bucketName
-        );
-        currentSchema.belongToSchema = belongToSchema;
-        Logger.debug(
-          `[DEBUG] [resolveExtendedObjectSchemas] Successfully fetched belongTo schema for objectType=${currentSchema.objectType}`,
-          { belongToObjectType: belongToSchema?.objectType }
-        );
-      } catch (error) {
-        Logger.warn(
-          `[WARN] [resolveExtendedObjectSchemas] Failed to fetch belongTo schema for objectType=${currentSchema.objectType}`,
-          { error }
-        );
+      const belongToTarget = Array.isArray(currentSchema.belongTo)
+        ? currentSchema.belongTo[0]
+        : currentSchema.belongTo;
+
+      if (
+        belongToTarget &&
+        belongToTarget.serviceTag &&
+        belongToTarget.objectType
+      ) {
+        try {
+          Logger.debug(
+            `[DEBUG] [resolveExtendedObjectSchemas] Fetching belongTo schema for objectType=${currentSchema.objectType}`,
+            { belongTo: belongToTarget }
+          );
+          const belongToObjType = {
+            serviceTag: belongToTarget.serviceTag,
+            objectType: belongToTarget.objectType
+          };
+          const belongToSchema = await getObjectSchema.getObjSchemaS3(
+            { logger: Logger },
+            belongToObjType,
+            false,
+            bucketName
+          );
+          currentSchema.belongToSchema = belongToSchema;
+          Logger.debug(
+            `[DEBUG] [resolveExtendedObjectSchemas] Successfully fetched belongTo schema for objectType=${currentSchema.objectType}`,
+            { belongToObjectType: belongToSchema?.objectType }
+          );
+        } catch (error) {
+          Logger.warn(
+            `[WARN] [resolveExtendedObjectSchemas] Failed to fetch belongTo schema for objectType=${currentSchema.objectType}`,
+            { error }
+          );
+        }
       }
     }
-    */
 
     resolvedSchemas.push(currentSchema);
   }

package/src/emit/coreFunction/emitCoreFunctionArtifacts.js

@@ -210,13 +210,11 @@ export async function emitCoreFunctionArtifacts({ project, objects = [], relatio
     },
     {
       path: `${SRC_ROOT}/InitialSetupConfig.js`,
-      content: initialSetupConfig,
-      writeWhenFileExist: false
+      content: initialSetupConfig
     },
     {
       path: `${INITIAL_SETUP_ROOT}/InitialSetupConfig.js`,
-      content: initialSetupConfig,
-      writeWhenFileExist: false // Don't overwrite the file that dev modifies
+      content: initialSetupConfig
     },
     {
       path: `${INITIAL_SETUP_ROOT}/runner.js`,

package/src/emit/coreFunction/templates/InitialSetupConfig.ejs

@@ -49,21 +49,31 @@ const externalServices = {
 -%>
 const tableConfigs = {
   prod: {
-    Config: {},
+    Config: {
+      // <#InitialSetupConfig_Prod_Config_TableConfig#>
+      // <#/InitialSetupConfig_Prod_Config_TableConfig#>
+    },
 <% dynamoTableNames.forEach(tableName => { -%>
-    <%= tableName %>: {},
+    <%= tableName %>: {
+      // <#InitialSetupConfig_Prod_<%= tableName %>_TableConfig#>
+      // <#/InitialSetupConfig_Prod_<%= tableName %>_TableConfig#>
+    },
 <% }); -%>
     // <#InitialSetupConfig_ExtraProdTableConfigs#>
     // <#/InitialSetupConfig_ExtraProdTableConfigs#>
   },
   test: {
     Config: {
+      // <#InitialSetupConfig_Test_Config_TableConfig#>
       clearDataWhenRefresh: true,
       rawSource: false
+      // <#/InitialSetupConfig_Test_Config_TableConfig#>
     },
 <% dynamoTableNames.forEach(tableName => { -%>
     <%= tableName %>: {
+      // <#InitialSetupConfig_Test_<%= tableName %>_TableConfig#>
       clearDataWhenRefresh: true
+      // <#/InitialSetupConfig_Test_<%= tableName %>_TableConfig#>
     },
 <% }); -%>
     // <#InitialSetupConfig_ExtraTestTableConfigs#>

package/src/emit/coreFunction/templates/InitialSetupRunner.ejs

@@ -40,6 +40,8 @@ if (fs.existsSync(configPath)) {
   );
 }
 
+process.env.LOG_LEVEL = process.env.LOG_LEVEL || 'INFO';
+
 // 2. Dynamic import to ensure SDKs use the injected process.env
 const { default: initialSetupSharedLib } =
   await import('@izara_project/izara-core-library-initial-setup');
@@ -96,15 +98,15 @@ const commands = {
   },
   uploadSchema: async (_izContext) => {
     const { default: fn } = await import('./commands/uploadSchema.js');
-    await fn(_izContext);
+    await fn(_izContext, initialSetupSharedLib);
   },
   'uploadSchema:test': async (_izContext) => {
     const { default: fn } = await import('./commands/uploadSchema.js');
-    await fn(_izContext);
+    await fn(_izContext, initialSetupSharedLib);
   },
   'uploadSchema:prod': async (_izContext) => {
     const { default: fn } = await import('./commands/uploadSchema.js');
-    await fn(_izContext);
+    await fn(_izContext, initialSetupSharedLib);
   }
 };
 

package/src/emit/coreFunction/templates/InitialSetupRunner_uploadSchema.ejs

@@ -1,4 +1,4 @@
-import { uploadObjSchema } from '@izara_project/izara-core-library-service-schemas';
+import initialSetupLib from '@izara_project/izara-core-library-initial-setup';
 
 const SERVICE_TAG = {
   TRANSLATIONS: 'Translations',
@@ -18,18 +18,25 @@ const ignoreExternalServices = {
 };
 //(</ignoreExternalServices>)
 
-export default async function uploadSchema(_izContext) {
+export default async function uploadSchema(_izContext, initialSetupSharedLib = initialSetupLib) {
   console.log('======== UploadSchema ========');
   try {
-    _izContext.logger.debug('uploadSchema _izContext: ', _izContext);
-
-    await uploadObjSchema.uploadObjectSchemaByUseCase(_izContext, {
+    const libToUse = initialSetupSharedLib || initialSetupLib;
+    await libToUse.uploadObjectSchema(_izContext, {
       ignoreExternalServices: ignoreExternalServices
     });
     console.log('-------- Finish UploadSchema --------');
     return 'upload successfully';
   } catch (err) {
-    _izContext.logger.error('error LambdaFunction: ', err);
+    let errorDetails = err.message || String(err);
+    if (errorDetails.includes('errorMessage:')) {
+      const match = errorDetails.match(/functionName:\s*([^,]+),errorMessage:(.*)/);
+      if (match) {
+        errorDetails = `Lambda [${match[1].trim()}] failed: ${match[2].trim()}`;
+      }
+    }
+    _izContext.logger.error(`[uploadSchema] ❌ ${errorDetails}`);
     throw err;
   }
 }
+

package/src/emit/coreFunction/templates/InitialSetup_HdrInv.ejs

@@ -1,4 +1,4 @@
-import middlewareHandler from '@izara_project/izara-core-library-middleware';
+import { middlewareHandler } from '@izara_project/izara-middleware';
 import mainHandler from './InitialSetup_Main.js';
 
 export const main = middlewareHandler.wrap(

package/src/emit/crud/emitCrudApplicationArtifacts.js

@@ -234,11 +234,11 @@ async function emitAction(action, objects, flows, serviceTag) {
   artifacts.push(
     {
       path: `${source}/${complete}_Main.js`,
-      content: await render('FlowEndpointComplete_Main.ejs', { action })
+      content: await render(`${action}Complete_Main.ejs`, { action })
     },
     {
       path: `${source}/${complete}_HdrSqs.js`,
-      content: await renderShared('FlowHandler_HdrSqs.ejs', {
+      content: await render(`${action}Complete_HdrSqs.ejs`, {
         ...shared,
         mainFileName: `${complete}_Main`,
         functionName: complete,

package/src/emit/crud/emitDynamicCrudFlowSchemas.js

@@ -23,7 +23,10 @@ export function emitDynamicCrudFlowSchemas({ objects, flows = [] }) {
   }
 
   return ACTIONS.map((action, index) => {
-    const flow = _createDynamicFlow(action, _hasBeforeLogicalStep(flows, action));
+    const flow = _createDynamicFlow(
+      action,
+      _hasBeforeLogicalStep(flows, action)
+    );
     return {
       path: dynamicCrudFlowSchemaPaths[index],
       content: renderDynamicCrudFlowSchema(action, flow)
@@ -36,6 +39,23 @@ function _createDynamicFlow(action, hasBeforeLogicalStep) {
   const flowSteps = [
     {
       stepName: 'start',
+      ...(hasBeforeLogicalStep
+        ? {
+            nextSteps: [
+              {
+                stepName: 'BeforeLogical'
+              }
+            ]
+          }
+        : outputTopic
+        ? {
+            nextSteps: [
+              {
+                stepName: 'Complete'
+              }
+            ]
+          }
+        : {}),
       properties: [],
       messageAttributes: MESSAGE_ATTRIBUTES,
       ...(outputTopic
@@ -53,6 +73,16 @@ function _createDynamicFlow(action, hasBeforeLogicalStep) {
     flowSteps.push({
       stepName: 'BeforeLogical',
       event: ['extTopic'],
+      previousSteps: [
+        {
+          stepName: 'start'
+        }
+      ],
+      nextSteps: [
+        {
+          stepName: 'Complete'
+        }
+      ],
       properties: [],
       messageAttributes: MESSAGE_ATTRIBUTES
     });
@@ -62,7 +92,18 @@ function _createDynamicFlow(action, hasBeforeLogicalStep) {
     flowSteps.push({
       stepName: 'Complete',
       event: ['extTopic'],
-      properties: [],
+      previousSteps: [
+        {
+          stepName: hasBeforeLogicalStep ? 'BeforeLogical' : 'start'
+        }
+      ],
+      properties: [
+        'returnValue',
+        'parentFlowId',
+        'status',
+        'errorsFound',
+        'graphServiceTag'
+      ],
       messageAttributes: MESSAGE_ATTRIBUTES
     });
   }

package/src/emit/crud/templates/CreateComplete_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 CreateComplete from './CreateComplete_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
+          'CreateCompleteHdrSqs', // 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
+          CreateComplete, // mainFunction that need to invoke.
+          'CreateCompleteHdrSqs', // 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, CreateComplete_HdrSqs: ', error);
+    throw error;
+  }
+});

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

@@ -0,0 +1,188 @@
+import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow';
+import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
+import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
+import snsSharedLib from '@izara_project/izara-core-library-sns';
+import { sns } from '@izara_project/izara-core-library-external-request';
+import { consts } from '@izara_project/izara-core-library-service-schemas';
+import { NoRetryError } from '@izara_project/izara-core-library-core';
+
+//(<optionalRequire>)
+//(</optionalRequire>)
+
+const { TOPIC_NAME_GENERATE_CODE } = consts;
+const PREFIX = { ASYNC: 'CreateAsyncEndpoint' };
+
+function empty(value) {
+  return (
+    value == null ||
+    (typeof value === 'object' && Object.keys(value).length === 0)
+  );
+}
+
+function validateInput(returnValue, status, graphServiceTag, errorsFound) {
+  if (!returnValue?.queryResult)
+    errorsFound.push(
+      'message is not have property queryResult, should be not happen'
+    );
+  if (!returnValue?.requestParams?.objType)
+    errorsFound.push(
+      'message is not have property objType, should be not happen'
+    );
+  if (!returnValue?.requestParams?.objInstanceFull)
+    errorsFound.push(
+      'message is not have property objInstance, should be not objInstance'
+    );
+  if (status === 'error' && errorsFound.length === 0)
+    errorsFound.push(
+      '[invalid]status is error not have errorsFound form graphService'
+    );
+  if (status === 'complete' && errorsFound.length > 0)
+    errorsFound.push(
+      '[Invalid] status is complete should be not have errorsFound'
+    );
+  if (graphServiceTag == null)
+    errorsFound.push('[Invalid] graphServerTag is not empty string');
+}
+
+export default async function CreateComplete(
+  _izContext,
+  requestParams,
+  passBackProperties
+  //(<additionalParams>)
+  //(</additionalParams>)
+) {
+  try {
+    _izContext.logger.debug('[CreateComplete] started', {
+      requestParams
+    });
+    const {
+      returnValue,
+      status,
+      errorsFound = [],
+      graphServiceTag,
+      parentFlowId
+    } = requestParams;
+    if (empty(returnValue?.requestParams))
+      throw new NoRetryError('message not an object');
+    validateInput(returnValue, status, graphServiceTag, errorsFound);
+    if (errorsFound.length > 0) errorsFound.push(errorsFound.join(','));
+
+    const awaitingStepId = await asyncFlowSharedLib.createAwaitingStepId(
+      parentFlowId,
+      PREFIX.ASYNC
+    );
+    const pending =
+      await asyncFlowSharedLib.findPendingStepAwaitingMultipleSteps(
+        _izContext,
+        awaitingStepId
+      );
+    _izContext.logger.debug('[CreateComplete] awaiting step', {
+      awaitingStepId,
+      pending
+    });
+    if (!pending) {
+      _izContext.logger.warn(
+        `No pending step found for awaitingStepId: ${awaitingStepId}`
+      );
+      return { returnValue, status, errorsFound };
+    }
+    const result =
+      await asyncFlowSharedLib.checkAllAwaitingStepsFinishedWithReturnParams(
+        _izContext,
+        pending.pendingStepId,
+        awaitingStepId,
+        errorsFound
+      );
+    _izContext.logger.debug(
+      '[CreateComplete] all awaiting steps result',
+      {
+        isComplete: result.isComplete,
+        awaitingStepId,
+        pendingStepId: pending.pendingStepId
+      }
+    );
+
+    if (result.isComplete) {
+      const nodeResultKey = `returnCreatedNode`;
+      const fallbackNodeResultKey = `returnCreateNode`;
+      const nodeResult =
+        returnValue.queryResult[nodeResultKey] ??
+        returnValue.queryResult[fallbackNodeResultKey] ??
+        {};
+      const node = nodeResult.createNodeResult ?? nodeResult;
+      const existsNode =
+        node.existsNode && Object.keys(node.existsNode).length
+          ? {
+              objType: returnValue.requestParams.objType,
+              objInstanceFull: node.existsNode.objInstanceFull
+            }
+          : null;
+      if (status === 'complete') {
+        await Promise.all(
+          (pending.listOfRecords ?? []).flatMap((records) =>
+            Object.values(records).map(async (record) =>
+              dynamodbSharedLib.putItem(
+                _izContext,
+                await dynamodbSharedLib.tableName(
+                  _izContext,
+                  record.tableName,
+                  record.serviceTag
+                ),
+                {
+                  ...record.objInstanceFull.identifiers,
+                  ...record.objInstanceFull.fields
+                }
+              )
+            )
+          )
+        );
+      }
+      const message =
+        callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
+          passBackProperties,
+          {
+            objType: returnValue.requestParams.objType,
+            objInstanceFull: node.objInstanceFull,
+            relationships: node.relationships,
+            parentFlowId: parentFlowId || returnValue?.parentFlowId,
+            existsNode,
+            status,
+            errorsFound
+          }
+        );
+      const messageAttributes =
+        callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
+          passBackProperties,
+          {}
+        );
+      const topicArn = snsSharedLib.snsTopicArnByFlowSchema(
+        _izContext,
+        TOPIC_NAME_GENERATE_CODE.outCreateNodeComplete
+      );
+      _izContext.logger.debug('[CreateComplete] publishing to SNS', {
+        TopicArn: topicArn,
+        message
+      });
+      await sns.publishAsync(_izContext, {
+        Message: JSON.stringify(message),
+        MessageAttributes: sns.createStringMessageAttributes(
+          _izContext,
+          messageAttributes
+        ),
+        TopicArn: topicArn
+      });
+      //(<afterSendMessage>)
+      //(</afterSendMessage>)
+    }
+    await asyncFlowSharedLib.removeAwaitingMultipleStep(
+      _izContext,
+      awaitingStepId,
+      pending.pendingStepId,
+      errorsFound
+    );
+    return { returnValue, status, errorsFound };
+  } catch (error) {
+    _izContext.logger.error('[CreateComplete] error:', error);
+    throw error;
+  }
+}

package/src/emit/crud/templates/DeleteComplete_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 DeleteComplete from './DeleteComplete_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
+          'DeleteCompleteHdrSqs', // 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
+          DeleteComplete, // mainFunction that need to invoke.
+          'DeleteCompleteHdrSqs', // 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, DeleteComplete_HdrSqs: ', error);
+    throw error;
+  }
+});