Merge branch 'feature/booking-prepayment' into 'develop'

Booking pre-payment

See merge request gm/gm-backend!80

apps/booking/migrations/0003_auto_20191025_1613.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.2.4 on 2019-10-25 16:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('booking', '0002_auto_20191003_1601'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='booking',
+            name='amount',
+            field=models.CharField(default=None, max_length=30, null=True, verbose_name='prepayment price'),
+        ),
+        migrations.AddField(
+            model_name='booking',
+            name='stripe_key',
+            field=models.TextField(default=None, null=True, verbose_name='stripe service payment key'),
+        ),
+    ]

apps/booking/migrations/0004_booking_stripe_token.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.2.4 on 2019-10-25 16:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('booking', '0003_auto_20191025_1613'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='booking',
+            name='stripe_token',
+            field=models.TextField(default=None, null=True, verbose_name='stripe service pre-payed booking token'),
+        ),
+    ]

apps/booking/models/models.py

@@ -24,6 +24,9 @@ class Booking(ProjectBaseMixin):
     pending_booking_id = models.TextField(verbose_name=_('external service pending booking'), default=None)
     booking_id = models.TextField(verbose_name=_('external service booking id'), default=None, null=True,
                                   db_index=True, )
+    stripe_key = models.TextField(null=True, default=None, verbose_name=_('stripe service payment key'))
+    stripe_token = models.TextField(null=True, default=None, verbose_name=_('stripe service pre-payed booking token'))
+    amount = models.CharField(null=True, default=None, verbose_name=_('prepayment price'), max_length=30)
     user = models.ForeignKey(
         'account.User', verbose_name=_('booking owner'), null=True,
         related_name='bookings',

apps/booking/models/services.py

@@ -1,10 +1,13 @@
-from abc import ABC, abstractmethod
 import json
+from abc import ABC, abstractmethod
+
 import requests
 from django.conf import settings
-from rest_framework import status
+from django.utils.translation import ugettext_lazy as _
+from rest_framework import serializers, status
+from rest_framework.response import Response
+
 import booking.models.models as models
-from rest_framework import serializers
 
 
 class AbstractBookingService(ABC):
@@ -24,8 +27,12 @@ class AbstractBookingService(ABC):
             self.url = settings.LASTABLE_SERVICE
 
     @staticmethod
-    def get_certain_keys(d: dict, keys_to_preserve: set) -> dict:
+    def get_certain_keys(d: dict, keys_to_preserve: set, required=True) -> dict:
         """ Helper """
+        if required:
+            diff = keys_to_preserve - d.keys()
+            if diff:
+                raise serializers.ValidationError({field: _(f'This field is required') for field in diff})
         return {key: d[key] for key in d.keys() & keys_to_preserve}
 
     @abstractmethod
@@ -66,22 +73,22 @@ class GuestonlineService(AbstractBookingService):
     def get_common_headers(self):
         return {'X-Token': self.token, 'Content-type': 'application/json', 'Accept': 'application/json'}
 
-    def check_whether_booking_available(self, restaurant_id, date: str):
+    def check_whether_booking_available(self, restaurant_id, *args, **kwargs):
-        super().check_whether_booking_available(restaurant_id, date)
+        url = f'{self.url}v1/periods'
-        url = f'{self.url}v1/runtime_services'
+        params = {'restaurant_id': restaurant_id, **kwargs}
-        params = {'restaurant_id': restaurant_id, 'date': date, 'expands[]': 'table_availabilities'}
         r = requests.get(url, headers=self.get_common_headers(), params=params)
         if not status.is_success(r.status_code):
             return False
-        response = json.loads(r.content)['runtime_services']
+        self.response = r.json()
-        keys_to_preserve = {'left_seats', 'table_availabilities', 'closed', 'start_time', 'end_time', 'last_booking'}
-        response = map(lambda x: self.get_certain_keys(x, keys_to_preserve), response)
-        self.response = response
         return True
 
-    def commit_booking(self, payload):
+    def commit_booking(self, payload, stripe_token = None):
         url = f'{self.url}v1/pending_bookings/{payload}/commit'
-        r = requests.put(url, headers=self.get_common_headers())
+        if stripe_token:
+            r = requests.put(url, headers=self.get_common_headers(),
+                             data=json.dumps({'stripe_token': stripe_token}))
+        else:
+            r = requests.put(url, headers=self.get_common_headers())
         self.response = json.loads(r.content)
         if status.is_success(r.status_code) and self.response is None:
             raise serializers.ValidationError(detail='Booking already committed.')
@@ -93,8 +100,13 @@ class GuestonlineService(AbstractBookingService):
         payload['lastname'] = payload.pop('last_name')
         payload['firstname'] = payload.pop('first_name')
         payload['mobile_phone'] = payload.pop('phone')
+        payload['user_locale'] = payload.pop('country_code')
         headers = self.get_common_headers()
         r = requests.put(url, headers=headers, data=json.dumps({'contact_info': payload}))
+        response = r.json()
+        self.response = response.get('prepayment')
+        if not status.is_success(r.status_code):
+            return Response(status=r.status_code, data=response)
         return status.is_success(r.status_code)
 
     def create_booking(self, payload):
@@ -103,7 +115,10 @@ class GuestonlineService(AbstractBookingService):
         payload['persons'] = payload.pop('booked_persons_number')
         payload['date'] = payload.pop('booking_date')
         r = requests.post(url, headers=self.get_common_headers(), data=json.dumps(payload))
-        return json.loads(r.content)['id'] if status.is_success(r.status_code) else False
+        if status.is_success(r.status_code):
+            return json.loads(r.content)['id']
+        else:
+            return Response(status=r.status_code, data=r.json())
 
     def cancel_booking(self, payload):
         url = f'{self.url}v1/pending_bookings/{payload}'

apps/booking/serializers/web.py

@@ -42,13 +42,29 @@ class PendingBookingSerializer(serializers.ModelSerializer):
             'user',
         )
 
