let a finished island quiz open the next island, and ground ask-AI in the student's book
The frontend plays node quizzes, but a node only completed once every one of its
8-13 lessons was completed separately, so students were stuck after the first
island of each unit. POST /api/nodes/{id}/quiz/complete now completes the node
(any score; score only sets stars/xp) and returns nextNodeId.
Also closes the other backend gaps found while auditing the frontend:
- /api/ai/ask without lessonId now picks the book from the user's grade instead
of skipping retrieval, so the "ask Pi" tab is grounded in the textbook.
- guest sessions return a refreshToken; they used to go silently 401 after 1h.
- lesson_complete throttle 10/hour -> 120/hour (a lesson here is 1-2 questions).
- progressPercent is per grade, not over all 2,617 lessons of every grade.
- a one-year plan (299,000 toman) is created by migration when no plan exists.
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -10,7 +10,7 @@ from django.utils import timezone
|
||||
|
||||
from statuslog.signals import status_changed
|
||||
|
||||
from .models import NodeProgress, UserLessonCompletion
|
||||
from .models import Lesson, Node, NodeProgress, UserLessonCompletion, UserNodeCompletion
|
||||
|
||||
|
||||
def _get_or_create_progress(user_id, node):
|
||||
@@ -78,6 +78,11 @@ def update_node_progress_on_lesson_completion(user_id, lesson):
|
||||
if lesson_ids and completed_count >= len(lesson_ids):
|
||||
progress.status = 'completed'
|
||||
progress.completed_at = now
|
||||
elif UserNodeCompletion.objects.filter(user_id=user_id, node=node).exists():
|
||||
# آزمونِ مبحث قبلاً تمام شده؛ درسِ تازه نباید مبحث را به
|
||||
# in_progress برگرداند.
|
||||
progress.status = 'completed'
|
||||
progress.completed_at = progress.completed_at or now
|
||||
else:
|
||||
progress.status = 'in_progress'
|
||||
|
||||
@@ -89,6 +94,73 @@ def update_node_progress_on_lesson_completion(user_id, lesson):
|
||||
return progress
|
||||
|
||||
|
||||
def mark_node_completed_by_quiz(user_id, node):
|
||||
"""پایانِ آزمونِ مبحث → NodeProgress همان مبحث completed میشود."""
|
||||
with transaction.atomic():
|
||||
progress, _created = _get_or_create_progress(user_id, node)
|
||||
old_status = progress.status
|
||||
now = timezone.now()
|
||||
progress.status = 'completed'
|
||||
progress.started_at = progress.started_at or now
|
||||
progress.completed_at = progress.completed_at or now
|
||||
progress.last_activity_at = now
|
||||
progress.save(update_fields=['status', 'started_at', 'completed_at', 'last_activity_at'])
|
||||
_emit_if_changed(progress, old_status, event='node_quiz_completed', user_id=user_id)
|
||||
return progress
|
||||
|
||||
|
||||
def quiz_completed_node_ids(user_id, node_ids):
|
||||
"""از میانِ node_ids، آنهایی که کاربر آزمونشان را تمام کرده."""
|
||||
if not node_ids:
|
||||
return set()
|
||||
return set(
|
||||
UserNodeCompletion.objects.filter(user_id=user_id, node_id__in=node_ids)
|
||||
.values_list('node_id', flat=True)
|
||||
)
|
||||
|
||||
|
||||
def grade_progress_percent(user_id, grade_id):
|
||||
"""
|
||||
درصدِ پیشرفت در پایهی خودِ کاربر: درسهای تمامشده، بهاضافهی همهی
|
||||
درسهای مبحثهایی که آزمونشان تمام شده، تقسیم بر کلِ درسهای پایه.
|
||||
|
||||
قبلاً مخرج کلِ درسهای همهی پایهها بود (۲٬۶۱۷ تا)، پس دانشآموزی که
|
||||
پایهی خودش را کامل تمام میکرد هم حدودِ ۱۰٪ میدید.
|
||||
"""
|
||||
if not grade_id:
|
||||
return 0
|
||||
lesson_ids = set(
|
||||
Lesson.objects.filter(node__unit__grade_id=grade_id).values_list('id', flat=True)
|
||||
)
|
||||
if not lesson_ids:
|
||||
return 0
|
||||
done = set(
|
||||
UserLessonCompletion.objects.filter(user_id=user_id, lesson_id__in=lesson_ids)
|
||||
.values_list('lesson_id', flat=True)
|
||||
)
|
||||
quiz_nodes = UserNodeCompletion.objects.filter(
|
||||
user_id=user_id, node__unit__grade_id=grade_id,
|
||||
).values_list('node_id', flat=True)
|
||||
done |= set(Lesson.objects.filter(node_id__in=quiz_nodes).values_list('id', flat=True))
|
||||
return round(min(len(done) / len(lesson_ids), 1.0) * 100, 2)
|
||||
|
||||
|
||||
def next_node_after(node):
|
||||
"""مبحثِ بعدی روی نقشه: بعدی در همان فصل، وگرنه اولینِ فصلِ بعد، وگرنه None."""
|
||||
following = (
|
||||
Node.objects.filter(unit=node.unit, order__gt=node.order).order_by('order', 'id').first()
|
||||
or Node.objects.filter(unit=node.unit, order=node.order, id__gt=node.id).order_by('id').first()
|
||||
)
|
||||
if following:
|
||||
return following
|
||||
unit = node.unit
|
||||
next_unit_node = (
|
||||
Node.objects.filter(unit__grade_id=unit.grade_id, unit__order__gt=unit.order)
|
||||
.order_by('unit__order', 'unit_id', 'order', 'id').first()
|
||||
)
|
||||
return next_unit_node
|
||||
|
||||
|
||||
def node_progress_summary(node):
|
||||
"""برای سریالایزر: تعداد کل Lessonهای یک Node (لازم برای lessonsTotal)."""
|
||||
return node.lessons.count()
|
||||
|
||||
Reference in New Issue
Block a user