@izara_project/izara-core-generate-service-code 1.0.23 → 1.0.24

package/src/generateCode/generateSchema/actionEndpointCompleteComponent/update/mainFunction/template.ejs

@@ -15,119 +15,185 @@ 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 { objectHash as hash } from '@izara_project/izara-shared-core';
 import callingFlowSharedLib from '@izara_project/izara-core-library-calling-flow';
 import snsSharedLib from '@izara_project/izara-core-library-sns';
 import asyncFlowSharedLib from '@izara_project/izara-core-library-asynchronous-flow';
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
-import { sns } from "@izara_project/izara-core-library-external-request";
+import { sns } from '@izara_project/izara-core-library-external-request';
+import {
+  consts,
+} from '@izara_project/izara-core-library-service-schemas';
 
-import { consts } from '@izara_project/izara-core-library-service-schemas';
 const { TOPIC_NAME_GENERATE_CODE } = consts;
+const PREFIX = {
+  updateNode: 'updateNode',
+};
 
 //(<optionalRequire>)
 //(</optionalRequire>)
 
+/**
+ * @param {*} returnValue
+ * @returns {string}
+ */
+function buildAwaitingStepId(returnValue) {
+  const { objType, objInstanceFull } = returnValue.requestParams;
+  return asyncFlowSharedLib.createAwaitingStepId(
+    hash({
+      objectType: objType.objectType,
+      serviceTag: objType.serviceTag,
+      identifiers: objInstanceFull.identifiers,
+      fields: objInstanceFull.fields,
+    }),
+    PREFIX.updateNode,
+  );
+}
+
+/**
+ * @param {*} returnValue
+ * @param {*} status
+ * @param {*} errorsFound
+ * @returns {object}
+ */
+function buildUpdateCompleteMsg(returnValue, status, errorsFound) {
+  const { objType, objInstanceFull } = returnValue.requestParams;
+  return {
+    objType: {
+      objectType: objType.objectType,
+      serviceTag: objType.serviceTag,
+    },
+    objInstanceFull: {
+      identifiers: objInstanceFull.identifiers,
+      fields: objInstanceFull.fields,
+    },
+    status,
+    errorsFound,
+  };
+}
+
+/**
+ * @param {*} _izContext
+ * @param {*} passBackProperties
+ * @param {*} message
+ */
+async function sendSnsMessage(_izContext, passBackProperties, message) {
+  const enrichedMessage =
+    callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(
+      passBackProperties,
+      message,
+    );
+  _izContext.logger.debug(
+    'after addCallingFlow to SnsResponseMessageObject',
+    enrichedMessage,
+  );
+
+  const messageAttributes =
+    callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(
+      passBackProperties,
+      {},
+    );
+  _izContext.logger.debug(
+    'after addCallingFlow to SnsResponseMessageAttributes',
+    enrichedMessage,
+  );
+
+  const snsPayload = {
+    Message: JSON.stringify(enrichedMessage),
+    MessageAttributes: sns.createStringMessageAttributes(
+      _izContext,
+      messageAttributes,
+    ),
+    TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(
+      _izContext,
+      TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete,
+    ),
+  };
+  _izContext.logger.debug(
+    'Send Message to OutUpdateNodeComplete::',
+    snsPayload,
+  );
+  await sns.publishAsync(_izContext, snsPayload);
+}
+
+/**
+ * @param {*} _izContext
+ * @param {*} returnValue
+ * @param {*} status
+ * @param {*} errorsFound
+ * @param {*} passBackProperties
+ */
 export default async function updateNodeComplete(
   _izContext,
   returnValue,
   status,
   errorsFound,
-  passBackProperties = {}
+  passBackProperties = {},
 ) {
   try {
-    _izContext.logger.debug("Function:updateNodeComplete", {
-      _izContext: _izContext,
-      returnValue: returnValue,
-      status: status,
-      errorsFound: errorsFound,
-      passBackProperties: passBackProperties
+    _izContext.logger.debug('Function:updateNodeComplete', {
+      returnValue,
+      status,
+      errorsFound,
+      passBackProperties,
     });
 
-    // start create AwaitingStepId
-    let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
-      hash({
-        objectType: returnValue.requestParams.objType.objectType,
-        serviceTag: returnValue.requestParams.objType.serviceTag,
-        identifiers: returnValue.requestParams.objInstanceFull.identifiers,
-        fields: returnValue.requestParams.objInstanceFull.fields
-      }),
-      PREFIX.updateNode
-    )
+    const awaitingStepId = buildAwaitingStepId(returnValue);
 
-    let updateNodePendingObjects = await dynamodbSharedLib.query(
+    const updateNodePendingObjects = await dynamodbSharedLib.query(
       _izContext,
-      await dynamodbSharedLib.tableName(_izContext, "AwaitingMultipleSteps"),
-      {
-        awaitingStepId: awaitingStepId
-      }
+      await dynamodbSharedLib.tableName(_izContext, 'AwaitingMultipleSteps'),
+      { awaitingStepId },
+    );
+    _izContext.logger.debug(
+      'updateNodePendingObjects',
+      updateNodePendingObjects,
     );
-    _izContext.logger.debug("updateNodePendingObjects", updateNodePendingObjects);
 
     await Promise.all(
       updateNodePendingObjects.Items.map(async ({ pendingStepId }) => {
-        if (await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
-          _izContext,
-          pendingStepId,
-          awaitingStepId,
-          errorsFound
-        )) {
-          _izContext.logger.debug("finished all awaitingStep");
-
-          let updateCompleteMsg = {
-            objType: {
-              objectType: returnValue.requestParams.objType.objectType,
-              serviceTag: returnValue.requestParams.objType.serviceTag
-            },
-            objInstanceFull: {
-              identifiers: returnValue.requestParams.objInstanceFull.identifiers,
-              fields: returnValue.requestParams.objInstanceFull.fields
-            },
-            status: status,
-            errorsFound: errorsFound,
-          };
+        if (
+          await asyncFlowSharedLib.checkAllAwaitingStepsFinishedWithError(
+            _izContext,
+            pendingStepId,
+            awaitingStepId,
+            errorsFound,
+          )
+        ) {
+          _izContext.logger.debug('finished all awaitingStep');
+
+          const updateCompleteMsg = buildUpdateCompleteMsg(
+            returnValue,
+            status,
+            errorsFound,
+          );
 
           //(<additionalProperties>)
           //(</additionalProperties>)
 
-          updateCompleteMsg = callingFlowSharedLib.addParentPassBackPropertiesToSnsResponseMessageObject(passBackProperties, updateCompleteMsg);
-          _izContext.logger.debug("after addCallingFlow to SnsResponseMessageObject", updateCompleteMsg);
-
-          let messageAttributes = callingFlowSharedLib.addParentPassBackCallingFlowToSnsResponseMessageAttributes(passBackProperties, {});
-          _izContext.logger.debug("after addCallingFlow to SnsResponseMessageAttributes", updateCompleteMsg);
-
-          let sendMessageToOutUpdateNodeComplete = {
-            Message: JSON.stringify(updateCompleteMsg),
-            MessageAttributes: sns.createStringMessageAttributes(_izContext, messageAttributes),
-            TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GENERATE_CODE.outUpdateNodeComplete)
-          };
-          _izContext.logger.debug("Send Message to OutUpdateNodeComplete::", sendMessageToOutUpdateNodeComplete);
-          await sns.publishAsync(_izContext, sendMessageToOutUpdateNodeComplete)
-
+          await sendSnsMessage(_izContext, passBackProperties, updateCompleteMsg);
         }
 
         await asyncFlowSharedLib.removeAwaitingMultipleStep(
           _izContext,
           awaitingStepId,
           pendingStepId,
-          errorsFound
+          errorsFound,
         );
-      })
-    )
+      }),
+    );
 
     //(<beforeReturn>)
     //(</beforeReturn>)
 
