Merge branch 'newarchitecture' into mutation-manager-db-validation

kanwarujjaval · web-flow · commit 07e77dec4ea4 · 2025-12-23T18:07:27.000+05:30
diff --git a/api/jobs/userMerge.js b/api/jobs/userMerge.js
@@ -165,7 +165,7 @@ var handleMerges = function(db, callback) {
                         if (err0) {
                             log.e(err0);
                         }
-                        db.collection("metric_changes" + app_id).update({uid: olduid}, {'$set': {uid: usersApi.merged_to}}, {multi: true}, function(err7) {
+                        db.collection("metric_changes" + app_id).update({uid: olduid}, {'$set': {uid: user.merged_to}}, {multi: true}, function(err7) {
                             if (err7) {
                                 log.e("Failed metric changes update in app_users merge", err7);
                             }

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ var handleMerges = function(db, callback) {`
`165`	`165`	`if (err0) {`
`166`	`166`	`log.e(err0);`
`167`	`167`	`}`
`168`		`- db.collection("metric_changes" + app_id).update({uid: olduid}, {'$set': {uid: usersApi.merged_to}}, {multi: true}, function(err7) {`
	`168`	`+ db.collection("metric_changes" + app_id).update({uid: olduid}, {'$set': {uid: user.merged_to}}, {multi: true}, function(err7) {`
`169`	`169`	`if (err7) {`
`170`	`170`	`log.e("Failed metric changes update in app_users merge", err7);`
`171`	`171`	`}`