Access to neighbour courses homework (#2748)

* QoL: order.refund() now by default issues full refund instead of failing
* Allowed access to the questions and answers from the neighbour courses

Author: f213

src/apps/amocrm/tests/services/order/tests_order_pusher.py

@@ -50,7 +50,7 @@ def not_paid_order_with_lead(factory, user, course, amocrm_lead):
 @pytest.fixture
 def returned_order_with_lead(factory, user, course, amocrm_lead):
     order = factory.order(user=user, item=course, is_paid=True, author=user, amocrm_lead=amocrm_lead)
-    order.refund(order.price)
+    order.refund()
     return order
 
 

src/apps/amocrm/tests/services/order/tests_order_returner.py

@@ -22,13 +22,13 @@ def mock_delete_transaction(mocker):
 @pytest.fixture
 def unpaid_order(mixer, paid_order_with_lead):
     mixer.blend("amocrm.AmoCRMOrderTransaction", order=paid_order_with_lead, amocrm_id=876)
-    paid_order_with_lead.refund(paid_order_with_lead.price)
+    paid_order_with_lead.refund()
     return paid_order_with_lead
 
 
 @pytest.fixture
 def unpaid_order_not_in_amo(paid_order_without_lead):
-    paid_order_without_lead.refund(paid_order_without_lead.price)
+    paid_order_without_lead.refund()
     return paid_order_without_lead
 
 

src/apps/homework/models/question.py

@@ -29,7 +29,7 @@ def for_user(self, user: User) -> "QuestionQuerySet":
         )
 
     def limit_to_questions_from_purchased_course(self, user: User) -> "QuestionQuerySet":
-        purchased_lessons = apps.get_model("lms.Lesson").objects.for_user(user).exclude(question=None)
+        purchased_lessons = apps.get_model("lms.Lesson").objects.for_user_including_neighbour_courses(user).exclude(question=None)
 
         return self.filter(pk__in=purchased_lessons.values("question").distinct())
 

src/apps/homework/services/answer_creator.py

@@ -109,7 +109,7 @@ def validate_parent_slug(self) -> None:
             return
 
         if not is_valid_uuid(self.parent_slug):
-            raise ValidationError("Question should be a valid uuid")
+            raise ValidationError("Parent should be a valid uuid")
 
         if not Answer.objects.filter(slug=self.parent_slug).exists():
             raise ValidationError("Answer does not exist")

src/apps/homework/tests/homework/api/answers/retrieve/tests_answer_retrieve.py

@@ -129,7 +129,7 @@ def test_answers_with_parents_have_parent_field(api, answer, another_answer):
 
 
 def test_200_for_not_purchased_users(api, answer, purchase):
-    purchase.refund(purchase.price)
+    purchase.refund()
 
     api.get(
         f"/api/v2/homework/answers/{answer.slug}/",
@@ -138,7 +138,7 @@ def test_200_for_not_purchased_users(api, answer, purchase):
 
 
 def test_ok_for_superusers_even_when_they_did_not_purchase_the_course(api, answer, purchase):
-    purchase.refund(purchase.price)
+    purchase.refund()
 
     api.user.update(is_superuser=True)
 
@@ -149,7 +149,7 @@ def test_ok_for_superusers_even_when_they_did_not_purchase_the_course(api, answe
 
 
 def test_ok_for_users_with_permission_even_when_they_did_not_purchase_the_course(api, answer, purchase):
-    purchase.refund(purchase.price)
+    purchase.refund()
 
     api.user.add_perm("homework.question.see_all_questions")
 

src/apps/homework/tests/homework/api/answers/tests_answer_create.py

@@ -213,6 +213,22 @@ def test_404_for_not_purchased_users(api, question):
     )
 
 
+@pytest.mark.usefixtures("_no_purchase")
+def test_ok_for_users_that_purchased_another_course_from_the_group(api, question, course, factory):
+    """Create a purchase of the item with the same group as the course, and check if user can post an answer"""
+    another_course = factory.course(group=course.group)
+    factory.order(item=another_course, user=api.user, is_paid=True)
+
+    api.post(
+        "/api/v2/homework/answers/",
+        {
+            "question": question.slug,
+            "content": JSON,
+        },
+        expected_status_code=201,
+    )
+
+
 @pytest.mark.usefixtures("_no_purchase")
 @pytest.mark.parametrize(
     "permission",

src/apps/homework/tests/homework/api/conftest.py

@@ -64,9 +64,10 @@ def purchase_of_another_course(factory, another_course, api):
 
 
 @pytest.fixture
-def _no_purchase(purchase, _set_current_user):
+def _no_purchase(purchase, purchase_of_another_course, _set_current_user):
     """Invalidate the purchase"""
     purchase.refund(amount=purchase.price)
+    purchase_of_another_course.refund(amount=purchase_of_another_course.price)
 
 
 @pytest.fixture

src/apps/homework/tests/homework/api/questions/tests_question_retrieve.py

@@ -10,6 +10,16 @@
 ]
 
 
+@pytest.fixture
+def group(mixer, course, another_course):
+    group = mixer.blend("products.Group")
+
+    course.update(group=group)
+    another_course.update(group=group)
+
+    return group
+
+
 def test_ok(api, question, course):
     got = api.get(f"/api/v2/homework/questions/{question.slug}/")
 
@@ -79,6 +89,22 @@ def test_ok_for_superusers_even_when_they_did_not_purchase_the_course(api, quest
     api.get(f"/api/v2/homework/questions/{question.slug}/", expected_status_code=200)
 
 
+@pytest.mark.usefixtures("group", "purchase_of_another_course", "_set_current_user")
+def test_ok_if_user_purchased_same_course_from_the_group(api, purchase, question):
+    purchase.refund()
+
+    api.get(f"/api/v2/homework/questions/{question.slug}/", expected_status_code=200)
+
+
+@pytest.mark.usefixtures("group", "_set_current_user")
+def test_fail_if_user_has_not_purchased_same_course_from_the_group(api, mixer, purchase, purchase_of_another_course, question):
+    """Same as above, just to make sure above test works"""
+    purchase.refund()
+    purchase_of_another_course.course.update(group=mixer.blend("products.Group"))  # another_group
+
+    api.get(f"/api/v2/homework/questions/{question.slug}/", expected_status_code=404)
+
+
 @pytest.mark.usefixtures("_no_purchase")
 @pytest.mark.parametrize(
     "permission",

src/apps/lms/models/lesson.py

@@ -26,6 +26,15 @@ def for_user(self, user: User) -> "LessonQuerySet":
             module__course__in=purchased_courses,
         )
 
+    def for_user_including_neighbour_courses(self, user: User) -> "LessonQuerySet":
+        """The same as above, but with all courses belonging to the same product groups that user has puchased"""
+        purchased_courses = apps.get_model("studying.Study").objects.filter(student=user).values_list("course_id", flat=True)
+        purchased_groups = apps.get_model("products.Course").objects.filter(pk__in=purchased_courses).values("group_id").distinct()
+
+        return self.filter(
+            module__course__group__in=purchased_groups,
+        )
+
     def for_admin(self) -> "LessonQuerySet":
         return self.select_related(
             "module",

src/apps/orders/models/order.py

@@ -134,7 +134,7 @@ def set_paid(self, silent: bool | None = False) -> None:
 
         OrderPaidSetter(self, silent=silent)()
 
-    def refund(self, amount: Decimal) -> None:
+    def refund(self, amount: Decimal | None = None) -> None:
         from apps.orders.services import OrderRefunder
 
         OrderRefunder(self, amount)()