Create hostingorder outside celery task

datacenterlight/tasks.py

@@ -49,24 +49,11 @@ def retry_task(task, exception=None):
 
 
 @app.task(bind=True, max_retries=settings.CELERY_MAX_RETRIES)
-def create_vm_task(self, vm_template_id, user, specs, template,
+def create_vm_task(self, vm_template_id, user, specs, template, order_id):
-                   stripe_customer_id, billing_address_data,
-                   stripe_subscription_id, cc_details):
     logger.debug(
         "Running create_vm_task on {}".format(current_task.request.hostname))
     vm_id = None
     try:
-        final_price = specs.get('price')
-        billing_address = BillingAddress(
-            cardholder_name=billing_address_data['cardholder_name'],
-            street_address=billing_address_data['street_address'],
-            city=billing_address_data['city'],
-            postal_code=billing_address_data['postal_code'],
-            country=billing_address_data['country']
-        )
-        billing_address.save()
-        customer = StripeCustomer.objects.filter(id=stripe_customer_id).first()
-
         if 'pass' in user:
             on_user = user.get('email')
             on_pass = user.get('pass')
@@ -94,33 +81,26 @@ def create_vm_task(self, vm_template_id, user, specs, template,
         if vm_id is None:
             raise Exception("Could not create VM")
 
-        # Create a Hosting Order
+        # Update HostingOrder with the created vm_id
-        order = HostingOrder.create(
+        hosting_order = HostingOrder.objects.filter(id=order_id).first()
-            price=final_price,
+        error_msg = None
-            vm_id=vm_id,
+        if hosting_order:
-            customer=customer,
+            logger.debug(
-            billing_address=billing_address
+                "Updating hosting_order {} with vm_id={}".format(
-        )
+                    hosting_order.id, vm_id
-
+                )
-        # Create a Hosting Bill
+            )
-        HostingBill.create(
+            hosting_order.vm_id = vm_id
-            customer=customer, billing_address=billing_address)
+            hosting_order.save()
-
+        else:
-        # Create Billing Address for User if he does not have one
+            error_msg = (
-        if not customer.user.billing_addresses.count():
+                "HostingOrder with id {order_id} not found. This means that "
-            billing_address_data.update({
+                "the hosting order was not created and/or it is/was not "
-                'user': customer.user.id
+                "associated with VM with id {vm_id}".format(
-            })
+                    order_id=order_id, vm_id=vm_id
-            billing_address_user_form = UserBillingAddressForm(
+                )
-                billing_address_data)
+            )
-            billing_address_user_form.is_valid()
+            logger.error(error_msg)
-            billing_address_user_form.save()
-
-        # Associate an order with a stripe subscription
-        order.set_subscription_id(stripe_subscription_id, cc_details)
-
-        # If the Stripe payment succeeds, set order status approved
-        order.set_approved()
 
         vm = VirtualMachineSerializer(manager.get_vm(vm_id)).data
 
@@ -134,8 +114,11 @@ def create_vm_task(self, vm_template_id, user, specs, template,
             'template': template.get('name'),
             'vm_name': vm.get('name'),
             'vm_id': vm['vm_id'],
-            'order_id': order.id
+            'order_id': order_id
         }
+
+        if error_msg:
+            context['errors'] = error_msg
         email_data = {
             'subject': settings.DCL_TEXT + " Order from %s" % context['email'],
             'from_email': settings.DCL_SUPPORT_FROM_ADDRESS,
@@ -159,7 +142,7 @@ def create_vm_task(self, vm_template_id, user, specs, template,
                 'base_url': "{0}://{1}".format(user.get('request_scheme'),
                                                user.get('request_host')),
                 'order_url': reverse('hosting:orders',
-                                     kwargs={'pk': order.id}),
+                                     kwargs={'pk': order_id}),
                 'page_header': _(
                     'Your New VM %(vm_name)s at Data Center Light') % {
                     'vm_name': vm.get('name')},

datacenterlight/tests.py

@@ -122,10 +122,15 @@ class CeleryTaskTestCase(TestCase):
             msg = subscription_result.get('error')
             raise Exception("Creating subscription failed: {}".format(msg))
 
+        order = HostingOrder.create(
+            price=specs['price'],
+            vm_id=0,
+            customer=customer,
+            billing_address=billing_address
+        )
+
         async_task = create_vm_task.delay(
-            vm_template_id, self.user, specs, template_data,
+            vm_template_id, self.user, specs, template_data, order.id
-            stripe_customer.id, billing_address_data,
-            stripe_subscription_obj.id, card_details_dict
         )
         new_vm_id = 0
         res = None

datacenterlight/views.py

@@ -15,11 +15,14 @@ from django.views.generic import FormView, CreateView, DetailView
 
 from datacenterlight.tasks import create_vm_task
 from hosting.forms import HostingUserLoginForm
-from hosting.models import HostingOrder
+from hosting.models import HostingOrder, HostingBill
 from membership.models import CustomUser, StripeCustomer
 from opennebula_api.serializers import VMTemplateSerializer
-from utils.forms import BillingAddressForm, BillingAddressFormSignup
+from utils.forms import (
+    BillingAddressForm, BillingAddressFormSignup, UserBillingAddressForm
+)
 from utils.hosting_utils import get_vm_price
+from utils.models import BillingAddress
 from utils.stripe_utils import StripeUtils
 from utils.tasks import send_plain_email_task
 from .forms import ContactForm
@@ -484,9 +487,48 @@ class OrderConfirmationView(DetailView):
             'language': get_language(),
         }
 
-        create_vm_task.delay(vm_template_id, user, specs, template,
+        billing_address = BillingAddress(
-                             stripe_customer_id, billing_address_data,
+            cardholder_name=billing_address_data['cardholder_name'],
-                             stripe_subscription_obj.id, card_details_dict)
+            street_address=billing_address_data['street_address'],
+            city=billing_address_data['city'],
+            postal_code=billing_address_data['postal_code'],
+            country=billing_address_data['country']
+        )
+        billing_address.save()
+
+        customer = StripeCustomer.objects.filter(id=stripe_customer_id).first()
+
+        # Create a Hosting Order with vm_id = 0, we shall set it later in
+        # celery task once the VM instance is up and running
+        order = HostingOrder.create(
+            price=specs['price'],
+            vm_id=0,
+            customer=customer,
+            billing_address=billing_address
+        )
+
+        # Create a Hosting Bill
+        HostingBill.create(customer=customer, billing_address=billing_address)
+
+        # Create Billing Address for User if he does not have one
+        if not customer.user.billing_addresses.count():
+            billing_address_data.update({
+                'user': customer.user.id
+            })
+            billing_address_user_form = UserBillingAddressForm(
+                billing_address_data)
+            billing_address_user_form.is_valid()
+            billing_address_user_form.save()
+
+        # Associate an order with a stripe subscription
+        order.set_subscription_id(
+            stripe_subscription_obj.id, card_details_dict
+        )
+
+        # If the Stripe payment succeeds, set order status approved
+        order.set_approved()
+
+        create_vm_task.delay(vm_template_id, user, specs, template, order.id)
         for session_var in ['specs', 'template', 'billing_address',
                             'billing_address_data',
                             'token', 'customer']:

hosting/views.py

@@ -44,6 +44,7 @@ from utils.forms import (
 )
 from utils.hosting_utils import get_vm_price
 from utils.mailer import BaseEmail
+from utils.models import BillingAddress
 from utils.stripe_utils import StripeUtils
 from utils.tasks import send_plain_email_task
 from utils.views import (
@@ -882,9 +883,50 @@ class OrdersHostingDetailView(LoginRequiredMixin, DetailView):
             'request_host': request.get_host(),
             'language': get_language(),
         }
-        create_vm_task.delay(vm_template_id, user, specs, template,
+
-                             stripe_customer_id, billing_address_data,
+        billing_address = BillingAddress(
-                             stripe_subscription_obj.id, card_details_dict)
+            cardholder_name=billing_address_data['cardholder_name'],
+            street_address=billing_address_data['street_address'],
+            city=billing_address_data['city'],
+            postal_code=billing_address_data['postal_code'],
+            country=billing_address_data['country']
+        )
+        billing_address.save()
+
+        customer = StripeCustomer.objects.filter(id=stripe_customer_id).first()
+
+        # Create a Hosting Order with vm_id = 0, we shall set it later in
+        # celery task once the VM instance is up and running
+        order = HostingOrder.create(
+            price=specs['price'],
+            vm_id=0,
+            customer=customer,
+            billing_address=billing_address
+        )
+
+        # Create a Hosting Bill
+        HostingBill.create(customer=customer, billing_address=billing_address)
+
+        # Create Billing Address for User if he does not have one
+        if not customer.user.billing_addresses.count():
+            billing_address_data.update({
+                'user': customer.user.id
+            })
+            billing_address_user_form = UserBillingAddressForm(
+                billing_address_data
+            )
+            billing_address_user_form.is_valid()
+            billing_address_user_form.save()
+
+        # Associate an order with a stripe subscription
+        order.set_subscription_id(
+            stripe_subscription_obj.id, card_details_dict
+        )
+
+        # If the Stripe payment succeeds, set order status approved
+        order.set_approved()
+
+        create_vm_task.delay(vm_template_id, user, specs, template, order.id)
 
         for session_var in ['specs', 'template', 'billing_address',
                             'billing_address_data',