Fix deserialisation too

nymtech · Sep 12, 2024 · 367137a · 367137a
1 parent d1f4446
commit 367137a
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/common/gateway-storage/src/clients.rs b/common/gateway-storage/src/clients.rs
@@ -1,19 +1,28 @@
 // Copyright 2024 - Nym Technologies SA <contact@nymtech.net>
 // SPDX-License-Identifier: GPL-3.0-only
 
+use sqlx::{error::BoxDynError, sqlite::SqliteValueRef, Decode, Sqlite};
 use std::str::FromStr;
 
 use crate::models::Client;
 
-#[derive(Debug, PartialEq, sqlx::Type)]
-#[sqlx(type_name = "TEXT")] // SQLite TEXT type
+#[derive(Debug, PartialEq)]
 pub enum ClientType {
     EntryMixnet,
     ExitMixnet,
     EntryWireguard,
     ExitWireguard,
 }
 
+impl<'r> Decode<'r, Sqlite> for ClientType {
+    fn decode(value: SqliteValueRef<'r>) -> Result<Self, BoxDynError> {
+        let text: &str = <&str as Decode<Sqlite>>::decode(value)?;
+        Ok(text
+            .parse::<ClientType>()
+            .map_err(|_| sqlx::Error::Decode(format!("Invalid client type: {}", text).into()))?)
+    }
+}
+
 impl FromStr for ClientType {
     type Err = &'static str;