Merge pull request #214 from StoriqaTeam/feature/subscription

Fill trial start date
StoriqaTeam · Mar 5, 2019 · 423cab9 · 423cab9
2 parents 9611a92 + c2b9713
commit 423cab9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/src/models/subscription.rs b/src/models/subscription.rs
@@ -86,6 +86,7 @@ pub struct NewStoreSubscription {
     pub currency: Currency,
     pub value: Amount,
     pub wallet_address: Option<WalletAddress>,
+    pub trial_start_date: Option<NaiveDateTime>,
 }
 
 #[derive(Clone, Debug, Default, Serialize, Deserialize, AsChangeset)]

diff --git a/src/services/store_subscription.rs b/src/services/store_subscription.rs
@@ -74,6 +74,7 @@ impl<
                 currency: payload.currency,
                 value: Amount::new(DEFAULT_EUR_CENTS_AMOUNT),
                 wallet_address: None,
+                trial_start_date: None,
             })),
             Currency::Stq => create_store_subscription_account(account_service, store_id),
             Currency::Eth | Currency::Btc | Currency::Usd | Currency::Rub => {
@@ -213,6 +214,7 @@ fn create_store_subscription_account<AS: AccountService>(account_service: AS, st
             currency: Currency::Stq,
             value: Amount::new(DEFAULT_STQ_WEI_AMOUNT),
             wallet_address: Some(account.wallet_address),
+            trial_start_date: None,
         });
     Box::new(fut)
 }
diff --git a/src/services/subscription.rs b/src/services/subscription.rs
@@ -83,7 +83,7 @@ impl<
 
                     match store_subscription.status {
                         StoreSubscriptionStatus::Trial => {
-                            let trial_duration = store_subscription.trial_start_date.ok_or({
+                            let trial_duration = store_subscription.trial_start_date.ok_or_else(|| {
                                 let e = format_err!("Store {} has empty trial start time", store_id);
                                 ectx!(try err e, ErrorKind::Internal)
                             })? - now;
@@ -162,6 +162,7 @@ fn find_update_or_create_store_subscription(
         currency: DEFAULT_CURRENCY,
         value: Amount::new(DEFAULT_EUR_CENTS_AMOUNT),
         wallet_address: None,
+        trial_start_date: Some(now),
     };
 
     store_subscription_repo.create(new_store_subscription)