Some changes in validate/verfiy flow

bluebottle/funding/models.py

@@ -28,7 +28,7 @@
 from bluebottle.funding.validators import (
     DeadlineValidator,
     TargetValidator,
-    DeadlineMaxValidator,
+    DeadlineMaxValidator, BudgetValidator,
 )
 from bluebottle.utils.exchange_rates import convert
 from bluebottle.utils.fields import MoneyField
@@ -154,7 +154,7 @@ class Funding(Activity):
 
     needs_review = True
 
-    validators = [DeadlineValidator, DeadlineMaxValidator, TargetValidator]
+    validators = [DeadlineValidator, DeadlineMaxValidator, TargetValidator, BudgetValidator]
 
     auto_approve = False
 
@@ -215,6 +215,12 @@ def update_amounts(self):
             )
             self.save()
 
+    @property
+    def total_budget(self):
+        budget_lines = self.budget_lines.all()
+        total_amount = sum(line.amount.amount for line in budget_lines)
+        return Money(currency=self.target.currency, amount=total_amount)
+
     @property
     def activity_date(self):
         return self.deadline

bluebottle/funding/serializers.py

@@ -110,7 +110,9 @@ class BudgetLineSerializer(ModelSerializer):
     activity = ResourceRelatedField(queryset=Funding.objects.all())
     amount = MoneySerializer()
 
-    validators = [FundingCurrencyValidator()]
+    validators = [
+        FundingCurrencyValidator(),
+    ]
 
     included_serializers = {
         'activity': 'bluebottle.funding.serializers.FundingSerializer',

bluebottle/funding/states.py

@@ -68,8 +68,6 @@ def psp_allows_refunding(self):
             self.instance.bank_account.provider_class.refund_enabled
 
     def kyc_is_valid(self):
-        if self.instance.payout_account:
-            print(self.instance.payout_account.status)
         return (
             self.instance.payout_account
             and self.instance.payout_account.status == "verified"

bluebottle/funding/triggers.py

@@ -274,17 +274,6 @@ class BankAccountTriggers(TriggerManager):
                 )
             ]
         ),
-        TransitionTrigger(
-            BankAccountStateMachine.verify,
-            effects=[
-                SubmitConnectedActivitiesEffect,
-                RelatedTransitionEffect(
-                    'connect_account',
-                    PlainPayoutAccountStateMachine.verify,
-                    description='Verify connected KYC account'
-                )
-            ]
-        ),
     ]
 
 

bluebottle/funding/validators.py

@@ -72,3 +72,14 @@ def is_valid(self):
         if self.instance.target.amount <= 0:
             return False
         return True
+
+
+class BudgetValidator(Validator):
+    code = 'budget'
+    message = _("Budget doesn't match the crowdfunding target")
+    field = 'budget'
+
+    def is_valid(self):
+        if self.instance.target.amount != self.instance.total_budget.amount:
+            return False
+        return True

bluebottle/funding_stripe/models.py

@@ -391,7 +391,6 @@ def get_account_link(self):
 
     def update(self, data):
         self.verified = data.individual.verification.status == "verified"
-        self.states.verify()
         self.payments_enabled = data.charges_enabled
         self.payouts_enabled = data.payouts_enabled