Added ability to update request value after address generated

Author: cryptapi

cryptapi/dispatchers.py

@@ -53,8 +53,7 @@ def callback(self):
                     total_received = self.payment['value_paid']
 
                     if total_received < request.value_requested:
-                        total_received_list = request.payment_set.filter(pending=False).values_list('value_paid', flat=True)
-                        total_received = sum(total_received_list)
+                        total_received = request.total_paid
 
                     if total_received < request.value_requested:
                         request.status = 'insufficient'
@@ -104,7 +103,6 @@ def request(self, cb_params={}, params={}):
         from cryptapi.utils import build_callback_url, process_request
         from cryptapi.helpers import generate_nonce
         from cryptapi.forms import AddressCreatedForm
-        from cryptapi.choices import TOKEN_DICT
 
         try:
             provider = Provider.objects.get(coin=self.coin, active=True)
@@ -146,17 +144,14 @@ def request(self, cb_params={}, params={}):
                 if not address_form.is_valid():
                     return None
 
-                if self.coin in TOKEN_DICT:
-                    divider = TOKEN_DICT[self.coin][4]
-                    self.value = self.value / (10 ** divider)
-
                 request_model.nonce = _cb_params['nonce']
                 request_model.address_in = response['address_in']
                 request_model.address_out = _params['address']
-                request_model.value_requested = self.value
                 request_model.status = 'created'
                 request_model.raw_request_url = raw_response.url
 
+                request_model.set_value(self.value)
+
                 request_model.save()
 
             return request_model

cryptapi/meta.py

@@ -1,4 +1,4 @@
 from distutils.version import StrictVersion
 
 
-VERSION = StrictVersion('0.2.7')
+VERSION = StrictVersion('0.2.8')

cryptapi/models.py

@@ -1,6 +1,7 @@
 from django.db import models
+from django.db.models import Sum
 from django.utils.translation import gettext_lazy as _
-from .choices import COINS, STATUS
+from .choices import COINS, STATUS, TOKEN_DICT
 
 
 class Provider(models.Model):
@@ -24,6 +25,27 @@ class Request(models.Model):
     raw_request_url = models.CharField(_('Request URL'), max_length=8192, default='', null=True)
     timestamp = models.DateTimeField(auto_now_add=True)
 
+    @property
+    def total_paid(self):
+        qs = self.payment_set.filter(pending=False)
+
+        if qs.exists():
+            return qs.aggregate(sum=Sum('value_paid')).get('sum', 0)
+
+        return 0
+
+    def set_value(self, value, commit=False):
+        _coin = self.provider.coin.lower()
+        _token = TOKEN_DICT.get(_coin)
+
+        if _token:
+            value = value / (10 ** _token[4])
+
+        self.value_requested = value
+
+        if commit:
+            self.save()
+
     def __str__(self):
         return "#{}, {}#{}, {} ({})".format(self.id, _('Order'), self.order_id, self.get_status_display(), self.timestamp.strftime('%x %X'))