+class CommitBookingSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = models.Booking
+        fields = (
+            'stripe_token',
+        )
+
+    def update(self, instance, validated_data):
+        """Override update method"""
+        # Update user password from instance
+        service = instance.get_service_by_type(instance.type)
+        service.commit_booking(instance.pending_booking_id, validated_data.get('stripe_token'))
+        instance.stripe_token = validated_data.get('stripe_token')
+        instance.save()
+        return instance
 
 class UpdateBookingSerializer(serializers.ModelSerializer):
     id = serializers.ReadOnlyField()
 
     class Meta:
         model = models.Booking
-        fields = ('booking_id', 'id')
+        fields = ('booking_id', 'id', 'stripe_key', 'amount')
 
 
 class GetBookingSerializer(serializers.ModelSerializer):

apps/booking/urls.py

@@ -8,6 +8,7 @@ urlpatterns = [
     path('<int:establishment_id>/check/', views.CheckWhetherBookingAvailable.as_view(), name='booking-check'),
     path('<int:establishment_id>/create/', views.CreatePendingBooking.as_view(), name='create-pending-booking'),
     path('<int:pk>/', views.UpdatePendingBooking.as_view(), name='update-pending-booking'),
+    path('<int:pk>/commit/', views.CommitPendingBooking.as_view(), name='update-pending-booking'),
     path('<int:pk>/cancel/', views.CancelBooking.as_view(), name='cancel-existing-booking'),
     path('last/', views.LastBooking.as_view(), name='last_booking-for-authorizer-user'),
     path('retrieve/<int:pk>/', views.GetBookingById.as_view(), name='retrieves-booking-by-id'),

apps/booking/views.py

@@ -1,11 +1,13 @@
-from rest_framework import generics, permissions, status, serializers
-
 from django.shortcuts import get_object_or_404
-from establishment.models import Establishment
+from rest_framework import generics, permissions, status, serializers
-from booking.models.models import Booking, GuestonlineService, LastableService
 from rest_framework.response import Response
-from booking.serializers.web import (PendingBookingSerializer,
+
-                                     UpdateBookingSerializer, GetBookingSerializer, CheckBookingSerializer)
+from booking.models.models import Booking, GuestonlineService, LastableService
+from booking.serializers.web import (PendingBookingSerializer, UpdateBookingSerializer, GetBookingSerializer,
+                                     CheckBookingSerializer, CommitBookingSerializer)
+from establishment.models import Establishment
+from notification.models import Subscriber
+from utils.methods import get_user_ip
 
 
 class CheckWhetherBookingAvailable(generics.GenericAPIView):
@@ -28,7 +30,9 @@ class CheckWhetherBookingAvailable(generics.GenericAPIView):
             service = l_service
             service.service_id = establishment.lastable_id
         elif (not establishment.guestonline_id is None) and g_service \
-                .check_whether_booking_available(establishment.guestonline_id, date):
+                .check_whether_booking_available(establishment.guestonline_id,
+                                                 **g_service.get_certain_keys(request.query_params,
+                                                                              {'date', 'persons'})):
             is_booking_available = True
             service = g_service
             service.service_id = establishment.guestonline_id
@@ -61,7 +65,9 @@ class CreatePendingBooking(generics.CreateAPIView):
         }
         data['pending_booking_id'] = service.create_booking(
             service.get_certain_keys(data.copy(), service_to_keys[data.get('type')]))
