add migration on init of Sentry, fix all queries & impl ToSql for Rule

Author: elpiel

primitives/src/targeting/eval.rs

@@ -587,6 +587,26 @@ fn math_operator(lhs: Number, rhs: Number, ops: MathOperator) -> Result<Number,
     }
 }
 
+#[cfg(feature = "postgres")]
+pub mod postgres {
+    use bytes::BytesMut;
+    use postgres_types::{accepts, to_sql_checked, IsNull, Json, ToSql, Type};
+    use std::error::Error;
+    use super::*;
+
+    impl ToSql for Rule {
+        fn to_sql(
+            &self,
+            ty: &Type,
+            w: &mut BytesMut,
+        ) -> Result<IsNull, Box<dyn Error + Sync + Send>> {
+            Json(self).to_sql(ty, w)
+        }
+
+        accepts!(JSONB);
+        to_sql_checked!();
+    }
+}
 #[cfg(test)]
 mod test {
     use super::*;

sentry/src/db.rs

@@ -84,7 +84,10 @@ pub async fn setup_migrations(environment: &str) {
         };
     }
 
-    let mut migrations = vec![make_migration!("20190806011140_initial-tables")];
+    let mut migrations = vec![
+        make_migration!("20190806011140_initial-tables"),
+        make_migration!("20200625092729_channel-targeting-rules"),
+    ];
 
     if environment == "development" {
         // seeds database tables for testing

sentry/src/db/channel.rs

@@ -14,7 +14,7 @@ pub async fn get_channel_by_id(
     pool
         .run(move |connection| {
             async move {
-                match connection.prepare("SELECT id, creator, deposit_asset, deposit_amount, valid_until, spec FROM channels WHERE id = $1 LIMIT 1").await {
+                match connection.prepare("SELECT id, creator, deposit_asset, deposit_amount, valid_until, targeting_rules, spec FROM channels WHERE id = $1 LIMIT 1").await {
                     Ok(select) => match connection.query(&select, &[&id]).await {
                         Ok(results) => Ok((results.get(0).map(Channel::from), connection)),
                         Err(e) => Err((e, connection)),
@@ -35,7 +35,7 @@ pub async fn get_channel_by_id_and_validator(
         .run(move |connection| {
             async move {
                 let validator = serde_json::Value::from_str(&format!(r#"[{{"id": "{}"}}]"#, validator_id)).expect("Not a valid json");
-                let query = "SELECT id, creator, deposit_asset, deposit_amount, valid_until, spec FROM channels WHERE id = $1 AND spec->'validators' @> $2 LIMIT 1";
+                let query = "SELECT id, creator, deposit_asset, deposit_amount, valid_until, targeting_rules, spec FROM channels WHERE id = $1 AND spec->'validators' @> $2 LIMIT 1";
                 match connection.prepare(query).await {
                     Ok(select) => {
                         match connection.query(&select, &[&id, &validator]).await {
@@ -57,8 +57,8 @@ pub async fn insert_channel(
     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 {
+                    match connection.prepare("INSERT INTO channels (id, creator, deposit_asset, deposit_amount, valid_until, targeting_rules, spec) values ($1, $2, $3, $4, $5, $6, $7)").await {
+                    Ok(stmt) => match connection.execute(&stmt, &[&channel.id, &channel.creator, &channel.deposit_asset, &channel.deposit_amount, &channel.valid_until, &channel.targeting_rules, &channel.spec]).await {
                         Ok(row) => {
                             let inserted = row == 1;
                             Ok((inserted, connection))
@@ -138,7 +138,7 @@ mod list_channels {
             .run(move |connection| {
                 async move {
                     // To understand why we use Order by, see Postgres Documentation: https://www.postgresql.org/docs/8.1/queries-limit.html
-                    let statement = format!("SELECT id, creator, deposit_asset, deposit_amount, valid_until, spec FROM channels WHERE {} ORDER BY spec->>'created' DESC LIMIT {} OFFSET {}", where_clauses.join(" AND "), limit, skip);
+                    let statement = format!("SELECT id, creator, deposit_asset, deposit_amount, valid_until, targeting_rules, spec FROM channels WHERE {} ORDER BY spec->>'created' DESC LIMIT {} OFFSET {}", where_clauses.join(" AND "), limit, skip);
                     match connection.prepare(&statement).await {
                         Ok(stmt) => {
                             match connection.query(&stmt, params.as_slice()).await {