From ed3a09dbac40be009e21346e5bc5ba2a4d4ed1a7 Mon Sep 17 00:00:00 2001 From: Kiran Jonnalagadda Date: Thu, 9 Feb 2017 12:53:50 +0530 Subject: [PATCH] Save UUID of merged user --- lastuser_core/models/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lastuser_core/models/__init__.py b/lastuser_core/models/__init__.py index b72c165..da77a6a 100644 --- a/lastuser_core/models/__init__.py +++ b/lastuser_core/models/__init__.py @@ -58,7 +58,7 @@ def merge_users(user1, user2): for row in model.query.filter_by(user_id=merge_user.id).all(): row.user_id = keep_user.id # 2. Add merge_user's userid to olduserids. Commit session. - db.session.add(UserOldId(user=keep_user, userid=merge_user.userid)) + db.session.add(UserOldId(user=keep_user, userid=merge_user.userid, uuid=merge_user.uuid)) # 3. Mark merge_user as merged. Commit session. merge_user.status = USER_STATUS.MERGED # 4. Release the username