Merge pull request #206 from PROCOLLAB-github/dev

Изменена система начисления баллов

Author: Toksi86

apps/progress/mapping.py

@@ -17,5 +17,5 @@
 
 
 class AdditionalPoints(Enum):
-    MONTH = 10
-    SKILL = 50
+    MONTH = 0
+    SKILL = 20

apps/questions/mapping.py

@@ -6,11 +6,11 @@
 
 
 class TypeQuestionPoints(Enum):
-    INFO_SLIDE: int = 5
-    QUESTION_SINGLE_ANSWER: int = 5
-    QUESTION_WRITE: int = 5
-    QUESTION_CONNECT: int = 5
-    QUESTION_EXCLUDE: int = 5
+    INFO_SLIDE: int = 20
+    QUESTION_SINGLE_ANSWER: int = 20
+    QUESTION_WRITE: int = 20
+    QUESTION_CONNECT: int = 20
+    QUESTION_EXCLUDE: int = 20
     QUESTION_WO_POINTS: int = 0
 
 

apps/questions/services/check_questions_answers.py

@@ -137,18 +137,23 @@ def _create_tast_obj_result(
         correct_answer: bool = True,
     ):
         """
-        Формирование результата.
-        Если навык Task бесплатный, то без поинтов.
+        Формирование результата выполнения задачи:
+        - 80 / количество задач в навыке
+        - 0 баллов, если задача бесплатная
         """
         if self.request_task_object.task.free_access:
-            point_type = TypeQuestionPoints.QUESTION_WO_POINTS
+            points = 0
+        else:
+            skill = self.request_task_object.task.skill
+            tasks_count = skill.tasks.count() or 1  # защита от деления на 0
+            points = round(80 / tasks_count)
 
-        TaskObjUserResult.objects.create_user_result(
-            self.request_task_object.id,
-            self.request_profile_id,
-            point_type,
+        TaskObjUserResult.objects.create(
+            task_object=self.request_task_object,
+            user_profile_id=self.request_profile_id,
             text=text,
             correct_answer=correct_answer,
+            points_gained=points,
         )
 
     def _delete_self_counter(self):

apps/tests/courses_tests/test_courses_response.py

@@ -285,7 +285,7 @@ class TestTaskResultPathResponse:
     OLD_SUB_NEXT_TASK_ID: int = 2
     NEW_SUB_PERCENT_PROGRESS: int = 50
     OLD_SUB_PERCENT_PROGRESS: int = 13
-    POINTS_GAINED: int = 5
+    POINTS_GAINED: int = 20
     DONE_CORRECT: int = 1
 
     @pytest.mark.usefixtures("full_filled_published_skill")
@@ -540,7 +540,9 @@ def test_task_of_skill_new_sub_full_done(self, api_auth_with_sub_client: APIClie
         assert response_dct["stats_of_weeks"][0]["is_done"] is True, (
             "Засчитало неделю неверно."
         )
-        assert response_dct["stats_of_weeks"][0]["done_on_time"] is True, (
+        # Значение изменено на False: 
+        # система больше не учитывает бонусные баллы за месяц. 
+        assert response_dct["stats_of_weeks"][0]["done_on_time"] is False, (
             "Засчитало неделю неверно."
         )
         assert response_dct["tasks"][0]["status"] is True, "Засчитало задачу неверно."

apps/tests/fixtures/skill_answers.py

@@ -29,19 +29,19 @@ def skill_three_users_answers(
             TaskObjUserResult.objects.create(
                 task_object_id=task_obj_idx,
                 user_profile=user_admin_with_trial_sub.profiles,
-                points_gained=5
+                points_gained=20
             )
         for task_obj_idx in range(1, 3):
             TaskObjUserResult.objects.create(
                 task_object_id=task_obj_idx,
                 user_profile=user_staff_with_trial_sub.profiles,
-                points_gained=5
+                points_gained=20
             )
 
         TaskObjUserResult.objects.create(
             task_object_id=1,
             user_profile=user_with_trial_sub.profiles,
-            points_gained=5
+            points_gained=20
         )
 
 

apps/tests/progress_tests/test_progress_response.py

@@ -48,7 +48,7 @@ class TestProgressProfileResponse:
     Тесты пути: `/progress/profile/`
     """
 
-    POINTS_IN_PROFILE: int = 5
+    POINTS_IN_PROFILE: int = 20
     SKILL_PERCENT_DONE: int = 13
 
     def test_progress_profile_new_sub_full_data(self, api_auth_with_sub_client: APIClient):
@@ -131,7 +131,7 @@ class TestUserScoreRating:
     Тесты пути: `/progress/user-rating/?time_frame=...`
     """
 
-    SINGLE_SCORE_COUNT = 5
+    SINGLE_SCORE_COUNT = 20
 
     @pytest.mark.parametrize("time_frame", ("last_day", "last_month", "last_year"))
     def test_empty_data_without_answers(self, time_frame: str, api_auth_with_sub_client: APIClient):
@@ -169,7 +169,11 @@ def test_free_single_answer_by_new_sub(self, time_frame: str, api_auth_with_sub_
     def test_user_rating_with_different_roles(self, time_frame: str, api_auth_with_sub_client: APIClient):
         """Все ответы даны в 1 время, таймлайн не решает, рейтинг по дате должен быть одинаковым."""
         response = api_auth_with_sub_client.get(constants.USER_SCORE_RATING_PATH + f"?time_frame={time_frame}")
+        print("1"*100)
+        print(response)
         response_dct = response.json()
+        print("1"*100)
+        print(response_dct)
         assert (
             response_dct["count"] == 1
         ), "В рейтинге должeн быть 1 пользователь (Стафф и админ не должны отображаться)"