@izara_project/izara-market-library-service-schemas 1.0.46 → 1.0.47

package/src/reStructure/TemplateData/relationshipPerAction/create/complete/mainFunction/template.ejs

@@ -56,16 +56,16 @@ module.exports.createRelationshipComplete = async (
     // start create awaitingStepId
     const linkTypeId = createLinkTypeId(
       _izContext,
-      returnValue.firstObject.objType,
-      returnValue.secondObject.objType,
-      returnValue.relType,
-      returnValue.relationshipDirection
+      returnValue.requestParams.firstObject.objType,
+      returnValue.requestParams.secondObject.objType,
+      returnValue.requestParams.relType,
+      returnValue.requestParams.relationshipDirection
     );
 
     let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
       hash({
         linkTypeId,
-        relationshipProperties: returnValue.relationshipProperties,
+        relationshipProperties: returnValue.requestParams.relationshipProperties,
         graphServiceTag: passBackProperties.passBackProperties.graphServiceTag
       }), // hash id
       PREFIX.createRel // prefix, use constant further
@@ -88,15 +88,16 @@ module.exports.createRelationshipComplete = async (
         if (await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
           _izContext,
           pendingStepId, // task waiting
-          awaitingStepId
+          awaitingStepId,
+          errorsFound
         )) {
           _izContext.logger.debug("finished all awaitingStep");
 
           let createCompleteMsg = {
-            firstObject: returnValue.firstObject,
-            secondObject: returnValue.secondObject,
-            relType: returnValue.relType,
-            relationshipProperties: returnValue.relationshipProperties,
+            firstObject: returnValue.requestParams.firstObject,
+            secondObject: returnValue.requestParams.secondObject,
+            relType: returnValue.requestParams.relType,
+            relationshipProperties: returnValue.requestParams.relationshipProperties,
             status: status,
             errorsFound: errorsFound
           };
@@ -115,15 +116,15 @@ module.exports.createRelationshipComplete = async (
           _izContext.logger.debug("Send message to OutCreateRelationshipComplete :::>", sendMessageToOutCreateRelationshipComplete);
           await sns.publishAsync(_izContext, sendMessageToOutCreateRelationshipComplete);
 
-
-          // remove awaitingMultipleStep after finished
-          await asyncFlowSharedLib.removeAwaitingMultipleStep(
-            _izContext,
-            awaitingStepId,
-            pendingStepId,
-          );
-
         } // check pendingStepId finished
+
+        // remove awaitingMultipleStep after finished
+        await asyncFlowSharedLib.removeAwaitingMultipleStep(
+          _izContext,
+          awaitingStepId,
+          pendingStepId,
+          errorsFound
+        );
       }) // end per pendingStep
     );
 

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/api/data.js

@@ -38,7 +38,7 @@ const {
   createDynamoDbComponentByLinks,
   DYNAMO_RESOURCE,
   SQS_RESOURCE
-} = require("../../../../../../../MainLibs/index.js").consts;
+} = require("../../../../../../../MainLibs/src/Consts.js");
 
 const templatePath = path.join(__dirname, "./template.ejs")
 
@@ -94,7 +94,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.deleteRelComplete) + "_Out"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
       ]

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/api/template.ejs

@@ -10,8 +10,8 @@
         #<#Authorizer#>
         #<#/Authorizer#>
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/dsq/data.js

@@ -92,7 +92,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.deleteRelComplete) + "_Out"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
       ]

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/dsq/template.ejs

@@ -7,8 +7,8 @@
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/inv/data.js

@@ -94,7 +94,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.deleteRelComplete) + "_Out"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
       ]

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/inv/template.ejs

@@ -3,8 +3,8 @@
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/sqs/data.js

@@ -91,7 +91,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.deleteRelComplete) + "_Out"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
       ]

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/functionYaml/sqs/template.ejs

@@ -7,8 +7,8 @@
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/handler/sqs/template.ejs

@@ -19,9 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const izara = require("@izara_project/izara-middleware");
 const middleware = izara.middlewareHandler;
 const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
-const {
-  validateSchemaMiddleware
-} = require('@izara_project/izara-market-library-service-schemas/src/GenerateCodeLibs/src/GenerateCodeLibs');
 const Logger = require('@izara_project/izara-core-library-logger');
 const recordHandlerSharedLib = require('@izara_project/izara-core-library-record-handler');
 

package/src/reStructure/TemplateData/relationshipPerAction/delete/action/mainFunction/template.ejs

