Merge remote-tracking branch 'origin/fnux-stable'

Signed-off-by: Nico Schottelius <nico@nico-notebook.schottelius.org>

uncloud/uncloud_vm/views.py

@@ -1,3 +1,4 @@
+from django.db import transaction
 from django.shortcuts import render
 
 from django.contrib.auth.models import User
@@ -7,11 +8,11 @@ from rest_framework import viewsets, permissions
 from rest_framework.response import Response
 from rest_framework.exceptions import ValidationError
 
-
 from .models import VMHost, VMProduct, VMSnapshotProduct, VMDiskProduct, VMDiskImageProduct
 from uncloud_pay.models import Order
 
 from .serializers import VMHostSerializer, VMProductSerializer, VMSnapshotProductSerializer, VMDiskImageProductSerializer, VMDiskProductSerializer
+from uncloud_pay.helpers import ProductViewSet
 
 
 import datetime
@@ -77,27 +78,37 @@ class VMDiskProductViewSet(viewsets.ModelViewSet):
 
 
 
-class VMProductViewSet(viewsets.ModelViewSet):
+class VMProductViewSet(ProductViewSet):
     permission_classes = [permissions.IsAuthenticated]
     serializer_class = VMProductSerializer
 
     def get_queryset(self):
         return VMProduct.objects.filter(owner=self.request.user)
 
+    # Use a database transaction so that we do not get half-created structure
+    # if something goes wrong.
+    @transaction.atomic
     def create(self, request):
+        # Extract serializer data.
         serializer = VMProductSerializer(data=request.data, context={'request': request})
         serializer.is_valid(raise_exception=True)
-        # Create order
-        now = datetime.datetime.now()
-        order = Order(owner=request.user,
-                      creation_date=now,
-                      starting_date=now,
-                      recurring_price=20,
-                      one_time_price=0,
-                      recurring_period="per_month")
+        order_recurring_period = serializer.validated_data.pop("recurring_period")
+
+        # Create base order.
+        order = Order.objects.create(
+                recurring_period=order_recurring_period,
+                owner=request.user
+                )
         order.save()
 
-        serializer.save(owner=request.user, order=order)
+        # Create VM.
+        vm = serializer.save(owner=request.user, order=order)
+
+        # Add Product record to order (VM is mutable, allows to keep history in order).
+        # XXX: Move this to some kind of on_create hook in parent Product class?
+        order.add_record(vm.setup_fee,
+                vm.recurring_price(order.recurring_period), vm.description)
+
         return Response(serializer.data)