sentry - db - channel - insert_channel

Author: elpiel

sentry/src/db/channel.rs

@@ -45,3 +45,22 @@ pub async fn get_channel_by_id_and_validator(
         })
         .await
 }
+
+pub async fn insert_channel(pool: &DbPool, channel: &Channel) -> Result<bool, RunError<bb8_postgres::tokio_postgres::Error>> {
+    pool
+        .run(move |connection| {
+            async move {
+                match connection.prepare("INSERT INTO channels (id, creator, deposit_asset, deposit_amount, valid_until, spec) values ($1, $2, $3, $4, $5, $6)").await {
+                    Ok(stmt) => match connection.execute(&stmt, &[&channel.id, &channel.creator, &channel.deposit_asset, &channel.deposit_amount, &channel.valid_until, &channel.spec]).await {
+                        Ok(row) => {
+                            let inserted = row == 1;
+                            Ok((inserted, connection))
+                        },
+                        Err(e) => Err((e, connection)),
+                    },
+                    Err(e) => Err((e, connection)),
+                }
+            }
+        })
+        .await
+}

sentry/src/routes/channel.rs

@@ -1,5 +1,5 @@
 use self::channel_list::ChannelListQuery;
-use crate::db::get_channel_by_id;
+use crate::db::{get_channel_by_id, insert_channel};
 use crate::success_response;
 use crate::Application;
 use crate::ResponseError;
@@ -22,7 +22,6 @@ pub async fn channel_status<A: Adapter>(
         channel: &'a Channel,
     }
 
-    // get request params
     let channel = req
         .extensions()
         .get::<Channel>()
@@ -45,29 +44,18 @@ pub async fn create_channel<A: Adapter>(
         return Err(ResponseError::BadRequest(e.to_string()));
     }
 
-    let spec = serde_json::to_string(&channel.spec)?;
-    let result = app.pool
-        .run(move |connection| {
-            async move {
-                match connection.prepare("INSERT INTO channels (channel_id, creator, deposit_asset, deposit_amount, valid_until, spec) values ($1, $2, $3, $4, $5, $6)").await {
-                    Ok(stmt) => match connection.execute(&stmt, &[&channel.id, &channel.creator, &channel.deposit_asset, &channel.deposit_amount, &channel.valid_until, &spec]).await {
-                        Ok(row) => {
-                            Ok((row, connection))
-                        },
-                        Err(e) => Err((e, connection)),
-                    },
-                    Err(e) => Err((e, connection)),
-                }
-            }
-        })
-        .await;
-
-    if let Err(err) = result {
-        error!(&app.logger, "{}", &err; "module" => "create_channel");
-        return Err(ResponseError::BadRequest(
-            "err occured; please try again later".into(),
-        ));
-    }
+    match insert_channel(&app.pool, &channel).await {
+        Err(err) => {
+            error!(&app.logger, "{}", &err; "module" => "create_channel");
+            Err(ResponseError::BadRequest(
+                "err occurred; please try again later".into(),
+            ))
+        },
+        Ok(false) => Err(ResponseError::BadRequest(
+            "err occurred; please try again later".into(),
+        )),
+        _ => Ok(())
+    }?;
 
     let create_response = SuccessResponse { success: true };