@izara_project/izara-core-generate-service-code 1.0.84 → 1.0.86

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

@@ -33,34 +33,27 @@ const { postToConnection } = webSocket;
 //(</optionalRequire>)
 
 /**
- *
- *
- * description of function.
+ * WebSocket handler entry for <%- upperCaseFlowTag %> Flow
  * @param {Object} _izContext
- * @param {CorrelationIds} _izContext.correlationIds - property of _izContext
- * @param {Logger} _izContext.logger - property of _izContext
- * @param {Object} requestParams - request params
- * @param {Object} requestParams.identifiers - identifiers for get data
- * @param {Object} requestParams.additionalRequest - additionalRequest
- *
- * @returns {object} description of return value
+ * @param {CorrelationIds} _izContext.correlationIds - Context correlation IDs
+ * @param {Logger} _izContext.logger - Context logger
+ * @param {Object} requestParams - Request parameters
+ * @param {Object} callingFlowConfig - Calling flow configuration
+ * @returns {Promise<void>}
  */
 export default async function <%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>(
   _izContext,
   requestParams,
-  //(<additionalParams>)
-  //(</additionalParams>)
-  callingFlowConfig = {}
+  callingFlowConfig
 ) {
   try {
-    _izContext.logger.debug('<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %> _izContext', _izContext);
-    _izContext.logger.debug('<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %> requestParams', requestParams);
     _izContext.logger.debug(
-      '<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %> callingFlowConfig',
+      `[${process.env.iz_serviceTag}:<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>Wbs] started`,
+      requestParams,
       callingFlowConfig
     );
 
-    let flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(
+    const flowSchema = await getObjectSchema.getFlowSchemaS3WithCache(
       _izContext,
       {
         flowTag: '<%- flowTag %>',
@@ -70,6 +63,23 @@ export default async function <%- typeof functionName !== 'undefined' ? function
 
     _izContext.logger.debug('flowSchema', flowSchema);
 
+    const connectionId = _izContext.correlationIds?.get(coreConsts.CONNECTION_ID);
+
+    if (!flowSchema) {
+      if (connectionId) {
+        await postToConnection(
+          _izContext,
+          {
+            message: {
+              error: `flowTag not found ${requestParams.action}`
+            }
+          },
+          connectionId
+        );
+      }
+      throw new NoRetryError(`flowTag not found ${requestParams.action}`);
+    }
+
     if (
       flowSchema.initiateBy === 'user' ||
       flowSchema.initiateBy === 'systemWithUser'
@@ -77,24 +87,9 @@ export default async function <%- typeof functionName !== 'undefined' ? function
       _izContext.correlationIds.set(coreConsts.USER_AGENT, 'webSocket');
     }
 
-    let connectionId = _izContext.correlationIds.get(coreConsts.CONNECTION_ID);
-
-    if (!flowSchema) {
-      await postToConnection(
-        _izContext,
-        {
-          message: {
-            error: `flowTag not found ${requestParams.action}`
-          }
-        },
-        connectionId
-      );
-      throw new NoRetryError(`flowTag not found ${requestParams.action}`);
-    }
-
     let messageObject = requestParams;
 
-    // create callingFlow
+    // Attach calling flow configuration pointing to WebSocketCompleteHdrSqs
     messageObject =
       callingFlowSharedLib.addCallingFlowToSnsRequestMessageObject(
         messageObject,
@@ -110,17 +105,18 @@ export default async function <%- typeof functionName !== 'undefined' ? function
         )
       );
 
-    let sendMessageToEndpoint = {
+    const sendMessageToEndpoint = {
       Message: JSON.stringify(messageObject),
       TopicArn: snsSharedLib.snsTopicArnByFlowSchema(
         _izContext,
         '<%- upperCaseFlowTag %>_In'
       )
     };
+
     _izContext.logger.debug('sendMessageToEndpoint', sendMessageToEndpoint);
     await sns.publishAsync(_izContext, sendMessageToEndpoint);
   } catch (err) {
-    _izContext.logger.error(`[${process.env.iz_serviceTag}:<%- typeof functionName !== undefined ? functionName : upperCaseFlowTag %>Wbs] error:`, err);
+    _izContext.logger.error(`[${process.env.iz_serviceTag}:<%- typeof functionName !== 'undefined' ? functionName : upperCaseFlowTag %>Wbs] error:`, err);
     throw err;
   }
 }

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

@@ -99,6 +99,7 @@ export default async function <%- flowTag %>(
         _izContext.correlationIds?.get(coreConsts.SUBMITTED_BY_USER_ID);
 
       targetIdentifiers = requestParams.targetIdentifiers;
+      delete requestParams.targetIdentifiers;
 
       if (!targetIdentifiers && objectSchema.belongTo?.objectType === 'user' && submittedByUserId) {
         targetIdentifiers = { submittedByUserId };
@@ -113,12 +114,11 @@ export default async function <%- flowTag %>(
         if (!targetIdentifiers.submittedByUserId && submittedByUserId) {
           targetIdentifiers.submittedByUserId = submittedByUserId;
         }
-        requestParams.targetIdentifiers = targetIdentifiers;
       }
 
       _izContext.logger.debug(`[${process.env.iz_serviceTag}:<%- flowTag %>] Identity & Target Context Resolved:`,  {
         submittedByUserId: requestParams.submittedByUserId,
-        targetIdentifiers: requestParams.targetIdentifiers,
+        targetIdentifiers,
         belongTo: objectSchema.belongTo,
         generatedBy: objectSchema.generatedBy
       });
@@ -129,7 +129,38 @@ export default async function <%- flowTag %>(
     }
 
     // ── Build identifiers used by asynchronous processing ────────────────────
-    const identifiers = requestParams.objInstanceFull.identifiers;
+    const identifiers = requestParams.objInstanceFull?.identifiers;
+
+    if (!objectSchema.hasOwnProperty('belongTo')) {
+      if (!targetIdentifiers && identifiers) {
+        targetIdentifiers = { ...identifiers };
+      } else if (targetIdentifiers && identifiers) {
+        for (const [key, value] of Object.entries(identifiers)) {
+          if (targetIdentifiers[key] === undefined && value !== undefined) {
+            targetIdentifiers[key] = value;
+          }
+        }
+      }
+      if (targetIdentifiers) {
+        if (!targetIdentifiers.submittedByUserId && submittedByUserId) {
+          targetIdentifiers.submittedByUserId = submittedByUserId;
+        }
+      }
+    }
+
+    if (targetIdentifiers && identifiers) {
+      for (const [key, value] of Object.entries(identifiers)) {
+        if (
+          targetIdentifiers[key] !== undefined &&
+          value !== undefined &&
+          targetIdentifiers[key] !== value
+        ) {
+          errorsFound.push(
+            `targetIdentifiers.${key} must match objInstanceFull.identifiers.${key}`
+          );
+        }
+      }
+    }
 
     //(<validateBeforeUpdate>)
     //(</validateBeforeUpdate>)
@@ -182,6 +213,7 @@ export default async function <%- flowTag %>(
         },
         parameterGroups,
         {
+          targetIdentifiers,
           rbacObjType: {
             serviceTag: <%- rbacServiceTags.length === 1 ? rbacServiceTags[0] : `{ ${Object.entries(rbacServiceTagMap).map(([k, v]) => `'${k}': ${v}`).join(', ')} }[requestParams.objectType] || process.env.iz_serviceTag` %>
           },