@izara_project/izara-core-generate-service-code 1.0.38 → 1.0.40

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

@@ -20,7 +20,6 @@ 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 _ from 'lodash';
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 import { consts } from '@izara_project/izara-core-library-service-schemas';
 import { NoRetryError } from '@izara_project/izara-core-library-core';
@@ -81,6 +80,30 @@ function validateInput(returnValue, status, graphServiceTag, errorsFound) {
   }
 }
 
+/**
+ * @param {*} value
+ */
+function isEmpty(value) {
+  if (value == null) return true;
+
+  if (
+    Array.isArray(value) ||
+    typeof value === 'string'
+  ) {
+    return value.length === 0;
+  }
+
+  if (value instanceof Map || value instanceof Set) {
+    return value.size === 0;
+  }
+
+  if (typeof value === 'object') {
+    return Object.keys(value).length === 0;
+  }
+
+  return false;
+}
+
 /**
  * @param {*} returnValue
  * @returns {object|null}
@@ -184,7 +207,7 @@ export default async function createObjectComplete(
       passBackProperties,
     });
 
-    if (_.isEmpty(returnValue.requestParams)) {
+    if (isEmpty(returnValue.requestParams)) {
       _izContext.logger.debug('message callingFlowProperties is empty');
       throw new NoRetryError('message not an object');
     }
@@ -220,17 +243,34 @@ export default async function createObjectComplete(
     _izContext.logger.debug('record awaitingSteps::', recordAwaitingSteps);
 
     await Promise.all(
-      recordAwaitingSteps.Items.map(async ({ pendingStepId }) => {
+      recordAwaitingSteps.Items.map(async (recordAwaitingStep) => {
         if (
           await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
             _izContext,
-            pendingStepId,
+            recordAwaitingStep.pendingStepId,
             awaitingStepId,
             errorsFound,
           )
         ) {
           _izContext.logger.debug('finish all awaitingStep');
 
+          await Promise.all(
+            recordAwaitingStep.listOfRecords.map(async (listOfRecords) => {
+              Object.entries(listOfRecords).map(async ([tableName, record]) => {
+                await dynamodbSharedLib.putItem(
+                  _izContext,
+                  dynamodbSharedLib.tableName(_izContext,
+                    tableName,
+                    record.serviceTag
+                  ),
+                  {
+                    ...record.objInstanceFull.identifiers,
+                    ...record.objInstanceFull.fields
+                  }
+                );
+              })
+            }))
+
           const messageObject = buildMessageObject(
             returnValue,
             existsNode,

package/src/generateCode/generateSchema/actionEndpointComponent/mainFunction/create/main/template.ejs

@@ -15,7 +15,6 @@ 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 lodash from 'lodash';
 import { objectHash as hash } from '@izara_project/izara-shared-core';
 import dynamodbSharedLib from '@izara_project/izara-core-library-dynamodb';
 import snsSharedLib from '@izara_project/izara-core-library-sns';
@@ -40,9 +39,9 @@ const { dynamoDbIdentifiersByStorageResource, createIdentifiersByUseCase } = ide
 const { TOPIC_NAME_GENERATE_CODE, TOPIC_NAME_GRAPH_HANDLER } = consts;
 
 const PREFIX = {
-  ONE:                          'one',
-  MANY:                         'many',
-  CREATE_OBJECT_ASYNC:          'createObjectAsync',
+  ONE: 'one',
+  MANY: 'many',
+  CREATE_OBJECT_ASYNC: 'createObjectAsync',
   CREATE_OBJECT_ASYNC_COMPLETE: 'createObjectAsyncComplete',
   CREATE_OBJECT_EXTERNAL_TOPIC: 'createObjectExternalTopic'
 };
@@ -56,7 +55,7 @@ const PREFIX = {
  * @param {Object} beforeLogicalResults - Results from beforeLogical
  * @returns {Promise<Object>} Result with objType, objInstanceFull, relationships, status, errorsFound
  */
