editoast: adapt valkey wrappers to ensure unicity of the CacheOperations stored in valkey

Signed-off-by: SarrahElm <[email protected]>

Author: SarrahElm

editoast/src/valkey_utils.rs

@@ -18,6 +18,7 @@ use deadpool_redis::redis::aio::ConnectionLike;
 use deadpool_redis::redis::cmd;
 use futures::FutureExt;
 use futures::future;
+use serde::Deserialize;
 use serde::Serialize;
 use serde::de::DeserializeOwned;
 use tracing::Level;
@@ -99,6 +100,19 @@ impl ConnectionLike for ValkeyConnection {
     }
 }
 
+#[derive(Clone, Serialize)]
+struct ZaddWrapper<'a, M: Serialize> {
+    member: &'a M,
+    nonce: u64,
+}
+
+#[derive(Clone, Deserialize)]
+struct ZrangebyscoreWrapper<M> {
+    member: M,
+    #[expect(dead_code)]
+    nonce: u64,
+}
+
 impl ValkeyConnection {
     /// Get a deserializable value from valkey
     #[tracing::instrument(name = "cache:json_get", skip(self), err)]
@@ -278,14 +292,15 @@ impl ValkeyConnection {
     pub async fn json_zadd<
         K: Debug + ToRedisArgs + Send + Sync,
         S: ToRedisArgs + Send + Sync,
-        M: Serialize,
+        M: Serialize + ToOwned,
     >(
         &mut self,
         key: K,
         member: &M,
         score: S,
     ) -> Result<()> {
-        let str_member = match serde_json::to_string(member) {
+        let member = ZaddWrapper{member, nonce: rand::random()};
+        let str_member = match serde_json::to_string(&member) {
             Ok(member) => member,
             Err(_) => {
                 return Err(RedisError::from((
@@ -317,8 +332,8 @@ impl ValkeyConnection {
         let deserialized_members =
             serialized_members
                 .into_iter()
-                .filter_map(|value| match serde_json::from_str(&value) {
-                    Ok(value) => Some(value),
+                .map(|value| match serde_json::from_str::<ZrangebyscoreWrapper<T>>(&value) {
+                    Ok(value) => Some(value.member),
                     Err(e) => {
                         tracing::warn!(
                             "the cached value is not a valid JSON for type '{}': {e}",