Provisioning

breathecode/assignments/tests/urls/tests_task_id.py

@@ -375,13 +375,13 @@ def test_task_id__put__with_one_task__with_revision_status(self):
     @patch("breathecode.assignments.tasks.teacher_task_notification", MagicMock())
     @patch("django.db.models.signals.pre_delete.send_robust", MagicMock(return_value=None))
     @patch("breathecode.admissions.signals.student_edu_status_updated.send_robust", MagicMock(return_value=None))
-    def test_task_id__put__with_one_task__with_revision_status__teacher_auth(self):
+    def test_task_id__put__with_one_task__with_revision_status__teacher_auth__good_statuses(self):
         from breathecode.assignments.tasks import student_task_notification, teacher_task_notification
 
-        statuses = ["PENDING", "APPROVED", "REJECTED", "IGNORED"]
-        for index in range(0, 4):
+        statuses = ["PENDING", "APPROVED", "REJECTED"]
+        for index in range(0, 3):
             current_status = statuses[index]
-            next_status = statuses[index - 1 if index > 0 else 3]
+            next_status = statuses[index - 1 if index > 0 else 2]
             task = {"revision_status": current_status, "user_id": (index * 2) + 1, "task_status": "DONE"}
             cohort_users = [
                 {
@@ -438,6 +438,74 @@ def test_task_id__put__with_one_task__with_revision_status__teacher_auth(self):
             student_task_notification.delay.call_args_list = []
             activity_tasks.add_activity.delay.call_args_list = []
 
+    @patch("breathecode.assignments.tasks.student_task_notification", MagicMock())
+    @patch("breathecode.assignments.tasks.teacher_task_notification", MagicMock())
+    @patch("django.db.models.signals.pre_delete.send_robust", MagicMock(return_value=None))
+    @patch("breathecode.admissions.signals.student_edu_status_updated.send_robust", MagicMock(return_value=None))
+    def test_task_id__put__with_one_task__with_revision_status__teacher_auth__bad_statuses(self):
+        from breathecode.assignments.tasks import student_task_notification, teacher_task_notification
+
+        another_statuses = ["PENDING", "APPROVED", "REJECTED"]
+        statuses = ["IGNORED"]
+        statuses = ["PENDING", "APPROVED", "REJECTED"]
+        for index in range(0, 3):
+            current_status = statuses[index]
+            next_status = "IGNORED"
+            task = {"revision_status": current_status, "user_id": (index * 2) + 1, "task_status": "DONE"}
+            cohort_users = [
+                {
+                    "role": "STUDENT",
+                    "user_id": (index * 2) + 1,
+                },
+                {
+                    "role": "TEACHER",
+                    "user_id": (index * 2) + 2,
+                },
+            ]
+            model = self.bc.database.create(user=2, task=task, cohort=1, cohort_user=cohort_users)
+            model2 = self.bc.database.create(cohort=1)
+            self.bc.request.authenticate(model.user[1])
+
+            url = reverse_lazy("assignments:task_id", kwargs={"task_id": index + 1})
+            data = {
+                "title": "They killed kenny",
+                "revision_status": next_status,
+            }
+            start = self.bc.datetime.now()
+            response = self.client.put(url, data, format="json")
+            end = self.bc.datetime.now()
+
+            json = response.json()
+            updated_at = self.bc.datetime.from_iso_string(json["updated_at"])
+            self.bc.check.datetime_in_range(start, end, updated_at)
+
+            del json["updated_at"]
+
+            expected = put_serializer(self, model.task, data=data)
+
+            self.assertEqual(json, expected)
+            self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+            self.assertEqual(self.bc.database.list_of("assignments.Task"), [task_row(self, model.task, data=data)])
+            self.assertEqual(student_task_notification.delay.call_args_list, [])
+            self.assertEqual(teacher_task_notification.delay.call_args_list, [])
+
+            self.bc.check.calls(
+                activity_tasks.add_activity.delay.call_args_list,
+                [
+                    call(
+                        (index * 2) + 2,
+                        "assignment_review_status_updated",
+                        related_type="assignments.Task",
+                        related_id=index + 1,
+                    ),
+                ],
+            )
+
+            # teardown
+            self.bc.database.delete("assignments.Task")
+            activity_tasks.add_activity.delay.call_args_list = []
+
     @patch("breathecode.assignments.tasks.student_task_notification", MagicMock())
     @patch("breathecode.assignments.tasks.teacher_task_notification", MagicMock())
     @patch("django.db.models.signals.pre_delete.send_robust", MagicMock(return_value=None))

breathecode/assignments/tests/urls/tests_user_me_task.py

@@ -629,10 +629,10 @@ def test__put__with_task__one_item_in_body__passing_revision_status(self):
     @patch("django.db.models.signals.pre_delete.send_robust", MagicMock(return_value=None))
     @patch("breathecode.admissions.signals.student_edu_status_updated.send_robust", MagicMock(return_value=None))
     def test__put__with_task__one_item_in_body__passing_revision_status__teacher_token(self):
-        statuses = ["APPROVED", "REJECTED", "IGNORED"]
-        for index in range(0, 3):
+        statuses = ["APPROVED", "REJECTED"]
+        for index in range(0, 2):
             current_status = statuses[index]
-            next_status = statuses[index - 1 if index > 0 else 2]
+            next_status = statuses[index - 1 if index > 0 else 1]
             task = {"revision_status": current_status, "task_status": "DONE"}
             cohort_users = [
                 {

breathecode/assignments/views.py

@@ -1,7 +1,7 @@
 import hashlib
 import logging
 import os
-from slugify import slugify
+
 from adrf.views import APIView
 from asgiref.sync import sync_to_async
 from circuitbreaker import CircuitBreakerError
@@ -15,6 +15,7 @@
 from rest_framework.decorators import api_view
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
+from slugify import slugify
 
 import breathecode.activity.tasks as tasks_activity
 import breathecode.assignments.tasks as tasks
@@ -749,7 +750,7 @@ def update(_req, data, _id=None, only_validate=True):
             if serializer.is_valid():
                 if not only_validate:
                     serializer.save()
-                    if _req.user.id != item.user.id:
+                    if _req.user.id != item.user.id and item.revision_status != "IGNORED":
                         tasks.student_task_notification.delay(item.id)
                 return status.HTTP_200_OK, serializer.data
             return status.HTTP_400_BAD_REQUEST, serializer.errors

breathecode/authenticate/management/commands/create_academy_roles.py

@@ -161,6 +161,7 @@
         "slug": "crud_subscription",
         "description": "Create, update or delete subscriptions and plan financings of other users",
     },
+    {"slug": "upload_assignment_telemetry", "description": "Allow upload the user's telemetry in a LearnPack assignment"},
 ]
 
 ROLES = [
@@ -217,6 +218,7 @@
             "read_activity",
             "read_technology",
             "read_academyservice",
+            "upload_assignment_telemetry"
         ],
     },
     {
@@ -300,6 +302,7 @@
             "read_cohort_log",
             "read_service",
             "read_academyservice",
+            "upload_assignment_telemetry"
         ],
     },
 ]