@@ -185,28 +185,6 @@ module.exports.deleteRelationship = async (
       if (!targetStorageResources.length) {
         errorsFound.push(`Not found link from relationship schema`);
       }
-
-
-      // validate properties exists with schema
-      for (const propKey in relationshipProperties) {
-        if (!relationshipSchema.fieldNames.hasOwnProperty(propKey)) {
-          errorsFound.push(`property:${propKey} not exists in relationshipSchema`);
-        }
-      }
-
-      // validate canCreate properties relationship
-      for (const [propName, propSetting] of Object.entries(relationshipSchema.fieldNames)) {
-        if (propSetting.requiredOnCreate === true) {
-          if (!relationshipProperties.hasOwnProperty(propName)) {
-            errorsFound.push(`Missing requiredOnCreate property:${propKey}`);
-          }
-        }
-
-        if (!propSetting.optionalOnCreate && !propSetting.requiredOnCreate && relationshipProperties.hasOwnProperty(propName)) {
-          errorsFound.push(`property:${propName} cannot create`);
-        }
-      }
-
     } else {
       errorsFound.push(`relationshipSchema not exists`);
     }
@@ -329,9 +307,9 @@ module.exports.deleteRelationship = async (
               callingFlowSharedLib.addParentCallingFlowConfig(
                 callingFlowConfig, // receive parent callingFlowConfig.
                 callingFlowSharedLib.createCallingFlowConfig( // calling flow own service
-                //(<callingFlowProperties>)
+                  //(<callingFlowProperties>)
                   await lambdaSharedLib.lambdaFunctionName(_izContext, TOPIC_NAME_GENERATE_CODE.deleteRelComplete), {}
-                //(</callingFlowProperties>)
+                  //(</callingFlowProperties>)
                 )
               )
             );

package/src/reStructure/TemplateData/relationshipPerAction/delete/complete/functionYaml/template.ejs

@@ -6,7 +6,7 @@
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
         batchSize: 10
-        filterPatterns: #**** need to update serverless framwork upper v.2.69.1
+        filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role

package/src/reStructure/TemplateData/relationshipPerAction/delete/complete/handler/sqs/template.ejs

@@ -22,10 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const izara = require("@izara_project/izara-middleware");
 const middleware = izara.middlewareHandler;
-const izaraShared = require('@izara_project/izara-shared');
-const recordHandlerSharedLib = izaraShared.recordHandlerSharedLib
-const callingFlowSharedLib = izaraShared.callingFlowSharedLib;
-
+const callingFlowSharedLib = require('@izara_project/izara-core-library-calling-flow');
+const recordHandlerSharedLib = require('@izara_project/izara-core-library-record-handler');
 const deleteRelationshipComplete = require('./DeleteRelationshipComplete_Main');
 const Logger = require('@izara_project/izara-core-library-logger');
 // validate event properties in body.Message of sqs event
@@ -122,4 +120,4 @@ module.exports.main = middleware.wrap(async (event, context, callback) => {
     Logger.error('Unhandled Error, deleteRelationshipComplete: ', err);
     throw (err);
   }
-});
+});

package/src/reStructure/TemplateData/relationshipPerAction/delete/complete/mainFunction/template.ejs

@@ -57,16 +57,16 @@ module.exports.deleteRelationshipComplete = async (
     // start create awaitingStepId
     const linkTypeId = createLinkTypeId(
       _izContext,
-      returnValue.firstObject.objType,
-      returnValue.secondObject.objType,
-      returnValue.relType,
-      returnValue.relationshipDirection
+      returnValue.requestParams.firstObject.objType,
+      returnValue.requestParams.secondObject.objType,
+      returnValue.requestParams.relType,
+      returnValue.requestParams.relationshipDirection
     );
 
     let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
       hash({
         linkTypeId,
-        relationshipProperties: returnValue.relationshipProperties,
+        relationshipProperties: returnValue.requestParams.relationshipProperties,
         graphServiceTag: passBackProperties.passBackProperties.graphServiceTag
       }), // hash id
       PREFIX.deleteRel // prefix, use constant further
@@ -89,15 +89,16 @@ module.exports.deleteRelationshipComplete = async (
         if (await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
           _izContext,
           pendingStepId, // task waiting
-          awaitingStepId
+          awaitingStepId,
+          errorsFound
         )) {
           _izContext.logger.debug("finished all awaitingStep");
 
           let deleteRelComp = {
-            firstObject: returnValue.firstObject,
-            secondObject: returnValue.secondObject,
-            relType: returnValue.relType,
-            relationshipProperties: returnValue.relationshipProperties,
+            firstObject: returnValue.requestParams.firstObject,
+            secondObject: returnValue.requestParams.secondObject,
+            relType: returnValue.requestParams.relType,
+            relationshipProperties: returnValue.requestParams.relationshipProperties,
             status: status,
             errorsFound: errorsFound
           };
@@ -116,16 +117,16 @@ module.exports.deleteRelationshipComplete = async (
           _izContext.logger.debug("Send message to OutDeleteRelationshipComplete :::>", sendMessageToOutDeleteRelationshipComplete);
           await sns.publishAsync(_izContext, sendMessageToOutDeleteRelationshipComplete);
 
-
-          // remove awaitingMultipleStep after finished
-          await asyncFlowSharedLib.removeAwaitingMultipleStep(
-            _izContext,
-            awaitingStepId,
-            pendingStepId,
-          );
-
         } // check pendingStepId finished
-      }) // end per pendingStep
+
+        // remove awaitingMultipleStep after finished
+        await asyncFlowSharedLib.removeAwaitingMultipleStep(
+          _izContext,
+          awaitingStepId,
+          pendingStepId,
+          errorsFound
+        );
+       }) // end per pendingStep
     );
 
 