+    const { queryResult } = returnValue;
     return {
-      objType: returnValue.queryResult.objType,
-      objInstanceFull: returnValue.queryResult.objInstanceFull,
-      errorsFound: errorsFound
-    }
-
+      objType: queryResult.objType,
+      objInstanceFull: queryResult.objInstanceFull,
+      errorsFound,
+    };
   } catch (err) {
-    _izContext.logger.error("error UpdateNodeComplete : ", err)
-    throw (err)
+    _izContext.logger.error('error UpdateNodeComplete:', err);
+    throw err;
   }
 }

package/src/generateCode/generateSchema/actionEndpointCompleteComponent/update/sns-out/data.js

@@ -57,7 +57,8 @@ function createParamsForCreateSource(_izContext, srcPath) {
       savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
-      isAppend: true
+      isAppend: true,
+      fromFile: 'actionEndpointCom/update/sns-out/data.js'
     }
   };
 }

package/src/generateCode/generateSchema/actionEndpointComponent/yaml/data.js

@@ -68,7 +68,7 @@ const HTTP_METHOD = {
  * Generates yaml source params for a given action and handler
  * @param {Object} _izContext - Context object with logger
  * @param {Array} allObjSchemas - All object schemas
- * @param {string} srcPath - Source path
+ * @param {string} appPath - Source path
  * @param {string} action - Action name (create/update/get/delete)
  * @param {string} handler - Handler type (hdrApi/hdrSqs/hdrDsq/hdrInv)
  * @param {string|null} functionNameConfig - Override for yaml key (null = derive from action+handler)
@@ -78,7 +78,7 @@ const HTTP_METHOD = {
 async function data(
   _izContext,
   allObjSchemas,
-  srcPath,
+  appPath,
   action,
   handler,
   handlerSuffix = '',
@@ -187,7 +187,9 @@ async function data(
   }
 
   // ── Service config ────────────────────────────────────────────────────────
-  const configPath = path.join(srcPath, '../config/serverless.config.yml');
+  const configPath = path.join(appPath, '../config/serverless.config.yml');
+
+  // console.debug('###### configPath:', configPath);
   const ownServiceTag = yaml.parse(fs.readFileSync(configPath, 'utf8'))
     .main_config.iz_serviceTag;
 
@@ -294,7 +296,7 @@ async function data(
         }))
       },
       setting: {
-        savePath: path.join(srcPath, SOURCE_PATH.appYaml),
+        savePath: path.join(appPath, SOURCE_PATH.appYaml),
         saveFileName: SAVE_FILE_NAME.functionPerActionYaml,
         fileExtension: '.yml',
         isAppend: true

package/src/generateCode/generateSchema/findDataComponent/mainFunction/data.js

@@ -74,7 +74,7 @@ async function data(_izContext, appPath, getObjectTypes) {
         objectType,
         schemaPath
       );
-    // console.log('objectSchemaRecord: ', objectSchemaRecord);
+    // console.log('#### objectSchemaRecord: ', objectSchemaRecord);
 
     let objectSchema = objectSchemaRecord.records[0];
     // console.log(("objectSchema: ", objectSchema)

package/src/generateCode/generateSchema/relationshipPerActionComponent/changeRelationship/complete/sns-out/data.js

@@ -56,7 +56,8 @@ function createParamsForCreateSource(_izContext, srcPath) {
       savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
-      isAppend: true
+      isAppend: true,
+      fromFile: 'relationShip/changeComplete/sns-out/data.js'
     }
   };
 }

