editoast: fix ModelV2 remote attribute

Author: leovalais

editoast/editoast_derive/src/lib.rs

@@ -263,7 +263,7 @@ pub fn search_config_store(input: proc_macro::TokenStream) -> proc_macro::TokenS
 /// * `#[model(primary)]`: implies `identifier` ; marks the field as the primary key of the table
 /// * `#[model(json)]`: wraps the row field with `diesel_jsonb::JsonValue` (diesel column type: `diesel_jsonb::Json<T>`)
 /// * `#[model(to_string)]`: calls `to_string()` before writing the field to the database and calls `String::from` after reading (diesel column type: String)
-/// * `#[model(remote = T)]`: calls `Into::<T>::into` before writing the field to the database and calls `T::from` after reading (diesel column type: T)
+/// * `#[model(remote = "T")]`: calls `Into::<T>::into` before writing the field to the database and calls `T::from` after reading (diesel column type: T)
 /// * `#[model(geo)]` **TODO**: TBD
 ///
 /// #### A note on identifiers

editoast/editoast_derive/src/modelv2.rs

@@ -148,7 +148,7 @@ struct ModelFieldOption {
     #[darling(default)]
     to_string: bool,
     #[darling(default)]
-    remote: Option<syn::Path>,
+    remote: Option<syn::Type>,
 }
 
 #[derive(Debug, PartialEq)]
@@ -178,15 +178,15 @@ struct ModelField {
 
 #[derive(Debug, PartialEq, Clone)]
 enum FieldTransformation {
-    Remote(syn::Path),
+    Remote(syn::Type),
     Json,
     Geo,
     ToString,
 }
 
 impl FieldTransformation {
     fn from_args(
-        remote: Option<syn::Path>,
+        remote: Option<syn::Type>,
         json: bool,
         geo: bool,
         to_string: bool,
@@ -230,10 +230,7 @@ impl ModelField {
     #[allow(clippy::wrong_self_convention)]
     fn into_transformed(&self, expr: TokenStream) -> TokenStream {
         match self.transform {
-            Some(FieldTransformation::Remote(_)) => {
-                let ty = &self.ty;
-                quote! {  Into::<#ty>::into(#expr) }
-            }
+            Some(FieldTransformation::Remote(_)) => quote! { #expr.into() },
             Some(FieldTransformation::Json) => quote! { diesel_json::Json(#expr) },
             Some(FieldTransformation::Geo) => unimplemented!("to be designed"),
             Some(FieldTransformation::ToString) => quote! { #expr.to_string() },
@@ -244,7 +241,7 @@ impl ModelField {
     #[allow(clippy::wrong_self_convention)]
     fn from_transformed(&self, expr: TokenStream) -> TokenStream {
         match self.transform {
-            Some(FieldTransformation::Remote(ref ty)) => quote! { #ty::from(#expr) },
+            Some(FieldTransformation::Remote(_)) => quote! { #expr.into() },
             Some(FieldTransformation::Json) => quote! { #expr.0 },
             Some(FieldTransformation::Geo) => unimplemented!("to be designed"),
             Some(FieldTransformation::ToString) => quote! { String::from(#expr.parse()) },

editoast/src/modelsv2/mod.rs

@@ -886,21 +886,21 @@ where
 #[cfg(test)]
 mod tests {
     use crate::fixtures::tests::{db_pool, TestFixture};
+    use crate::modelsv2::*;
     use editoast_derive::ModelV2;
     use itertools::Itertools;
     use std::collections::HashSet;
 
     #[derive(Debug, Default, Clone, ModelV2)]
     #[model(table = crate::tables::document)]
-    pub struct Document {
-        pub id: i64,
-        pub content_type: String,
-        pub data: Vec<u8>,
+    struct Document {
+        id: i64,
+        content_type: String,
+        data: Vec<u8>,
     }
 
     #[rstest::rstest]
     async fn test_batch() {
-        use crate::modelsv2::*;
         let pool = db_pool();
         let mut conn = pool.get().await.unwrap();
         let changesets = (0..5).map(|i| {
@@ -971,4 +971,79 @@ mod tests {
                 .unwrap()
         );
     }
+
+    #[rstest::rstest]
+    async fn test_remote() {
+        #[derive(Debug, Clone, PartialEq)]
+        enum Data {
+            Prefixed(u8),
+            Raw(u8, u8),
+        }
+
+        impl From<Vec<u8>> for Data {
+            fn from(v: Vec<u8>) -> Self {
+                match v.as_slice() {
+                    [0x42, x] => Data::Prefixed(*x),
+                    [x, y] => Data::Raw(*x, *y),
+                    _ => panic!("invalid 2-bytes data"),
+                }
+            }
+        }
+
+        impl From<Data> for Vec<u8> {
+            fn from(d: Data) -> Self {
+                match d {
+                    Data::Prefixed(x) => vec![0x42, x],
+                    Data::Raw(x, y) => vec![x, y],
+                }
+            }
+        }
+
+        #[derive(Clone, ModelV2)]
+        #[model(table = crate::tables::document)]
+        struct Document {
+            id: i64,
+            content_type: String,
+            #[model(remote = "Vec<u8>")]
+            data: Data,
+        }
+
+        let pool = db_pool();
+        let mut conn = pool.get().await.unwrap();
+        let docs = Document::create_batch::<_, Vec<_>>(
+            &mut conn,
+            [
+                Document::changeset()
+                    .content_type(String::from("text/plain"))
+                    .data(Data::Prefixed(0x43)),
+                Document::changeset()
+                    .content_type(String::from("text/plain"))
+                    .data(Data::Raw(0, 1)),
+            ],
+        )
+        .await
+        .unwrap()
+        .into_iter()
+        .map(|d| TestFixture::new(d, pool.clone()))
+        .collect::<Vec<_>>();
+        assert_eq!(docs.len(), 2);
+
+        let ids = docs.iter().map(|d| d.model.id).collect::<Vec<_>>();
+        assert_eq!(
+            Document::retrieve(&mut conn, ids[0])
+                .await
+                .unwrap()
+                .unwrap()
+                .data,
+            Data::Prefixed(0x43)
+        );
+        assert_eq!(
+            Document::retrieve(&mut conn, ids[1])
+                .await
+                .unwrap()
+                .unwrap()
+                .data,
+            Data::Raw(0, 1)
+        );
+    }
 }