Merge branch 'carlosc' into Sprint2

Merging paypal userPlan changes

Author: carlos3xc

mysite/datame/migrations/0002_userplan_ispayed.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1.7 on 2019-04-11 23:30
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('datame', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='userplan',
+            name='isPayed',
+            field=models.BooleanField(default=False),
+        ),
+    ]

mysite/datame/migrations/0003_merge_20190412_0523.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.1.7 on 2019-04-12 03:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('datame', '0002_userplan_ispayed'),
+        ('datame', '0002_auto_20190411_2237'),
+    ]
+
+    operations = [
+    ]

mysite/datame/models.py

@@ -51,6 +51,7 @@ class UserPlan(models.Model):
     type = models.CharField('Type', max_length = 4, choices = TYPE_CHOICES)
     startDate = models.DateTimeField(null = True)
     expirationDate = models.DateTimeField(null = True)
+    isPayed = models.BooleanField(default= False)
 
     def __str__(self):
         res = 'User Plan from ' + self.dataScientist.name

mysite/datame/populate.py

@@ -34,7 +34,7 @@ def populate(request):
         photo='https://media.istockphoto.com/photos/portrait-of-a-german-businessman-with-beard-picture-id480286744',
         address='C/Cristo del Amor Number 21',phone='955766587')
 
-        userPlan1 = UserPlan.objects.create(type='PRO',dataScientist=dataScientist1,startDate=datetime.datetime(2019,1,1,0,0,0,0,pytz.UTC),expirationDate=datetime.datetime(2020,1,1,0,0,0,0,pytz.UTC))
+        userPlan1 = UserPlan.objects.create(type='PRO',dataScientist=dataScientist1,startDate=datetime.datetime(2019,1,1,0,0,0,0,pytz.UTC),expirationDate=datetime.datetime(2020,1,1,0,0,0,0,pytz.UTC),isPayed=True)
 
         company01 = Company.objects.create(user = company1, name = 'Endesa', description = 'Endesa, fundada como «Empresa Nacional de Electricidad Sociedad Anónima» y cuyo nombre legal es Endesa, S.A., es una empresa española que opera en los sectores eléctrico y gasístico.',nif = '44060644A', logo = 'https://graffica.info/wp-content/uploads/2016/01/Captura-de-pantalla-2016-01-28-a-las-19.00.55.png')
         company02 = Company.objects.create(user = company2, name = 'Everis', description = 'Somos everis an NTT DATA Company, nos dedicamos a la consultoría y outsourcing abarcando todos los sectores del ámbito económico, llegando a facturar en el último ejercicio fiscal cerca de 1.173 millones de euros.',nif = '45070745B', logo = 'https://worldfootballsummit.com/wp-content/uploads/2018/08/logo-vector-everis.jpg')

mysite/datame/userplan.py

@@ -26,7 +26,8 @@ def get(self, request, format=None):
                     # List userplan as administrator
                     assert logged_user.is_staff
                     dataScientist = DataScientist.objects.all().get(pk=request.GET.get('dataScientistId'))
-                    userPlanHistory = list(UserPlan.objects.filter(dataScientist=dataScientist).values())
+                    userPlanHistory = list(UserPlan.objects.filter(dataScientist=dataScientist)
+                                           .filter(isPayed=True).values())
                     response.update({
                         'userId': str(logged_user.id),
                         'dataScientistId': str(dataScientist.id),
@@ -55,7 +56,8 @@ def get(self, request, format=None):
             except:
                 return JsonResponse({"message": "Sorry, there was a problem retrieving the Data Scientist"})
             try:
-                userPlanHistory = UserPlan.objects.filter(dataScientist=dataScientist).order_by('-expirationDate')
+                userPlanHistory = UserPlan.objects.filter(dataScientist=dataScientist)\
+                    .filter(isPayed=True).order_by('-expirationDate')
                 response['dataScientistId'] = dataScientist.id
                 currentUserPlan = None
                 if 0 < userPlanHistory.count():
@@ -83,7 +85,7 @@ def post(self, request, format=None):
             dataScientist = DataScientist.objects.all().get(user=logged_user)
         except:
             return JsonResponse({"message": "Only data scientists can update their user plan."})
-        userPlanHistory = UserPlan.objects.filter(dataScientist=dataScientist).order_by('-expirationDate')
+        userPlanHistory = UserPlan.objects.filter(dataScientist=dataScientist).filter(isPayed=True).order_by('-expirationDate')
         currentUserPlan = None
         if 0 < userPlanHistory.count():
             currentUserPlan = userPlanHistory.first()

mysite/pagos/migrations/0003_merge_20190411_1816.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.1.7 on 2019-04-11 16:16
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pagos', '0002_auto_20190411_0800'),
+        ('pagos', '0002_userplanpaypalbill'),
+    ]
+
+    operations = [
+    ]

mysite/pagos/migrations/0005_merge_20190412_0523.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.1.7 on 2019-04-12 03:23
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pagos', '0003_merge_20190411_1816'),
+        ('pagos', '0004_merge_20190411_2213'),
+    ]
+
+    operations = [
+    ]

