From b5dd705f70d7dbbd544f1956cb5042b0d1937022 Mon Sep 17 00:00:00 2001
From: Sebastian Moser <sewi.moser@gmail.com>
Date: Wed, 25 Jan 2023 12:27:34 +0100
Subject: [PATCH] itemstore.update() now completely deletes the item. before
 adding a key, that already existed some time, would not work, also
 handle_mize_message() returns after one if-statement triggers

---
 js-client               | 2 +-
 src/server/itemstore.rs | 5 ++++-
 src/server/proto.rs     | 8 ++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/js-client b/js-client
index 3287d3b..37f117e 160000
--- a/js-client
+++ b/js-client
@@ -1 +1 @@
-Subproject commit 3287d3badecdb838b4cb10fddca9d5ad0ad81d4b
+Subproject commit 37f117e8e0aebb37fdf95534565f1f03558aa563
diff --git a/src/server/itemstore.rs b/src/server/itemstore.rs
index c3e4122..4f433a0 100644
--- a/src/server/itemstore.rs
+++ b/src/server/itemstore.rs
@@ -124,7 +124,10 @@ impl Itemstore {
                 if let Some(key_index) = old_keys.iter().position(|x| *x == key.clone()){
                     old_keys.remove(key_index);
                 }
-                tr.del(key).await?;
+                let mut store_key = update.id.clone().into_bytes();
+                store_key.push(':' as u8);
+                store_key.extend(key);
+                tr.del(store_key).await?;
             } else {
                 tr.set(store_key.clone(), new_val).await?;
             }
diff --git a/src/server/proto.rs b/src/server/proto.rs
index 41bcbb8..4947afe 100644
--- a/src/server/proto.rs
+++ b/src/server/proto.rs
@@ -611,6 +611,7 @@ pub async fn handle_mize_message(
 
         let msg = Message::from_bytes(answer, message.origin.clone());
         message.origin.send(msg).await;
+        return Ok(());
     };
 
 
@@ -669,7 +670,6 @@ pub async fn handle_mize_message(
 
 
         return Ok(());
-
     };
 
 
@@ -685,6 +685,7 @@ pub async fn handle_mize_message(
         for origin in subbed_origins {
             message.clone().send(origin).await;
         }
+        return Ok(());
     };
 
 
@@ -721,6 +722,7 @@ pub async fn handle_mize_message(
             };
             return Err(err);
         }
+        return Ok(());
     }
 
 
@@ -786,11 +788,13 @@ pub async fn handle_mize_message(
         let mut created_id_message = vec![VERSION, MSG_CREATED_ID];
         created_id_message.extend(new_id.to_be_bytes());
         message.origin.send(Message::from_bytes(created_id_message, message.origin.clone())).await;
+        
+        return Ok(());
     }
 
     //###########################################################//
     //for every other message
-    println!("Got a Message That did not Trigger any if Statement....");
+    println!("Got a Message That did not Trigger any if Statement....: {:?}", message.raw);
     return Ok(());
 }