package/src/reStructure/TemplateData/relationshipPerAction/get/action/functionYaml/api/template.ejs

@@ -10,8 +10,8 @@
         #<#Authorizer#>
         #<#/Authorizer#>
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/get/action/functionYaml/dsq/data.js

@@ -92,7 +92,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.getRelComplete) + "_Out"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
       ]

package/src/reStructure/TemplateData/relationshipPerAction/get/action/functionYaml/dsq/template.ejs

@@ -7,8 +7,8 @@
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/get/action/functionYaml/inv/template.ejs

@@ -3,8 +3,8 @@
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/get/action/functionYaml/sqs/template.ejs

@@ -7,8 +7,8 @@
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/get/complete/functionYaml/template.ejs

@@ -6,7 +6,7 @@
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
         batchSize: 10
-        filterPatterns: #**** need to update serverless framwork upper v.2.69.1
+        filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role

package/src/reStructure/TemplateData/relationshipPerAction/get/complete/mainFunction/template.ejs

@@ -57,10 +57,10 @@ module.exports.getRelationshipComplete = async (
     // start create awaitingStepId
     const linkTypeId = createLinkTypeId(
       _izContext,
-      returnValue.firstObject.objType,
-      returnValue.secondObject.objType,
-      returnValue.relType,
-      returnValue.relationshipDirection
+      returnValue.requestParams.firstObject.objType,
+      returnValue.requestParams.secondObject.objType,
+      returnValue.requestParams.relType,
+      returnValue.requestParams.relationshipDirection
     );
 
     let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
@@ -69,7 +69,7 @@ module.exports.getRelationshipComplete = async (
         relationshipProperties: returnValue.relationshipProperties,
         graphServiceTag: passBackProperties.passBackProperties.graphServiceTag
       }), // hash id
-      PREFIX.createRel // prefix, use constant further
+      PREFIX.getRel // prefix, use constant further
     )
 
 
@@ -89,15 +89,16 @@ module.exports.getRelationshipComplete = async (
         if (await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
           _izContext,
           pendingStepId, // task waiting
-          awaitingStepId
+          awaitingStepId,
+          errorsFound
         )) {
           _izContext.logger.debug("finished all awaitingStep");
 
           let createCompleteMsg = {
-            firstObject: returnValue.firstObject,
-            secondObject: returnValue.secondObject,
-            relType: returnValue.relType,
-            relationshipProperties: returnValue.relationshipProperties,
+            firstObject: returnValue.requestParams.firstObject,
+            secondObject: returnValue.requestParams.secondObject,
+            relType: returnValue.requestParams.relType,
+            relationshipProperties: returnValue.requestParams.relationshipProperties,
             status: status,
             errorsFound: errorsFound
           };
@@ -116,15 +117,15 @@ module.exports.getRelationshipComplete = async (
           _izContext.logger.debug("Send message to outGetRelComplete :::>", sendMessageToOutGetRelComplete);
           await sns.publishAsync(_izContext, sendMessageToOutGetRelComplete);
 
-
-          // remove awaitingMultipleStep after finished
-          await asyncFlowSharedLib.removeAwaitingMultipleStep(
-            _izContext,
-            awaitingStepId,
-            pendingStepId,
-          );
-
         } // check pendingStepId finished
+
+        // remove awaitingMultipleStep after finished
+        await asyncFlowSharedLib.removeAwaitingMultipleStep(
+          _izContext,
+          awaitingStepId,
+          pendingStepId,
+          errorsFound
+        );
       }) // end per pendingStep
     );
 

package/src/reStructure/TemplateData/relationshipPerAction/update/action/functionYaml/api/template.ejs

@@ -10,8 +10,8 @@
         #<#Authorizer#>
         #<#/Authorizer#>
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/update/action/functionYaml/dsq/data.js

@@ -113,7 +113,7 @@ function createParamForCreateSource(allObjectRelationships, srcPath) {
         [RESOURCE_CLASSES.sns]: [SNS_RESOURCE.publish, SNS_RESOURCE.subscribe]
       },
       [
-        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.createRelComplete) + "_Out"),
+        resourceNames(RESOURCE_CLASSES.sns, upperCase(FUNCTION_NAME.updateRelComplete) + "_Out"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_In"),
         resourceNames(RESOURCE_CLASSES.sns, upperCase(functionName) + "_Out"),
       ]