-        if not data['pending_booking_id']:
+        if isinstance(data['pending_booking_id'], Response):
+            return data['pending_booking_id']
+        elif not data['pending_booking_id']:
             return Response(status=status.HTTP_403_FORBIDDEN, data='Unable to create booking')
         data['booking_id'] = data['pending_booking_id'] if data.get('type') == Booking.LASTABLE else None
         serializer = self.get_serializer(data=data)
@@ -70,6 +76,13 @@ class CreatePendingBooking(generics.CreateAPIView):
         return Response(status=status.HTTP_201_CREATED, data=serializer.data)
 
 
+class CommitPendingBooking(generics.UpdateAPIView):
+    """ Commit pending booking """
+    queryset = Booking.objects.all()
+    permission_classes = (permissions.AllowAny,)
+    serializer_class = CommitBookingSerializer
+
+
 class UpdatePendingBooking(generics.UpdateAPIView):
     """ Update pending booking with contacts """
     queryset = Booking.objects.all()
@@ -81,9 +94,29 @@ class UpdatePendingBooking(generics.UpdateAPIView):
         data = request.data.copy()
         service = Booking.get_service_by_type(instance.type)
         data['pending_booking_id'] = instance.pending_booking_id
-        service.update_booking(service.get_certain_keys(data, {
+        r = service.update_booking(service.get_certain_keys(data, {
-            'email', 'phone', 'last_name', 'first_name', 'country_code', 'pending_booking_id',
+            'email', 'phone', 'last_name', 'first_name', 'country_code', 'pending_booking_id', 'note',
         }))
+        if isinstance(r, Response):
+            return r
+        if data.get('newsletter'):
+            Subscriber.objects.make_subscriber(email=data['email'], country_code=data['country_code'],
+                                               locale=request.locale, ip_address=get_user_ip(request),
+                                               user=request.user)
+        if service.response:
+            # если есть предоплата, возвращаем фронту страйп-ключ для совершения оплаты и цену
+            amount = service.response.get('amount')
+            stripe_key = service.response.get('stripe_key')
+            data = {
+                'id': instance.pk,
+                'amount': amount,
+                'stripe_key': stripe_key,
+                'type': instance.type,
+            }
+            serializer = self.get_serializer(data=data)
+            serializer.is_valid(raise_exception=True)
+            serializer.update(instance, data)
+            return Response(status=status.HTTP_200_OK, data=data)
         service.commit_booking(data['pending_booking_id'])
         data = {
             'booking_id': service.response.get('id'),