breathecode/authenticate/management/commands/set_permissions.py

@@ -79,7 +79,7 @@
 
 GROUPS = [
     {"name": "Admin", "permissions": [x["codename"] for x in PERMISSIONS], "inherit": []},
-    {"name": "Default", "permissions": ["get_my_profile", "create_my_profile", "update_my_profile"], "inherit": []},
+    {"name": "Default", "permissions": ["get_my_profile", "create_my_profile", "update_my_profile", "upload_assignment_telemetry"], "inherit": []},
     {
         "name": "Student",
         "permissions": [

breathecode/cypress/tests/urls/tests_load_roles.py

@@ -495,7 +495,7 @@ def test_load_roles__check_the_capabilities(self):
 
         for capability in CAPABILITIES:
             self.assertRegex(capability["slug"], r"^[a-z_]+$")
-            self.assertRegex(capability["description"], r'^[a-zA-Z,. _()"]+$')
+            self.assertRegex(capability["description"], r'^[a-zA-Z,. _()"\']+$')
             self.assertEqual(len(capability), 2)
 
     def test_load_roles__check_the_roles(self):

breathecode/marketing/serializers.py

@@ -8,6 +8,7 @@
 
 from breathecode.admissions.models import Academy, Cohort
 from breathecode.monitoring.actions import test_link
+from breathecode.services.activecampaign.client import acp_ids
 from breathecode.utils import serpy
 from breathecode.utils.integer_to_base import to_base
 from capyc.rest_framework.exceptions import ValidationException
@@ -311,7 +312,6 @@ class FormEntryBigSerializer(serpy.Serializer):
     utm_placement = serpy.Field()
     utm_term = serpy.Field()
     utm_plan = serpy.Field()
-    custom_fields = serpy.Field()
     referral_key = serpy.Field()
     tags = serpy.Field()
     automations = serpy.Field()
@@ -341,6 +341,7 @@ class FormEntryBigSerializer(serpy.Serializer):
     academy = AcademySmallSerializer(required=False)
     lead_generation_app = LeadgenAppSmallSerializer(required=False)
     user = UserSmallSerializer(required=False)
+    custom_fields = serpy.MethodField(required=False)
 
     def get_tag_objects(self, obj):
         tag_ids = []
@@ -358,6 +359,30 @@ def get_automation_objects(self, obj):
         automations = Automation.objects.filter(slug__in=automation_ids, ac_academy__academy=obj.calculate_academy())
         return AutomationSmallSerializer(automations, many=True).data
 
+    def get_custom_fields(self, obj):
+
+        if not isinstance(obj.custom_fields, dict):
+            return obj.custom_fields
+
+        def convert_dict(input_dict, mapping_dict):
+            print(input_dict, mapping_dict)
+            # Create an inverse mapping dictionary from the deal_custom_fields
+            inverse_mapping = {v: k for k, v in mapping_dict.items()}
+
+            # Create a new dictionary with the converted keys
+            converted_dict = {}
+            for key, value in input_dict.items():
+                if key in inverse_mapping:
+                    new_key = inverse_mapping[key]
+                    converted_dict[new_key] = value
+                else:
+                    converted_dict[key] = value
+
+            return converted_dict
+
+        out = convert_dict(obj.custom_fields, acp_ids["deal"])
+        return out
+
 
 class GetAcademySmallSerializer(serpy.Serializer):
     id = serpy.Field()

breathecode/payments/tasks.py

@@ -286,11 +286,13 @@ def alert_payment_issue(message: str, button: str) -> None:
             academy=subscription.academy,
         )
 
-        bag.delete()
+        if bag:
+            bag.delete()
 
         subscription.status = "PAYMENT_ISSUE"
         subscription.save()
 
+    bag = None
     client = None
     if IS_DJANGO_REDIS:
         client = get_redis_connection("default")
@@ -375,8 +377,10 @@ def alert_payment_issue(message: str, button: str) -> None:
                     subscription.valid_until += delta
 
             subscription.invoices.add(invoice)
-
+            subscription.status = "ACTIVE"
+            subscription.status_message = None
             subscription.save()
+
             value = invoice.currency.format_price(invoice.amount)
 
             subject = translation(
@@ -462,11 +466,13 @@ def alert_payment_issue(message: str, button: str) -> None:
             academy=plan_financing.academy,
         )
 
-        bag.delete()
+        if bag:
+            bag.delete()
 
         plan_financing.status = "PAYMENT_ISSUE"
         plan_financing.save()
 
+    bag = None
     client = None
     if IS_DJANGO_REDIS:
         client = get_redis_connection("default")
@@ -568,6 +574,9 @@ def alert_payment_issue(message: str, button: str) -> None:
                     remaining_installments -= 1
                     plan_financing.valid_until = utc_now + relativedelta(months=remaining_installments)
 
+                elif remaining_installments > 0:
+                    remaining_installments -= 1
+
                 plan_financing.invoices.add(invoice)
 
                 value = invoice.currency.format_price(invoice.amount)
@@ -600,10 +609,14 @@ def alert_payment_issue(message: str, button: str) -> None:
                 delta += relativedelta(months=1)
 
             plan_financing.next_payment_at += delta
+            plan_financing.status = "ACTIVE" if remaining_installments > 0 else "FULLY_PAID"
+            plan_financing.status_message = None
             plan_financing.save()
 
-            bag.was_delivered = True
-            bag.save()
+            # if this charge but the client paid all its installments, there hasn't been a new bag created
+            if bag:
+                bag.was_delivered = True
+                bag.save()
 
             renew_plan_financing_consumables.delay(plan_financing.id)