- export async function createMainLogical(
+export async function createMainLogical(
   _izContext,
   requestParams,
   callingFlowConfig = {},
@@ -90,7 +89,7 @@ const PREFIX = {
 
     // ── Detect invocation type ────────────────────────────────────────────────
     const directInvoke = requestParams.hasOwnProperty('__context__') &&
-                         requestParams.izEventSource?.eventSourceTag === 'DirectInvoke';
+      requestParams.izEventSource?.eventSourceTag === 'DirectInvoke';
 
     // ── Build createDataDetails ───────────────────────────────────────────────
     const createDataDetails = await createDataDetailsLib(_izContext, objectSchemas);
@@ -122,11 +121,12 @@ const PREFIX = {
     }
 
     // ── Process storage resources ─────────────────────────────────────────────
-    const objInstanceFullForDynamoDb      = lodash.cloneDeep(objInstanceFull);
-    const objInstanceFullForGraph         = lodash.cloneDeep(objInstanceFull);
-    const objInstanceFullForExternalTopic = lodash.cloneDeep(objInstanceFull);
-    const allAwaitingStepsId              = [];
-    const listOfObjectForCreates          = [];
+    const objInstanceFullForDynamoDb = structuredClone(objInstanceFull);
+    const objInstanceFullForGraph = structuredClone(objInstanceFull);
+    const objInstanceFullForExternalTopic = structuredClone(objInstanceFull);
+    const allAwaitingStepsId = [];
+    const listOfObjectForCreates = [];
+    const listOfRecords = [];
 
     if (errorsFound.length === 0) {
       //(<validateBeforeCreate>)
@@ -146,7 +146,9 @@ const PREFIX = {
             Object.assign(objInstanceFullForDynamoDb.fields, { [`${parentObject.objectType}HandlerServiceTag`]: process.env.iz_serviceTag });
           }
 
-          Object.assign(objInstanceFullForDynamoDb.fields, createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail));
+          Object.assign(objInstanceFullForDynamoDb.fields,
+          createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail));
+
           _izContext.logger.debug('objInstanceFull before create item in dynamoDB', objInstanceFullForDynamoDb);
 
           const identifiersForCreateData = await dynamoDbIdentifiersByStorageResource(
@@ -154,43 +156,59 @@ const PREFIX = {
           );
           _izContext.logger.debug('identifiersForCreateData', identifiersForCreateData);
 
-          await dynamodbSharedLib.putItem(
-            _izContext,
-            await dynamodbSharedLib.tableName(_izContext, createDataDetail.tableName, createDataDetail.serviceTag),
-            { ...identifiersForCreateData, ...objInstanceFullForDynamoDb.fields }
-          );
-
-          objInstanceFullForDynamoDb.fields = {};
+          // await dynamodbSharedLib.putItem(
+          //  _izContext,
+          //  await dynamodbSharedLib.tableName(_izContext, createDataDetail.tableName, createDataDetail.serviceTag),
+          //  { ...identifiersForCreateData, ...objInstanceFullForDynamoDb.fields }
+          // );
+
+          listOfRecords.push({
+            [createDataDetail.tableName]: {
+              serviceTag: createDataDetail.serviceTag,
+              objInstanceFull: {
+                identifiers: identifiersForCreateData,
+                fields: objInstanceFullForDynamoDb.fields
+              }
+            }
+          })
           //(<afterCreateRecordDynamo>)
           //(</afterCreateRecordDynamo>)
 
-        // ── Graph ─────────────────────────────────────────────────────────────
+          // ── Graph ─────────────────────────────────────────────────────────────
         } else if (createDataDetail.storageType === consts.STORAGE_TYPES.graph) {
           //(<beforeCreateNode>)
           //(</beforeCreateNode>)
           _izContext.logger.debug('::::::Graph::::::', { storageTag, objInstanceFull });
 
-          Object.assign(objInstanceFullForGraph.fields, createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail));
+          Object.assign(objInstanceFullForGraph.fields,
+           createObjInstanceFullFieldsByStorageTag(_izContext, storageTag, createDataDetail));
           _izContext.logger.debug('objInstanceFull before send to Graph', objInstanceFullForGraph);
 
           allAwaitingStepsId.push({
             awaitingStepId: await asyncFlowSharedLib.createAwaitingStepId(
-              hash({ objType, graphServerTag: storageTag, identifiers: objInstanceFullForGraph.identifiers, callingFlowProperties: callingFlowConfig.callingFlowProperties || {} }),
+              hash({ objType,
+                graphServerTag: storageTag,
+                identifiers: objInstanceFullForGraph.identifiers,
+                callingFlowProperties: callingFlowConfig.callingFlowProperties || {}
+              }),
               PREFIX.CREATE_OBJECT_ASYNC
             ),
             //(<additionalAttributeCreateNode>)
-            additionalAttributes: {}
+            additionalAttributes: { listOfRecords: listOfRecords }
             //(</additionalAttributeCreateNode>)
           });
 
           listOfObjectForCreates.push({
             [storageTag]: {
-              objInstanceFull:      { identifiers: objInstanceFullForGraph.identifiers, fields: objInstanceFullForGraph.fields },
+              objInstanceFull: {
+                identifiers: objInstanceFullForGraph.identifiers,
+                fields: objInstanceFullForGraph.fields
+              },
               allStorageTagComplete: false
             }
           });
 
-        // ── External Topic ────────────────────────────────────────────────────
+          // ── External Topic ────────────────────────────────────────────────────
         } else if (createDataDetail.storageType === consts.STORAGE_TYPES.externalTopic) {
           _izContext.logger.debug('::::::externalTopic::::::', { storageTag, createDataDetail });
           //(<beforeSendMessageToExternalTopic>)
@@ -210,7 +228,7 @@ const PREFIX = {
           });
 
           await sns.publishAsync(_izContext, {
-            Message:  JSON.stringify(objInstanceFullForExternalTopic),
+            Message: JSON.stringify(objInstanceFullForExternalTopic),
             TopicArn: `arn:aws:sns:${createDataDetail.region}:${createDataDetail.accountId}:${createDataDetail.serviceTag}_${createDataDetail.stage}_Create_In`
           });
         }
