editoast: change Model traits CreateBatch,WithKey to use editoast_models::Error

Signed-off-by: Leo Valais <[email protected]>

Author: leovalais

editoast/editoast_derive/src/model/codegen/create_batch_impl.rs

@@ -58,7 +58,7 @@ impl ToTokens for CreateBatchImpl {
                 >(
                     conn: &mut editoast_models::DbConnection,
                     values: I,
-                ) -> crate::error::Result<C> {
+                ) -> std::result::Result<C, editoast_models::model::Error> {
                     use crate::models::Model;
                     use #table_mod::dsl;
                     use std::ops::DerefMut;

editoast/editoast_derive/src/model/codegen/create_batch_with_key_impl.rs

@@ -69,7 +69,7 @@ impl ToTokens for CreateBatchWithKeyImpl {
                 >(
                     conn: &mut editoast_models::DbConnection,
                     values: I,
-                ) -> crate::error::Result<C> {
+                ) -> std::result::Result<C, editoast_models::model::Error> {
                     use crate::models::Identifiable;
                     use crate::models::Model;
                     use std::ops::DerefMut;

editoast/editoast_derive/src/snapshots/editoast_derive__model__tests__construction.snap

@@ -613,7 +613,10 @@ impl crate::models::CreateBatch<DocumentChangeset> for Document {
     async fn create_batch<
         I: std::iter::IntoIterator<Item = DocumentChangeset> + Send + 'async_trait,
         C: Default + std::iter::Extend<Self> + Send + std::fmt::Debug,
-    >(conn: &mut editoast_models::DbConnection, values: I) -> crate::error::Result<C> {
+    >(
+        conn: &mut editoast_models::DbConnection,
+        values: I,
+    ) -> std::result::Result<C, editoast_models::model::Error> {
         use crate::models::Model;
         use editoast_models::tables::osrd_infra_document::dsl;
         use std::ops::DerefMut;
@@ -654,7 +657,10 @@ impl crate::models::CreateBatchWithKey<DocumentChangeset, (String)> for Document
     async fn create_batch_with_key<
         I: std::iter::IntoIterator<Item = DocumentChangeset> + Send + 'async_trait,
         C: Default + std::iter::Extend<((String), Self)> + Send + std::fmt::Debug,
-    >(conn: &mut editoast_models::DbConnection, values: I) -> crate::error::Result<C> {
+    >(
+        conn: &mut editoast_models::DbConnection,
+        values: I,
+    ) -> std::result::Result<C, editoast_models::model::Error> {
         use crate::models::Identifiable;
         use crate::models::Model;
         use std::ops::DerefMut;
@@ -698,7 +704,10 @@ impl crate::models::CreateBatchWithKey<DocumentChangeset, (i64)> for Document {
     async fn create_batch_with_key<
         I: std::iter::IntoIterator<Item = DocumentChangeset> + Send + 'async_trait,
         C: Default + std::iter::Extend<((i64), Self)> + Send + std::fmt::Debug,
-    >(conn: &mut editoast_models::DbConnection, values: I) -> crate::error::Result<C> {
+    >(
+        conn: &mut editoast_models::DbConnection,
+        values: I,
+    ) -> std::result::Result<C, editoast_models::model::Error> {
         use crate::models::Identifiable;
         use crate::models::Model;
         use std::ops::DerefMut;

editoast/src/models/prelude/create.rs

@@ -1,10 +1,10 @@
 use std::fmt::Debug;
+use std::result::Result;
 
 use editoast_models::model;
 use editoast_models::DbConnection;
 
 use crate::error::EditoastError;
-use crate::error::Result;
 
 use super::Model;
 
@@ -57,7 +57,7 @@ where
     >(
         conn: &mut DbConnection,
         values: I,
-    ) -> Result<C>;
+    ) -> Result<C, model::Error>;
 }
 
 /// Describes how a [Model](super::Model) can be created in the database given a batch of its changesets
@@ -81,5 +81,5 @@ where
     >(
         conn: &mut DbConnection,
         values: I,
-    ) -> Result<C>;
+    ) -> Result<C, model::Error>;
 }