From 0b0249f5449474775e1b99c8d3bde0b3bf8e6701 Mon Sep 17 00:00:00 2001
From: Paul <paulmakles@gmail.com>
Date: Sat, 11 Sep 2021 21:11:15 +0100
Subject: [PATCH] Fix migration again.

---
 src/database/migrations/scripts.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/database/migrations/scripts.rs b/src/database/migrations/scripts.rs
index c8d3a6b3..d8ef0b81 100644
--- a/src/database/migrations/scripts.rs
+++ b/src/database/migrations/scripts.rs
@@ -233,25 +233,25 @@ pub async fn run_migrations(revision: i32) -> i32 {
             .unwrap();
         
         while let Some(doc) = cursor.next().await {
-            if let Ok(mut account) = doc {
-                if let Some(sessions) = account.remove("sessions") {
+            if let Ok(account) = doc {
+                let id = account.get_str("_id").unwrap();
+                if let Some(sessions) = account.get("sessions") {
                     #[derive(Deserialize)]
                     struct Session {
                         id: String,
                         token: String,
-                        user_id: String,
                         friendly_name: String,
                         subscription: Option<Document>,
                     }
 
-                    let sessions = from_bson::<Vec<Session>>(sessions).unwrap();
+                    let sessions = from_bson::<Vec<Session>>(sessions.clone()).unwrap();
                     for session in sessions {
                         info!("Converting session {} to new format.", &session.id);
 
                         let mut doc = doc! {
                             "_id": session.id,
                             "token": session.token,
-                            "user_id": session.user_id,
+                            "user_id": id.clone(),
                             "name": session.friendly_name,
                         };