Merge branch 'Sprint2' of https://github.com/data-me/api2 into Sprint2

Author: Alvaro Perez

Aptfile

@@ -0,0 +1,2 @@
+libssl-dev
+libffi-dev

Procfile

@@ -1,2 +1,2 @@
-release: sh -c 'cd mysite && python manage.py migrate'
+release: sh -c 'cd mysite && python manage.py makemigrations pagos && python manage.py migrate'
 web: sh -c 'cd mysite && gunicorn mysite.wsgi --log-file -'

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/mysite/settings.py

@@ -76,7 +76,7 @@
     'django.middleware.common.CommonMiddleware',
 )
 
-BASEURL = 'http://localhost:8000'
+BASEURL = 'https://front2-datame.herokuapp.com'
 
 ROOT_URLCONF = 'mysite.urls'
 
@@ -179,7 +179,7 @@
 PAYPAL_CLIENT_ID = "AQnKuEyaCgxZsEBPC-aq3glrpVK1dcTUUbvjkmnguZOM1WLQnsEU-y7i2oh3VkM_Xm4AfbJQx8AKdiYF"
 PAYPAL_CLIENT_SECRET = "EEkGJcVWziLr8FnQFC-BCYX0bcSz_xyh3POT7iR1K9e7fxFLVhI9EJSnOl5Jn3d_UhqydqGEYTfzCozc"
 
-SITE_URL ='http://localhost:8080/'
+SITE_URL ='https://front2-datame.herokuapp.com/'
 
 import django_heroku
 django_heroku.settings(locals())

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 = [
+    ]