@@ -272,7 +290,7 @@ const PREFIX = {
         );
 
         await sns.publishAsync(_izContext, {
-          Message:  JSON.stringify(messageObject),
+          Message: JSON.stringify(messageObject),
           TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, TOPIC_NAME_GRAPH_HANDLER.inCreateNode, graphServiceName)
         });
 
@@ -281,8 +299,8 @@ const PREFIX = {
         return {
           objType,
           objInstanceFull: objInstanceFullForGraph,
-          relationships:   requestParams.relationships || [],
-          status:          'complete',
+          relationships: requestParams.relationships || [],
+          status: 'complete',
           errorsFound
         };
       }
@@ -307,7 +325,7 @@ const PREFIX = {
       );
 
       await sns.publishAsync(_izContext, {
-        Message:           JSON.stringify(messageObject),
+        Message: JSON.stringify(messageObject),
         MessageAttributes: sns.createStringMessageAttributes(
           _izContext,
           callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(callingFlowConfig, {})
@@ -328,7 +346,7 @@ const PREFIX = {
       if (callingFlowConfig[callingFlowSharedLib.consts.CALLINGFLOW_PROPERTYNAME]) {
         _izContext.logger.debug('HAVE CallingFlow');
         await sns.publishAsync(_izContext, {
-          Message:           JSON.stringify(outMessage),
+          Message: JSON.stringify(outMessage),
           MessageAttributes: sns.createStringMessageAttributes(
             _izContext,
             callingFlowSharedLib.addCallingFlowToSnsResponseMessageAttributes(callingFlowConfig, {})
@@ -341,8 +359,8 @@ const PREFIX = {
     return {
       objType,
       objInstanceFull: objInstanceFullForDynamoDb,
-      relationships:   requestParams.relationships || [],
-      status:          'complete',
+      relationships: requestParams.relationships || [],
+      status: 'complete',
       errorsFound
     };
 
@@ -378,7 +396,7 @@ export default async function createMain(
     // ── Resolve userId / targetId ─────────────────────────────────────────────
     let userId, targetId;
     if (objectSchema.generatedBy === 'userGenerated') {
-      userId   = _izContext.correlationIds.get(coreConsts.BASE_USER_ID);
+      userId = _izContext.correlationIds.get(coreConsts.BASE_USER_ID);
       targetId = _izContext.correlationIds.get(coreConsts.TARGET_ID);
       if (!userId) errorsFound.push('Not have userId');
       if (objectSchema.hasOwnProperty('belongTo') && !targetId) errorsFound.push('not have targetId');
@@ -444,12 +462,12 @@ export default async function createMain(
     _izContext.logger.debug('errorsFound::', errorsFound);
 
     if (errorsFound.length > 0)
-    return await createMainLogical(
-      _izContext,
-      requestParams,
-      callingFlowConfig,
-      errorsFound
-    );
+      return await createMainLogical(
+        _izContext,
+        requestParams,
+        callingFlowConfig,
+        errorsFound
+      );
 
     // ── Validate fieldNames ───────────────────────────────────────────────────
     const objInstanceFull = { identifiers: {}, fields: {} };

package/src/libs/Consts.js

@@ -94,7 +94,7 @@ const SOURCE_PATH = {
     'src/generatedCode/CreateRecordComplete/',
 
   // systemText
-  systemTextSchema: 'SystemTextSchema/generatedCode/',
+  systemTextSchema: 'SystemTextSchemas/generatedCode/',
 
   // rbac
   rbac: '/src/generatedCode/Rbac/source/',

package/src/libs/Libs.js

@@ -120,28 +120,32 @@ function externalResourceName(resourceClass, resourceName, serviceTag) {
 }
 
 function externalResourceYaml(resourceClass, resourceName, serviceTag) {
-  if (!serviceTag) {
-    serviceTag = '${self:custom.iz_resourcePrefix}';
-  } else {
-    serviceTag = serviceTag + 'Test';
-  }
+  // if (!serviceTag) {
+  //   serviceTag = '${self:custom.iz_resourcePrefix}';
+  // } else {
+  //   serviceTag = serviceTag + '${self:custom.iz_stage}';
+  // }
   return {
     [RESOURCE_CLASSES.dynamoDbTable]:
       'arn:aws:dynamodb:${self:custom.iz_region}:${self:custom.iz_accountId}:table/' +
-      `${serviceTag}` +
-      `${resourceName}`,
+        serviceTag ?
+        '${self:custom.iz_resourcePrefix}' : serviceTag + '${self:custom.iz_stage}' +
+        `${resourceName}`,
+    // `${serviceTag}` +
+    // `${resourceName}`,
     [RESOURCE_CLASSES.lambda]:
       'arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:' +
-      `${serviceTag}` +
-      `${resourceName}`,
+        serviceTag ?
+        '${self:custom.iz_resourcePrefix}' : serviceTag + '${self:custom.iz_stage}' +
+        `${resourceName}`,
     [RESOURCE_CLASSES.sns]:
       'arn:aws:sns:${self:custom.iz_region}:${self:custom.iz_accountId}:' +
-      `${serviceTag}` +
-      `${resourceName}`,
+      `${serviceTag}` + '_${self:custom.iz_stage}_' + `${resourceName}`,
     [RESOURCE_CLASSES.sqs]:
       'arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:' +
-      `${serviceTag}` +
-      `${resourceName}`
+        serviceTag ?
+        '${self:custom.iz_resourcePrefix}' : serviceTag + '${self:custom.iz_stage}' +
+        `${resourceName}`,
   }[resourceClass];
 }
 
@@ -494,6 +498,7 @@ function createSnsResource(topicNames) {
       resourceNames(RESOURCE_CLASSES.sns, topicName))
   );
 }
+
 async function getLocalOrS3ObjectSchema(_izContext, objType, schemasPath) {
   console.log("objType, schemasPath", objType, schemasPath)
   const iz_serviceTag = getLocalConfig('iz_serviceTag');
@@ -528,7 +533,7 @@ async function getLocalOrS3ObjectSchema(_izContext, objType, schemasPath) {
 async function getLocalOrS3FlowSchema(_izContext, flowType, schemasPath) {
   const iz_serviceTag = getLocalConfig('iz_serviceTag');
   const iz_serviceSchemaBucketName = getLocalConfig('iz_serviceSchemaBucketName');
-
+  console.log("schemasPath", schemasPath)
   let flowSchema;
   let errorMessage;
   if (flowType.serviceTag === iz_serviceTag) {
@@ -551,7 +556,9 @@ async function getLocalOrS3FlowSchema(_izContext, flowType, schemasPath) {
       flowType,
       iz_serviceSchemaBucketName
     );
-    errorMessage = 's3 not exists';
+    if (!flowSchema) {
+      errorMessage = 's3 not exists';
+    }
   }
   return [flowSchema, errorMessage];
 }

package/src/generateCode/generateInitialSetup/externalServiceComponent/lambdaRole/request.json

@@ -1,18 +0,0 @@
-{
-  "functionName": "xx",
-  "additionalResourcePermission": [
-    {
-      "effect": "Allow",
-      "action": {
-        "dynamodb": [
-          "GetItem",
-          "PutItem"
-        ]
-      },
-      "resource": [
-        "aws:sqs",
-        "..."
-      ]
-    }
-  ]
-}

package/src/generateCode/generateInitialSetup/externalServiceComponent/snsTopicSubscriptions/request.json

@@ -1,12 +0,0 @@
-[
-  {
-    "serviceName": "externalService",
-    "topicName": "sns of  external service",
-    "sqsEndpoint": "sqs inside this service"
-  },
-  {
-    "serviceName": [],
-    "topicName": [],
-    "sqsEndpoint": []
-  }
-]