[gh-NangoHQ#610] fully consolidate

khaliqgant · May 4, 2023 · 7068e4e · 7068e4e
1 parent a9f70f9
commit 7068e4e
Show file tree

Hide file tree

Showing 4 changed files with 233 additions and 269 deletions.
diff --git a/packages/server/lib/controllers/activity.controller.ts b/packages/server/lib/controllers/activity.controller.ts
@@ -47,12 +47,13 @@ class ActivityController {
                 sessions[log.sessionId] = i;
             }
 
-            if (log?.merge && sessions[log.sessionId as string]) {
+            if (log?.merge && typeof sessions[log.sessionId as string] !== 'undefined') {
                 const mergeIndex: number = updatedLogs.findIndex((updated) => {
                     return updated.sessionId === log.sessionId && !updated.merge;
                 });
                 updatedLogs[mergeIndex]!.messages = [...updatedLogs[mergeIndex]!.messages, ...log.messages];
                 updatedLogs[mergeIndex]!.end = log.end as number;
+                updatedLogs[mergeIndex]!.success = log.success;
             } else {
                 updatedLogs.push(log as LogData);
             }