editoast: change Model traits CreateBatch,WithKey to use editoast_mod…

…els::Error Signed-off-by: Leo Valais <[email protected]>
OpenRailAssociation · Dec 26, 2024 · f4c7501 · f4c7501
1 parent 4591a26
commit f4c7501
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/editoast/editoast_derive/src/model/codegen/create_batch_impl.rs b/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;

diff --git a/editoast/editoast_derive/src/model/codegen/create_batch_with_key_impl.rs b/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;

diff --git a/editoast/editoast_derive/src/snapshots/editoast_derive__model__tests__construction.snap b/editoast/editoast_derive/src/snapshots/editoast_derive__model__tests__construction.snap
@@ -612,7 +612,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;
@@ -653,7 +656,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;
@@ -697,7 +703,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;

diff --git a/editoast/src/models/prelude/create.rs b/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;
 
 /// Describes how a [Model](super::Model) can be created in the database
 ///
@@ -14,14 +14,14 @@ use crate::error::Result;
 pub trait Create<Row: Send>: Sized {
     /// Creates a new row in the database with the values of the changeset and
     /// returns the created model instance
-    async fn create(self, conn: &mut DbConnection) -> std::result::Result<Row, model::Error>;
+    async fn create(self, conn: &mut DbConnection) -> Result<Row, model::Error>;
 
     /// Just like [Create::create] but discards the error if any and returns `Err(fail())` instead
     async fn create_or_fail<E: From<model::Error>, F: FnOnce() -> E + Send>(
         self,
         conn: &'async_trait mut DbConnection,
         fail: F,
-    ) -> std::result::Result<Row, E> {
+    ) -> Result<Row, E> {
         match self.create(conn).await {
             Ok(obj) => Ok(obj),
             Err(_) => Err(fail()),
@@ -56,7 +56,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
@@ -80,5 +80,5 @@ where
     >(
         conn: &mut DbConnection,
         values: I,
-    ) -> Result<C>;
+    ) -> Result<C, model::Error>;
 }