Merge pull request #434 from AdExNetwork/issue-409-update-spendable-on-modify-campaign

elpiel · web-flow · commit e063aeff2b9e · 2021-09-24T11:07:35.000+03:00
Issue #409 update spendable on modify campaign
diff --git a/sentry/src/db/channel.rs b/sentry/src/db/channel.rs
@@ -12,7 +12,9 @@ pub async fn get_channel_by_id(
     let client = pool.get().await?;
 
     let select = client
-        .prepare("SELECT leader, follower, guardian, token, nonce FROM channels WHERE id = $1 LIMIT 1")
+        .prepare(
+            "SELECT leader, follower, guardian, token, nonce FROM channels WHERE id = $1 LIMIT 1",
+        )
         .await?;
 
     let row = client.query_opt(&select, &[&id]).await?;
diff --git a/sentry/src/routes/campaign.rs b/sentry/src/routes/campaign.rs
@@ -3,7 +3,7 @@ use crate::{
         accounting::{get_accounting, Side},
         campaign::{get_campaigns_by_channel, update_campaign},
         insert_campaign, insert_channel,
-        spendable::{fetch_spendable, update_spendable},
+        spendable::update_spendable,
         CampaignRemaining, DbPool, RedisError,
     },
     success_response, Application, Auth, ResponseError,
@@ -25,7 +25,7 @@ use thiserror::Error;
 use tokio_postgres::error::SqlState;
 
 #[derive(Debug, Error)]
-pub enum Error {
+pub enum Error<AE: AdapterErrorKind + 'static> {
     #[error("Error while updating campaign: {0}")]
     FailedUpdate(String),
     #[error("Error while performing calculations")]
@@ -36,8 +36,12 @@ pub enum Error {
     NewBudget(String),
     #[error("Spendable amount for campaign creator {0} not found")]
     SpenderNotFound(Address),
+    #[error("Channel token is not whitelisted")]
+    ChannelTokenNotWhitelisted,
     #[error("Campaign was not modified because of spending constraints")]
     CampaignNotModified,
+    #[error("Error while updating spendable for creator: {0}")]
+    LatestSpendable(#[from] LatestSpendableError<AE>),
     #[error("Redis error: {0}")]
     Redis(#[from] RedisError),
     #[error("DB Pool error: {0}")]
@@ -159,10 +163,10 @@ pub async fn create_campaign<A: Adapter>(
         .await?
         .iter()
         .sum::<Option<UnifiedNum>>()
-        .ok_or(Error::Calculation)?
+        .ok_or(Error::<A::AdapterError>::Calculation)?
         // DO NOT FORGET to add the Campaign being created right now!
         .checked_add(&campaign.budget)
-        .ok_or(Error::Calculation)?;
+        .ok_or(Error::<A::AdapterError>::Calculation)?;
 
     // `new_campaigns_remaining <= total_remaining` should be upheld
     // `campaign.budget < total_remaining` should also be upheld!
@@ -215,11 +219,13 @@ pub async fn create_campaign<A: Adapter>(
 }
 
 pub mod update_campaign {
+    use primitives::Config;
+
     use crate::db::{accounting::Side, CampaignRemaining};
 
     use super::*;
 
-    pub async fn handle_route<A: Adapter>(
+    pub async fn handle_route<A: Adapter + 'static>(
         req: Request<Body>,
         app: &Application<A>,
     ) -> Result<Response<Body>, ResponseError> {
@@ -236,7 +242,9 @@ pub mod update_campaign {
 
         // modify Campaign
         let modified_campaign = modify_campaign(
+            app.adapter.clone(),
             &app.pool,
+            &app.config,
             &app.campaign_remaining,
             campaign_being_mutated,
             modify_campaign_fields,
@@ -247,18 +255,20 @@ pub mod update_campaign {
         Ok(success_response(serde_json::to_string(&modified_campaign)?))
     }
 
-    pub async fn modify_campaign(
+    pub async fn modify_campaign<A: Adapter + 'static>(
+        adapter: A,
         pool: &DbPool,
+        config: &Config,
         campaign_remaining: &CampaignRemaining,
         campaign: Campaign,
         modify_campaign: ModifyCampaign,
-    ) -> Result<Campaign, Error> {
-        // *NOTE*: When updating campaigns make sure sum(campaigns.map(getRemaining)) <= totalDepoisted - totalspent
+    ) -> Result<Campaign, Error<A::AdapterError>> {
+        // *NOTE*: When updating campaigns make sure sum(campaigns.map(getRemaining)) <= totalDeposited - totalSpent
         // !WARNING!: totalSpent != sum(campaign.map(c => c.spending)) therefore we must always calculate remaining funds based on total_deposit - lastApprovedNewState.spenders[user]
         // *NOTE*: To close a campaign set campaignBudget to campaignSpent so that spendable == 0
 
         let delta_budget = if let Some(new_budget) = modify_campaign.budget {
-            get_delta_budget(campaign_remaining, &campaign, new_budget).await?
+            get_delta_budget::<A>(campaign_remaining, &campaign, new_budget).await?
         } else {
             None
         };
@@ -278,10 +288,14 @@ pub mod update_campaign {
             .map(|accounting| accounting.amount)
             .unwrap_or_default();
 
+            let token = config
+                .token_address_whitelist
+                .get(&campaign.channel.token)
+                .ok_or(Error::ChannelTokenNotWhitelisted)?;
+
             let latest_spendable =
-                fetch_spendable(pool.clone(), &campaign.creator, &campaign.channel.id())
-                    .await?
-                    .ok_or(Error::SpenderNotFound(campaign.creator))?;
+                update_latest_spendable(&adapter, &pool, campaign.channel, token, campaign.creator)
+                    .await?;
 
             // Gets the latest Spendable for this (spender, channelId) pair
             let total_deposited = latest_spendable.deposit.total;
@@ -352,11 +366,12 @@ pub mod update_campaign {
         Decrease(T),
     }
 
-    async fn get_delta_budget(
+    // TODO: Figure out a way to simplify Errors and remove the Adapter from here
+    async fn get_delta_budget<A: Adapter + 'static>(
         campaign_remaining: &CampaignRemaining,
         campaign: &Campaign,
         new_budget: UnifiedNum,
-    ) -> Result<Option<DeltaBudget<UnifiedNum>>, Error> {
+    ) -> Result<Option<DeltaBudget<UnifiedNum>>, Error<A::AdapterError>> {
         let current_budget = campaign.budget;
 
         let budget_action = match new_budget.cmp(&current_budget) {
@@ -913,10 +928,16 @@ mod test {
                 campaign.channel.token,
             );
 
-            let modified_campaign =
-                modify_campaign(&app.pool, &app.campaign_remaining, campaign.clone(), modify)
-                    .await
-                    .expect("Should modify campaign");
+            let modified_campaign = modify_campaign(
+                app.adapter.clone(),
+                &app.pool,
+                &app.config,
+                &app.campaign_remaining,
+                campaign.clone(),
+                modify,
+            )
+            .await
+            .expect("Should modify campaign");
 
             assert_eq!(new_budget, modified_campaign.budget);
             assert_eq!(Some("Updated title".to_string()), modified_campaign.title);
@@ -997,10 +1018,16 @@ mod test {
                 modified.channel.token,
             );
 
-            let modified_campaign =
-                modify_campaign(&app.pool, &app.campaign_remaining, modified, modify)
-                    .await
-                    .expect("Should modify campaign");
+            let modified_campaign = modify_campaign(
+                app.adapter.clone(),
+                &app.pool,
+                &app.config,
+                &app.campaign_remaining,
+                modified,
+                modify,
+            )
+            .await
+            .expect("Should modify campaign");
 
             assert_eq!(lower_budget, modified_campaign.budget);
 
@@ -1054,9 +1081,16 @@ mod test {
                 modified.channel.token,
             );
 
-            let modify_err = modify_campaign(&app.pool, &app.campaign_remaining, modified, modify)
-                .await
-                .expect_err("Should return Error response");
+            let modify_err = modify_campaign(
+                app.adapter.clone(),
+                &app.pool,
+                &app.config,
+                &app.campaign_remaining,
+                modified,
+                modify,
+            )
+            .await
+            .expect_err("Should return Error response");
 
             assert!(
                 matches!(modify_err, Error::NewBudget(string) if string == "Not enough deposit left for the campaign's new budget")