package/src/reStructure/TemplateData/relationshipPerAction/update/action/functionYaml/dsq/template.ejs

@@ -7,8 +7,8 @@
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/update/action/functionYaml/inv/template.ejs

@@ -3,8 +3,8 @@
   handler: <%- join(resourceLocation, `${firstLetterUpperCase(functionName)}_${firstLetterUpperCase(handlerType)}.main`)%>
   name: ${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/update/action/functionYaml/sqs/template.ejs

@@ -7,8 +7,8 @@
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %><%- firstLetterUpperCase(handlerType) %>
         batchSize: 10
   role: <%- roleName %>Role
-    #<#<%- functionName %><%- handlerType %>IamRole#>
-    #<#/<%- functionName %><%- handlerType %>IamRole#>
+    #<#<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
+    #<#/<%- functionName %><%- firstLetterUpperCase(handlerType) %>IamRole#>
 <%_ function firstLetterUpperCase(text){
   return text.charAt(0).toUpperCase() + text.slice(1)
 } _%>

package/src/reStructure/TemplateData/relationshipPerAction/update/complete/functionYaml/template.ejs

@@ -6,7 +6,7 @@
     - sqs:
         arn: arn:aws:sqs:${self:custom.iz_region}:${self:custom.iz_accountId}:${self:custom.iz_resourcePrefix}<%- firstLetterUpperCase(functionName) %>
         batchSize: 10
-        filterPatterns: #**** need to update serverless framwork upper v.2.69.1
+        filterPatterns: #**** need to update serverless framework upper v.2.69.1
           - body: {"MessageAttributes":{"callingFlow":{"Value":["${self:custom.iz_resourcePrefix}<%-firstLetterUpperCase(functionName) %>"]}}} # functionName of callingFlow
           - body: {"MessageAttributes":{"callingFlow":{"Value":[{"exists":false}]}}}
   role: <%- roleName %>Role

package/src/reStructure/TemplateData/relationshipPerAction/update/complete/mainFunction/template.ejs

@@ -58,17 +58,17 @@ module.exports.updateRelationshipComplete = async (
     // start create awaitingStepId
     const linkTypeId = createLinkTypeId(
       _izContext,
-      returnValue.firstObject.objType,
-      returnValue.secondObject.objType,
-      returnValue.relType,
-      returnValue.relationshipDirection
+      returnValue.requestParams.firstObject.objType,
+      returnValue.requestParams.secondObject.objType,
+      returnValue.requestParams.relType,
+      returnValue.requestParams.relationshipDirection
     );
 
     let awaitingStepId = asyncFlowSharedLib.createAwaitingStepId(
       hash({
         linkTypeId,
-        relId: returnValue.relId,
-        relationshipProperties: returnValue.updatePropertiesParam,
+        relId: returnValue.requestParams.relId,
+        relationshipProperties: returnValue.requestParams.updatePropertiesParam,
         graphServiceTag: passBackProperties.passBackProperties.graphServiceTag
       }), // hash id
       PREFIX.updateRel // prefix, use constant further
@@ -91,13 +91,14 @@ module.exports.updateRelationshipComplete = async (
         if (await asyncFlowSharedLib.checkAllAwaitingStepsFinished(
           _izContext,
           pendingStepId, // task waiting
-          awaitingStepId
+          awaitingStepId,
+          errorsFound
         )) {
           _izContext.logger.debug("finished all awaitingStep");
 
           let updateCompleteMsg = {
-            relId: returnValue.relId,
-            relType: returnValue.relType,
+            relId: returnValue.requestParams.relId,
+            relType: returnValue.requestParams.relType,
             status: status,
             errorsFound: errorsFound
             //(<inUpdateCompleteMsg>)
@@ -118,15 +119,15 @@ module.exports.updateRelationshipComplete = async (
           _izContext.logger.debug("Send message to OutUpdateRelationshipComplete :::>", sendMessageToOutUpdateRelationshipComplete);
           await sns.publishAsync(_izContext, sendMessageToOutUpdateRelationshipComplete);
 
-
-          // remove awaitingMultipleStep after finished
-          await asyncFlowSharedLib.removeAwaitingMultipleStep(
-            _izContext,
-            awaitingStepId,
-            pendingStepId,
-          );
-
         } // check pendingStepId finished
+
+        // remove awaitingMultipleStep after finished
+        await asyncFlowSharedLib.removeAwaitingMultipleStep(
+          _izContext,
+          awaitingStepId,
+          pendingStepId,
+          errorsFound
+        );
       }) // end per pendingStep
     );