Merge branch 'adding-cart-to-weekly-report' into 'staging'

Adding cart to weekly report

See merge request !86

diet_progress/migrations/0002_weeklyreport_cart.py

+# Generated by Django 3.1 on 2021-06-28 12:37
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('payment', '0001_initial'),
+        ('diet_progress', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='weeklyreport',
+            name='cart',
+            field=models.ForeignKey(default=3, on_delete=django.db.models.deletion.CASCADE, related_name='weekly_report', to='payment.cart'),
+            preserve_default=False,
+        ),
+    ]

diet_progress/migrations/0003_remove_weeklyreport_cart.py

+# Generated by Django 3.1 on 2021-06-28 12:37
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('diet_progress', '0002_weeklyreport_cart'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='weeklyreport',
+            name='cart',
+        ),
+    ]

diet_progress/migrations/0004_weeklyreport_cart.py

+# Generated by Django 3.1 on 2021-06-28 13:39
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('payment', '0001_initial'),
+        ('diet_progress', '0003_remove_weeklyreport_cart'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='weeklyreport',
+            name='cart',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='weekly_report', to='payment.cart'),
+        ),
+    ]

diet_progress/models.py

 from django.db import models
 from multiselectfield import MultiSelectField
 from nutritionists.models import Nutritionist
+from payment.models import Cart
 from authentication.models import CustomUser
 from constants.model_choices import(
     LargeMealInOneDay,
@@ -24,6 +25,12 @@ class WeeklyReport(models.Model):
         on_delete=models.CASCADE,
         related_name='weekly_report'
     )
+    cart = models.ForeignKey(
+        Cart,
+        on_delete=models.CASCADE,
+        related_name='weekly_report',
+        null=True
+    )
 
     week_num = models.PositiveIntegerField()
 

diet_progress/tests.py

@@ -80,9 +80,17 @@ class WeeklyReportTest(APITestCase):
             program_end_date = datetime.date.today() + datetime.timedelta(days=13),
         )
 
+        cls.cart_3 = Cart.objects.create(
+            user = cls.custom_user_3,
+            program = cls.dietela_program_1,
+            nutritionist = cls.nutritionist_1,
+            program_end_date = datetime.date.today() + datetime.timedelta(days=15),
+        )
+
         cls.weekly_report_1 = WeeklyReport.objects.create(
             client = cls.custom_user_2,
             nutritionist = cls.nutritionist_1,
+            cart = cls.cart_2,
             week_num = 1,
             weight= 155,
             height= 188,

diet_progress/views.py

@@ -4,6 +4,7 @@ from rest_framework.response import Response
 from django.db.models import Q
 from authentication.models import CustomUser
 from authentication.utilities import get_appropriate_week_num
+from payment.models import Cart
 from .models import WeeklyReport, WeeklyReportComment
 from .serializers import WeeklyReportSerializer, WeeklyReportCommentSerializer
 
@@ -21,8 +22,12 @@ class WeeklyReportViewSet(viewsets.ModelViewSet):
         queryset = WeeklyReport.objects.all()
 
         user_id = self.request.query_params.get('client_id')
+
         if user_id is not None:
+            cart = Cart.objects.filter(user=user_id).order_by('-program_end_date')
+            cart = cart[0]
             queryset = queryset.filter(Q(client=user_id))
+            queryset = queryset.filter(Q(cart=cart.id))
 
         if len(groups_list)==1:
             if groups_list[0] == 'nutritionist':
@@ -37,11 +42,13 @@ class WeeklyReportViewSet(viewsets.ModelViewSet):
     def create(self, request, *args, **kwargs):
         deadline = self.request.user.deadline
         week_number = get_appropriate_week_num(deadline)
-
+        cart = Cart.objects.filter(user=self.request.user).order_by('-program_end_date')
+        cart = cart[0]
 
         request.data['week_num'] = week_number
         request.data['nutritionist'] = self.request.user.nutritionist.id
         request.data['client'] = self.request.user.id
+        request.data['cart'] = cart.id
         serializer = self.get_serializer(data=request.data)
         serializer.is_valid(raise_exception=True)
         self.perform_create(serializer)