package/src/generateCode/generateSchema/relationshipPerActionComponent/create/action/functionYaml/data.js

@@ -33,6 +33,7 @@ const {
   SHORT_FUNCTION_NAME,
   SOURCE_GENERATE_IAM_ROLE,
   SQS_RESOURCE,
+  DYNAMO_RESOURCE,
   HANDLER
 } = consts;
 

package/src/generateCode/generateSchema/relationshipPerActionComponent/create/complete/sns-out/data.js

@@ -55,7 +55,8 @@ function createParamsForCreateSource(_izContext, srcPath) {
       savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
-      isAppend: true
+      isAppend: true,
+      fromFile: 'relationShip/createComplete/sns-out/data.js'
     }
   };
 }

package/src/generateCode/generateSchema/relationshipPerActionComponent/delete/action/functionYaml/data.js

@@ -33,6 +33,7 @@ const {
   SHORT_FUNCTION_NAME,
   SOURCE_GENERATE_IAM_ROLE,
   SQS_RESOURCE,
+  DYNAMO_RESOURCE,
   HANDLER
 } = consts;
 

package/src/generateCode/generateSchema/relationshipPerActionComponent/delete/complete/sns-out/data.js

@@ -57,7 +57,8 @@ function createParamsForCreateSource(_izContext, srcPath) {
       savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
-      isAppend: true
+      isAppend: true,
+      fromFile: 'relationShip/deleteComplete/sns-out/data.js'
     }
   };
 }

package/src/generateCode/generateSchema/relationshipPerActionComponent/get/action/functionYaml/data.js

@@ -33,6 +33,7 @@ const {
   SHORT_FUNCTION_NAME,
   SOURCE_GENERATE_IAM_ROLE,
   SQS_RESOURCE,
+  DYNAMO_RESOURCE,
   HANDLER
 } = consts;
 

package/src/generateCode/generateSchema/relationshipPerActionComponent/get/complete/sns-out/data.js

