@izara_project/izara-core-generate-service-code 1.0.41 → 1.0.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@izara_project/izara-core-generate-service-code",
-  "version": "1.0.41",
+  "version": "1.0.43",
   "description": "Code for locally generating per service files",
   "author": "Sven Mason <thebarbariansven@gmail.com>",
   "license": "AGPL-3.0-or-later",

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/mainFunction/data.js

@@ -31,7 +31,7 @@ const templateSendPlugin = path.join(__dirname, './templateByConfig/templateSend
 const templateAwaitingStep = path.join(__dirname, './templateByConfig/awaitingSteps.ejs');
 
 async function data(_izContext, data, appPath) {
-
+  console.log("dataInMain", data)
   const [mainFlow] = await getLocalOrS3FlowSchema(
     _izContext,
     {
@@ -42,25 +42,10 @@ async function data(_izContext, data, appPath) {
       appPath, './src/schemas')
   );
 
-  const [childFlow] = await getLocalOrS3FlowSchema(
-    _izContext,
-    data.childFlow,
-    path.join(
-      appPath, './src/schemas')
-  );
-
   if (mainFlow.hasOwnProperty('objType')) {
     data['mainObjType'] = mainFlow.objType;
   };
 
-  if (!childFlow) {
-    throw new NoRetryError(`can't get ${childFlow} from s3 or local`);
-  };
-
-  if (childFlow && childFlow.hasOwnProperty('objType')) {
-    data['childObjType'] = childFlow.objType;
-  };
-
 
   return {
     templatePath: templatePath,

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/mainFunction/template.ejs

@@ -58,7 +58,7 @@ export default async function <%- functionName %>(
     //(<hookCode>)
 
     <% if (handleLogic === 'awaitingMultipleSteps') { %>
-    <%- include(templateAwaitingStep, { childFlow, mainObjType, childObjType }) %>
+    <%- include(templateAwaitingStep, { childFlow, mainObjType }) %>
     <% } %>
     <% if (havePlugIn) { -%>
     <%- include(templateSendPlugin, {havePlugIn: havePlugIn, invokeType: invokeType, targetUrl: targetUrl}) %>

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/mainFunction/templateByConfig/awaitingSteps.ejs

@@ -52,10 +52,6 @@ await asyncFlowSharedLib.createAwaitingMultipleStepsWithAdditionalAttributes(
     )
   );
 
-  await sns.publishAsync(_izContext, {
-    Message: JSON.stringify(messageObject),
-    TopicArn: await snsSharedLib.snsTopicArnByFlowSchema(_izContext, "<%- childFlow.flowTag %>_In", "<%- childFlow.serviceTag %>")
-  });
 //(</afterCreateAwatingSteps>)
 
 <%_ function firstLetterUpperCase(text) {

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/queueNtopic/data.js

@@ -26,7 +26,7 @@ import utils from '#libs/Utils.js';
 const { firstLetterUpperCase: upperCase } = utils;
 const { SOURCE_PATH, SAVE_FILE_NAME, HANDLER } = consts;
 const templatePathByHandler = {
-  [HANDLER.hdrDsq]: path.join(__dirname, './sqsTemplate.ejs'),
+  [HANDLER.hdrDsq]: path.join(__dirname, './dsqTemplate.ejs'),
   [HANDLER.hdrSqs]: path.join(__dirname, './snsTemplate.ejs'),
   queueNoTopic: path.join(__dirname, './sqsTemplate.ejs')
 };

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/queueNtopic/dsqTemplate.ejs

@@ -0,0 +1,43 @@
+#------- queue ---------
+  <%- queueName %>HdrDsq:
+    Type: "AWS::SQS::Queue"
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrDsq
+      RedrivePolicy:
+        deadLetterTargetArn: #!GetAtt
+          Fn::GetAtt:
+            - <%- queueName %>HdrDsqDLQ
+            - Arn
+        maxReceiveCount: 3
+      VisibilityTimeout: 120
+
+  <%- queueName %>HdrDsqDLQ:
+    Type: AWS::SQS::Queue
+    Properties:
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrDsqDLQ
+
+  <%- queueName %>HdrDsqPolicy:
+    Type: AWS::SQS::QueuePolicy
+    Properties:
+      PolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          - Sid: "allow-sns-messages"
+            Effect: Allow
+            Principal: "*"
+            Resource: #!GetAtt
+              Fn::GetAtt:
+                - <%- queueName %>HdrDsq
+                - Arn
+            Action: "SQS:SendMessage"
+      Queues:
+        - Ref: <%- queueName %>HdrDsq
+  #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+  #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
+
+<%_ function firstLetterUpperCase(text){
+  return text.charAt(0).toUpperCase() + text.slice(1)
+} _%>
+<%_ function firstLetterLowerCase(str) {
+  return str.charAt(0).toLowerCase() + str.slice(1)
+} _%>

package/src/generateCode/generateFlowStepWithPlugIn/firstFlowStep/queueNtopic/sqsTemplate.ejs

@@ -1,22 +1,22 @@
 #------- queue ---------
-  <%- queueName %>HdrDsq:
+  <%- queueName %>HdrSqs:
     Type: "AWS::SQS::Queue"
     Properties:
-      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrDsq
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqs
       RedrivePolicy:
         deadLetterTargetArn: #!GetAtt
           Fn::GetAtt:
-            - <%- queueName %>DLQ
+            - <%- queueName %>HdrSqsDLQ
             - Arn
         maxReceiveCount: 3
       VisibilityTimeout: 120
 
-  <%- queueName %>HdrDsqDLQ:
+  <%- queueName %>HdrSqsDLQ:
     Type: AWS::SQS::Queue
     Properties:
-      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrDsqDLQ
+      QueueName: ${self:custom.iz_resourcePrefix}<%- queueName %>HdrSqsDLQ
 
-  <%- queueName %>HdrDsqPolicy:
+  <%- queueName %>HdrSqsPolicy:
     Type: AWS::SQS::QueuePolicy
     Properties:
       PolicyDocument:
@@ -27,11 +27,11 @@
             Principal: "*"
             Resource: #!GetAtt
               Fn::GetAtt:
-                - <%- queueName %>HdrDsq
+                - <%- queueName %>HdrSqs
                 - Arn
             Action: "SQS:SendMessage"
       Queues:
-        - Ref: <%- queueName %>HdrDsq
+        - Ref: <%- queueName %>HdrSqs
   #<#<%- firstLetterUpperCase(queueName) %>QueueSetting#>
   #<#/<%- firstLetterUpperCase(queueName) %>QueueSetting#>
 

package/src/generateCode/generateFlowStepWithPlugIn/index.js

@@ -129,7 +129,7 @@ async function generatePlunIg(
             upperCase(flowSchema.flowTag) +
             upperCase(flowStepName) +
             upperCase(data.handlerType)),
-          queueName: upperCase(flowSchema.flowTag) + upperCase(flowStepName),
+          queueName: upperCase(flowSchema.flowTag) + upperCase(flowStepName) + upperCase(data.handlerType),
         });
 
 
@@ -137,10 +137,6 @@ async function generatePlunIg(
         if (flowStepConfig.plugInHooks?.length) {
           for (let i = 0; i < flowStepConfig.plugInHooks.length; i++) {
             if (i === 0) {
-              if (flowStepConfig.hasOwnProperty("settings")) {
-                data["handleLogic"] = flowStepConfig.settings.handleLogic;
-                data["childFlow"] = flowStepConfig.settings.flowType;
-              };
               const firstResults = await buildFirstPluginHookResources(
                 _izContext,
                 data,
@@ -159,14 +155,10 @@ async function generatePlunIg(
             allCreateSourceParams.push(...afterResults);
           }
         } else {
-          if (flowStepConfig.hasOwnProperty("settings")) {
-            data["handleLogic"] = flowStepConfig.settings.handleLogic;
-            data["childFlow"] = flowStepConfig.settings.flowType;
-          };
-
           const noHookResults = await buildNoPluginHookResources(
             _izContext,
             data,
+            flowStepConfig,
             appPath
           );
           allCreateSourceParams.push(...noHookResults);
@@ -224,10 +216,9 @@ async function generatePlunIg(
 export default generatePlunIg;
 
 
-async function buildNoPluginHookResources(_izContext, data, appPath) {
+async function buildNoPluginHookResources(_izContext, data, flowStepConfig, appPath) {
   const results = [];
 
-
   const yamlRes = await yamlFlowStep(
     _izContext,
     data,
@@ -253,7 +244,13 @@ async function buildNoPluginHookResources(_izContext, data, appPath) {
 
   const mainRes = await mainFunctionFlowStep(
     _izContext,
-    { ...data, havePlugIn: false }, appPath);
+    {
+      ...data,
+      havePlugIn: false,
+      handleLogic: flowStepConfig.settings?.handleLogic || 'none'
+    },
+    appPath
+  );
 
   results.push(mainRes,
     // snsOutRes,
@@ -322,6 +319,7 @@ async function buildFirstPluginHookResources(_izContext, data, flowStepConfig, a
         havePlugIn: true,
         invokeType: targetPlugIn.invocationType,
         targetUrl,
+        handleLogic: flowStepConfig.settings?.handleLogic || 'none'
       };
     }
   }

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

@@ -256,6 +256,7 @@ export default async function createObjectComplete(
 
           await Promise.all(
             recordAwaitingStep.listOfRecords.map(async (listOfRecords) => {
+              if (status ===  'complete') {
               Object.entries(listOfRecords).map(async ([tableName, record]) => {
                 await dynamodbSharedLib.putItem(
                   _izContext,
@@ -269,6 +270,7 @@ export default async function createObjectComplete(
                   }
                 );
               })
+            }
             }))
 
           const messageObject = buildMessageObject(

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

@@ -138,8 +138,6 @@ export async function createMainLogical(
 
         // ── DynamoDB ──────────────────────────────────────────────────────────
         if (createDataDetail.storageType === consts.STORAGE_TYPES.dynamoDB) {
-          //(<beforeCreateRecordDynamo>)
-          //(</beforeCreateRecordDynamo>)
           _izContext.logger.debug('::::::DynamoDB::::::', { storageTag, objInstanceFull });
 
           if (parentObject && createDataDetail.tableName.includes(firstLetterUpperCase(`${parentObject.objectType}Records`))) {
@@ -152,25 +150,45 @@ export async function createMainLogical(
           _izContext.logger.debug('objInstanceFull before create item in dynamoDB', objInstanceFullForDynamoDb);
 
           const identifiersForCreateData = await dynamoDbIdentifiersByStorageResource(
-            _izContext, objectSchema, createDataDetails, objInstanceFullForDynamoDb.identifiers
+            _izContext,
+            objectSchema,
+            createDataDetails,
+            objInstanceFullForDynamoDb.identifiers
           );
           _izContext.logger.debug('identifiersForCreateData', identifiersForCreateData);
 
-          // await dynamodbSharedLib.putItem(
-          //  _izContext,
-          //  await dynamodbSharedLib.tableName(_izContext, createDataDetail.tableName, createDataDetail.serviceTag),
-          //  { ...identifiersForCreateData, ...objInstanceFullForDynamoDb.fields }
-          // );
+          //(<beforeCreateRecordDynamo>)
+          //(</beforeCreateRecordDynamo>)
 
-          listOfRecords.push({
-            [createDataDetail.tableName]: {
-              serviceTag: createDataDetail.serviceTag,
-              objInstanceFull: {
-                identifiers: identifiersForCreateData,
-                fields: objInstanceFullForDynamoDb.fields
+          if (Object.values(createDataDetails).some(
+            createDataDetail => createDataDetail.storageType === consts.STORAGE_TYPES.graph)) {
+            _izContext.logger.debug('must process graph first');
+            listOfRecords.push({
+              [createDataDetail.tableName]: {
+                serviceTag: createDataDetail.serviceTag,
+                objInstanceFull: {
+                  identifiers: identifiersForCreateData,
+                  fields: objInstanceFullForDynamoDb.fields
+                }
               }
-            }
-          })
+            })
+          } else {
+            _izContext.logger.debug('can process record dynamo')
+            await dynamodbSharedLib.putItem(
+              _izContext,
+              dynamodbSharedLib.tableName(_izContext,
+                createDataDetail.tableName,
+                createDataDetail.serviceTag
+              ),
+              {
+                ...identifiersForCreateData,
+                ...objInstanceFullForDynamoDb.fields
+              }
+            );
+
+            objInstanceFullForDynamoDb.fields = {}
+          }
+
           //(<afterCreateRecordDynamo>)
           //(</afterCreateRecordDynamo>)
 
@@ -338,10 +356,17 @@ export async function createMainLogical(
 
     // ── DynamoDB-only complete path ───────────────────────────────────────────
     if (allAwaitingStepsId.length === 0 && listOfObjectForCreates.length === 0) {
-      const outMessage = callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(
-        callingFlowConfig,
-        { objType, objInstanceFull: { identifiers: objInstanceFullForDynamoDb.identifiers, fields: objInstanceFullForDynamoDb.fields } }
-      );
+      const outMessage =
+        callingFlowSharedLib.addPassBackPropertiesToSnsResponseMessageObject(
+          callingFlowConfig,
+          {
+            objType: objType,
+            objInstanceFull: {
+              identifiers: objInstanceFullForDynamoDb.identifiers,
+              fields: objInstanceFullForDynamoDb.fields
+            }
+          }
+        );
 
       if (callingFlowConfig[callingFlowSharedLib.consts.CALLINGFLOW_PROPERTYNAME]) {
         _izContext.logger.debug('HAVE CallingFlow');
@@ -358,7 +383,10 @@ export async function createMainLogical(
 
     return {
       objType,
-      objInstanceFull: objInstanceFullForDynamoDb,
+      objInstanceFull: {
+        identifiers: objInstanceFullForDynamoDb.identifiers,
+        fields: objInstanceFullForDynamoDb.fields
+      },
       relationships: requestParams.relationships || [],
       status: 'complete',
       errorsFound

package/src/libs/Libs.js

@@ -120,32 +120,29 @@ function externalResourceName(resourceClass, resourceName, serviceTag) {
 }
 
 function externalResourceYaml(resourceClass, resourceName, serviceTag) {
-  // 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 ?
-        '${self:custom.iz_resourcePrefix}' : serviceTag + '${self:custom.iz_stage}' +
-        `${resourceName}`,
-    // `${serviceTag}` +
-    // `${resourceName}`,
+        '${self:custom.iz_resourcePrefix}' + resourceName :
+        serviceTag + '${self:custom.iz_stage}' + resourceName,
+    // `${ serviceTag } ` +
+    // `${ resourceName } `,
     [RESOURCE_CLASSES.lambda]:
-      'arn:aws:lambda:${self:custom.iz_region}:${self:custom.iz_accountId}:function:' +
+      'arn:aws:lambda:${self: custom.iz_region}:${self:custom.iz_accountId}:function:' +
         serviceTag ?
-        '${self:custom.iz_resourcePrefix}' : serviceTag + '${self:custom.iz_stage}' +
-        `${resourceName}`,
+        '${self:custom.iz_resourcePrefix}' + resourceName :
+        serviceTag + '${self:custom.iz_stage}' + resourceName,
     [RESOURCE_CLASSES.sns]:
       'arn:aws:sns:${self:custom.iz_region}:${self:custom.iz_accountId}:' +
-      `${serviceTag}` + '_${self:custom.iz_stage}_' + `${resourceName}`,
+        serviceTag ? '${self:custom.iz_serviceTag}_${self:custom.iz_stage}_' + resourceName :
+        serviceTag + '_${self:custom.iz_stage}_' + resourceName,
     [RESOURCE_CLASSES.sqs]:
       'arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:' +
         serviceTag ?
-        '${self:custom.iz_resourcePrefix}' : serviceTag + '${self:custom.iz_stage}' +
-        `${resourceName}`,
+        '${self:custom.iz_resourcePrefix}' + resourceName :
+        serviceTag + '${self:custom.iz_stage}' + resourceName,
   }[resourceClass];
 }