mysite/pagos/views.py

@@ -76,7 +76,7 @@ def _generar_pago_paypal(self, offer):
                 if link.method == "REDIRECT":
                     url_pago = link.href
         else:
-            raise Exception(pago.error)
+            raise Exception(pago_paypal.error)
 
         return url_pago, pago_paypal
 
@@ -156,33 +156,37 @@ def get(self, request,paymentId,token_paypal,payerID,format=None):
 
 class PaypalUserPlanPaymentView(APIView):
     def get(self, request, format=None):
+        print("is the paypal_userPlan_payment_getting_to_back?==========")
         if request.method == "GET":
             try:
                 response = {}
                 try:
                     dataScientist_user = User.objects.all().get(pk = request.user.id)
                     dataScientist = DataScientist.objects.all().get(user=dataScientist_user)
                 except:
+                    traceback.print_exc()
                     response['DeveloperErrorMessage'] = 'Pagos.views.PaypalUserPlanPaymentView: Logged data scientist could not be retrieved.'
                     response['UserCodeErrorMessage'] = 'None.'
                     return JsonResponse(response, safe=False)
 
                 try:
                     userPlan_pk = request.GET['userplan_pk']
                 except:
+                    traceback.print_exc()
                     response['DeveloperErrorMessage'] = 'Pagos.views.PaypalUserPlanPaymentView: No userPlan_pk was received.'
                     response['UserCodeErrorMessage'] = 'None.'
                     return JsonResponse(response, safe=False)
 
                 try:
                     userplan = UserPlan.objects.get(pk=userPlan_pk)
                     assert userplan.dataScientist == dataScientist
-                    userPlanHistory = UserPlan.objects.filter(dataScientist=dataScientist).order_by('-expirationDate')
+                    userPlanHistory = UserPlan.objects.filter(dataScientist=dataScientist).order_by('-expirationDate').order_by('-pk')
                     assert 0 < userPlanHistory.count()
                     userplanPaymentPending = userPlanHistory.first()
 
                     assert userplan == userplanPaymentPending
                 except:
+                    traceback.print_exc()
                     response['DeveloperErrorMessage'] = 'Pagos.views.PaypalUserPlanPaymentView: An error ocurred retrieving the user plan to pay.'
                     response['UserCodeErrorMessage'] = 'None.'
                     return JsonResponse(response, safe=False)
@@ -274,15 +278,34 @@ def get(self, request, format=None):
             payment_id = request.GET.get('paymentId')
             payer_id = request.GET.get('PayerID')
         except:
+            traceback.print_exc()
             raise HttpResponseBadRequest
 
         # Execute payment with the payer ID from the create payment call (following redirect)
         payment = Payment.find(str(payment_id))
 
         if payment.execute({"payer_id": str(payer_id)}):
             print("Payment[%s] execute successfully" % (payment.id))
+            try:
+                userPlan_pk = payment.transactions[0]['item_list']['items'][0]['sku']
+                print("The id of the user_plan is " +  str(userPlan_pk))
+                userPlan = UserPlan.objects.get(pk=userPlan_pk)
+                userPlan.isPayed = True
+                print("The said userplan" + str(userPlan.id))
+                userPlan.save()
+                print("The said userplan" + str(userPlan.isPayed))
+            except:
+                traceback.print_exc()
+                response[
+                    'DeveloperErrorMessage'] = 'Pagos.views.PaypalUserPlanPaymentView: No userPlan_pk was received.'
+                response['UserCodeErrorMessage'] = 'None.'
+                return JsonResponse(response, safe=False)
+            response['DeveloperErrorMessage'] = 'Pagos.views.PaypalUserPlanPaymentView: Everything went perfect with payment!.'
+            response['MessageCode'] = 'You have paid successfuly'
         else:
             print(payment.error)
+            response['DeveloperErrorMessage'] = 'ERRROOOOR!'
+            response['MessageCode'] = 'ERRROOOOR!'
 
 
-#TODO class CancelPaypalUserPlanPayment(APIView):
+        return JsonResponse(response, safe=False)