@@ -58,7 +58,8 @@ function createParamsForCreateSource(_izContext, srcPath) {
       savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
-      isAppend: true
+      isAppend: true,
+      fromFile: 'relationShip/getComplete/sns-out/data.js'
     }
   };
 }

package/src/generateCode/generateSchema/relationshipPerActionComponent/moveRelationship/complete/sns-out/data.js

@@ -57,7 +57,8 @@ function createParamsForCreateSource(_izContext, srcPath) {
       savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
-      isAppend: true
+      isAppend: true,
+      fromFile: 'relationShip/moveComplete/sns-out/data.js'
     }
   };
 }

package/src/generateCode/generateSchema/relationshipPerActionComponent/update/action/functionYaml/data.js

@@ -33,6 +33,7 @@ const {
   SHORT_FUNCTION_NAME,
   SOURCE_GENERATE_IAM_ROLE,
   SQS_RESOURCE,
+  DYNAMO_RESOURCE,
   HANDLER
 } = consts;
 

package/src/generateCode/generateSchema/relationshipPerActionComponent/update/action/sns-out/data.js

@@ -60,7 +60,8 @@ function createParamsForCreateSource(_izContext, srcPath) {
       savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
       saveFileName: SAVE_FILE_NAME.snsOutYaml,
       fileExtension: '.yml',
-      isAppend: true
+      isAppend: true,
+      fromFile: 'relationShip/update/sns-out/data.js'
     }
   };
 }

package/src/generateCode/generateSchema/relationshipPerActionComponent/update/complete/sns-out/data.js

@@ -49,7 +49,8 @@ function createParamsForCreateSource(_izContext, appPath) {
         savePath: path.join(appPath, SOURCE_PATH.resourceYaml),
         saveFileName: SAVE_FILE_NAME.snsOutYaml,
         fileExtension: '.yml',
-        isAppend: true
+        isAppend: true,
+      fromFile: 'relationShip/updateComplete/sns-out/data.js'
       }
     }
   ];

package/src/generateCode/resourceYamlComponent/sns-out/data.js

@@ -69,7 +69,8 @@ function createSourceSnsOut(_izContext, srcPath) {
         savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
         saveFileName: SAVE_FILE_NAME.snsOutYaml,
         fileExtension: '.yml',
-        isAppend: true
+        isAppend: true,
+        fromFile: 'resourceYaml/sns-out/data.js'
       }
     });
   }

package/src/generateCode/resourceYamlComponent/sns-out/defaultSnsOutForFindDataAndProcessLogical.js

@@ -55,7 +55,8 @@ function createDataForDefaultSnsOut(_izContext, srcPath) {
         savePath: path.join(srcPath, SOURCE_PATH.resourceYaml),
         saveFileName: SAVE_FILE_NAME.snsOutYaml,
         fileExtension: '.yml',
-        isAppend: true
+        isAppend: true,
+        fromFile: 'resourceYaml/sns-out/defaultSnsOut.js'
       }
     });
   }

package/src/generateCode/resourceYamlComponent/sns-out/template.ejs

@@ -1,10 +1,6 @@
 ##--------- [Create Topic Out]
-  Out<%- firstLetterUpperCase(queueName) %>:
+  Out<%- queueName %>:
     Type: AWS::SNS::Topic
     Properties:
       DisplayName: "SNS Message out"
-      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- firstLetterUpperCase(queueName) %>_Out
-
-  <%_ function firstLetterUpperCase(text) {
-    return text.charAt(0).toUpperCase() + text.slice(1)
-  } _%>
+      TopicName: ${self:custom.iz_serviceTag}_${self:custom.iz_stage}_<%- queueName %>_Out

package/src/generateCode.js

