chore: small refactor to cover what happens after the member merge

Signed-off-by: Uroš Marolt <uros@marolt.me>

Author: themarolt

services/apps/cron_service/src/jobs/integrationResultsReporting.job.ts

@@ -63,9 +63,9 @@ const job: IJobDefinition = {
     ).count
 
     // Break down errors by errorMessage + location, enriched with platform info.
-    // When a mergeError is present in metadata, prefer its errorMessage for grouping
-    // so merge crashes surface as distinct groups rather than collapsing into the
-    // generic outer errorMessage.
+    // Prefer metadata.errorMessage when set — the data sink worker writes specific
+    // values there (e.g. "noMerge blocked", "merge failed") so those surface as
+    // distinct groups rather than collapsing into the generic outer errorMessage.
     const errorGroups = await dbConnection.any<IErrorGroup>(
       `
       SELECT

services/apps/data_sink_worker/src/service/activity.service.ts

@@ -1346,8 +1346,11 @@ export default class ActivityService extends LoggerBase {
                 orgPromiseCache,
                 payload.activity.timestamp,
               )
-              .then(() => {
-                payload.memberId = payload.dbMember.id
+              .then((redirectId?: string) => {
+                payload.memberId = redirectId ?? payload.dbMember.id
+                if (redirectId) {
+                  memberMap.set(key, redirectId)
+                }
               })
               .catch(async (err) => {
                 const result = await this.handleMemberIdentityError(
@@ -1405,8 +1408,11 @@ export default class ActivityService extends LoggerBase {
                 orgPromiseCache,
                 payload.activity.timestamp,
               )
-              .then(() => {
-                payload.objectMemberId = payload.dbObjectMember.id
+              .then((redirectId?: string) => {
+                payload.objectMemberId = redirectId ?? payload.dbObjectMember.id
+                if (redirectId) {
+                  memberMap.set(key, redirectId)
+                }
               })
               .catch(async (err) => {
                 const result = await this.handleMemberIdentityError(