@@ -64,6 +64,7 @@ async function generateCodeWithTemplate(
   try {
     const startTime = Date.now();
     const appPath = path.join(rootServicePath, '/app');
+    const schemasPath = path.join(appPath, '/src/schemas');
     console.info(
       `[INFO] [generateCode] STATUS=START     | path=${rootServicePath}`
     );
@@ -73,15 +74,12 @@ async function generateCodeWithTemplate(
     const fetchStartTime = Date.now();
     const [allLocalFlowSchemas, allObjSchemas, allLocalRelationshipSchemas] =
       await Promise.all([
-        getObjectSchema.getAllLocalFlowSchemas(_izContext, rootServicePath),
+        getObjectSchema.getAllLocalFlowSchemas(_izContext, schemasPath),
         getObjectSchema.getAllLocalObjectSchemasWithHierarchy(
           _izContext,
-          rootServicePath
+          schemasPath
         ),
-        getObjectSchema.getAllLocalRelationshipSchema(
-          _izContext,
-          rootServicePath
-        )
+        getObjectSchema.getAllLocalRelationshipSchema(_izContext, schemasPath)
       ]);
 
     const fetchDuration = Date.now() - fetchStartTime;
@@ -145,6 +143,7 @@ async function generateCodeWithTemplate(
       appPath,
       allCreateSource
     );
+
     allCreateSource.push(...createSourceRole);
     const roleStr = `items=${allCreateSource.length} roles=${createSourceRole.length}`;
     console.info(
@@ -156,6 +155,7 @@ async function generateCodeWithTemplate(
     console.info('[INFO] [generateCode] STATUS=VALIDATING| source items...');
     for (const item of allCreateSource) {
       if (!item?.templatePath || !item?.templateData || !item?.setting) {
+        console.debug('###### error item:', item);
         throw new Error(
           `[generateCode] invalid source item: ${JSON.stringify(item)}`
         );
@@ -163,6 +163,8 @@ async function generateCodeWithTemplate(
       const { templatePath, templateData, setting } = item;
       setting.checkCreateSourcePass = true;
 
+      // console.debug('####### item:', item);
+
       const [status, errors] = await createSource(
         readFileSync(templatePath, 'utf8'),
         templateData,
@@ -170,7 +172,7 @@ async function generateCodeWithTemplate(
       );
       if (!status) {
         console.error('[generateCode] validation failed:', errors);
-        _izContext.logger.error('[generateCode] validation failed:', errors);
+        console.debug('###### item:', item);
         throw new Error(errors);
       }
 

package/src/libs/Utils.js

@@ -18,8 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import yaml from 'yaml';
 import fs from 'fs';
 import path from 'path';
+
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 
+import consts from '#libs/Consts.js';
+const { SOURCE_PATH } = consts;
+
 function firstLetterUpperCase(text) {
   return text.charAt(0).toUpperCase() + text.slice(1);
 }
@@ -128,6 +132,26 @@ function deleteFile(filePath) {
   }
 }
 
+const savePath = {
+  resourceYamlFlowSchemaFlowTag: function (appPath, flowTag) {
+    return path.join(
+      appPath,
+      SOURCE_PATH.flowSchema,
+      firstLetterUpperCase(flowTag),
+      'MainHandler/',
+      'source/'
+    );
+  },
+  flowSchemaFlowTag: function (flowTag) {
+    return path.join(
+      SOURCE_PATH.flowSchema,
+      firstLetterUpperCase(flowTag),
+      'MainHandler/',
+      'source/'
+    );
+  }
+};
+
 export default {
   firstLetterUpperCase,
   firstLetterLowerCase,
@@ -135,5 +159,6 @@ export default {
   getLocalConfig,
   checkValidTableYaml,
   deleteFileInDir,
-  deleteFile
+  deleteFile,
+  savePath
 };

package/src/__TemplateData/flowSchema/event/externalTopic/Process/handler/data.js

@@ -1,64 +0,0 @@
-/*
-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/>.
-*/
-
-import path from 'path';
-import { fileURLToPath } from 'url';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-
-import consts from '../../../../../../libs/Consts.js';
-import utils from '../../../../../../libs/Utils.js';
-
-const { SOURCE_PATH, HANDLER } = consts;
-const { firstLetterUpperCase: upperCase } = utils;
-
-const templatePath = path.join(__dirname, 'template.ejs');
-/**
- * receive objectSchema
- * create data for WebScoket handler template
- *
- * @param {Object} objectSchema
- * @return {{templatePath, templateData,setting}}
- */
-
-function createSourceParams(_izContext, flowSchema, srcPath) {
-  let functionName = 'Process' + upperCase(flowSchema.flowTag);
-  let handlerType = upperCase(HANDLER.hdrSqs);
-  let queueName = 'Process' + upperCase(flowSchema.flowTag) + handlerType;
-
-  return {
-    templatePath: templatePath,
-    templateData: {
-      functionName,
-      handlerType,
-      queueName
-    },
-    setting: {
-      savePath: path.join(
-        srcPath,
-        SOURCE_PATH.flowSchema,
-        upperCase(flowSchema.flowTag),
-        'source/'
-      ),
-      saveFileName: `${functionName}_${handlerType}`,
-      fileExtension: '.js',
-      isAppend: false
-    }
-  };
-}
-
-export default createSourceParams;