Archived
feat: US #32 Section-based Reading Recommendations
Backend: - Add ReadingSchedule and MeetingSection models for ebook reading schedules - Implement recommendation algorithm: greedy partition minimizing per-meeting time variance - Algorithm respects chapter boundaries, estimates time based on chapter weight - Add serializers for schedules (list/detail/generate/confirm/update) - Add ScheduleViewSet with endpoints: list, create (generate), retrieve, regenerate, confirm, update_meeting, reorder_meetings - Add URL routes for /api/books/schedules/ - Create migration 0004 for new models Frontend: - Add types: MeetingSection, ReadingSchedule, GenerateRecommendationsRequest - Add schedulesApi with methods: getSchedules, generateRecommendations, confirmSchedule, updateMeeting, reorderMeetings, deleteSchedule - Build RecommendationPage with 4-column meeting layout, drag-and-drop chapter reassignment, generate/regenerate/confirm flow - Add 'Schedule Reading' menu item to BookContextMenu - Add route: /books/:ebookId/schedule
This commit is contained in:
@@ -0,0 +1,52 @@
|
|||||||
|
from django.conf import settings
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("books", "0003_readingprogress_epub_location"),
|
||||||
|
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.CreateModel(
|
||||||
|
name="ReadingSchedule",
|
||||||
|
fields=[
|
||||||
|
("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
|
||||||
|
("meeting_count", models.PositiveIntegerField(default=4)),
|
||||||
|
("confirmed", models.BooleanField(default=False)),
|
||||||
|
("created_at", models.DateTimeField(auto_now_add=True)),
|
||||||
|
("updated_at", models.DateTimeField(auto_now=True)),
|
||||||
|
("ebook", models.ForeignKey(on_delete=models.CASCADE, related_name="schedules", to="books.ebook")),
|
||||||
|
("user", models.ForeignKey(on_delete=models.CASCADE, related_name="schedules", to=settings.AUTH_USER_MODEL)),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
"db_table": "books_reading_schedule",
|
||||||
|
"verbose_name": "Reading Schedule",
|
||||||
|
"verbose_name_plural": "Reading Schedules",
|
||||||
|
"ordering": ["-created_at"],
|
||||||
|
"unique_together": {("ebook", "user")},
|
||||||
|
"indexes": [models.Index(fields=["ebook", "user"], name="books_reading_schedule_ebook_user_idx")],
|
||||||
|
},
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name="MeetingSection",
|
||||||
|
fields=[
|
||||||
|
("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
|
||||||
|
("meeting_index", models.PositiveIntegerField()),
|
||||||
|
("title", models.CharField(default="Meeting", max_length=256)),
|
||||||
|
("estimated_time_minutes", models.PositiveIntegerField(default=0)),
|
||||||
|
("chapter_ids", models.JSONField(default=list)),
|
||||||
|
("schedule", models.ForeignKey(on_delete=models.CASCADE, related_name="meetings", to="books.readingschedule")),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
"db_table": "books_meeting_section",
|
||||||
|
"verbose_name": "Meeting Section",
|
||||||
|
"verbose_name_plural": "Meeting Sections",
|
||||||
|
"ordering": ["meeting_index"],
|
||||||
|
"unique_together": {("schedule", "meeting_index")},
|
||||||
|
"indexes": [models.Index(fields=["schedule", "meeting_index"], name="books_meeting_section_schedule_meeting_idx")],
|
||||||
|
},
|
||||||
|
),
|
||||||
|
]
|
||||||
@@ -154,3 +154,46 @@ class ReadingProgress(models.Model):
|
|||||||
"device_id", "device_name", "version", "updated_at",
|
"device_id", "device_name", "version", "updated_at",
|
||||||
])
|
])
|
||||||
return self, True
|
return self, True
|
||||||
|
|
||||||
|
|
||||||
|
class ReadingSchedule(models.Model):
|
||||||
|
"""A reading schedule that groups sections into weekly meetings for an ebook."""
|
||||||
|
|
||||||
|
ebook = models.ForeignKey(EBook, on_delete=models.CASCADE, related_name="schedules")
|
||||||
|
user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="schedules")
|
||||||
|
meeting_count = models.PositiveIntegerField(default=4)
|
||||||
|
confirmed = models.BooleanField(default=False)
|
||||||
|
created_at = models.DateTimeField(auto_now_add=True)
|
||||||
|
updated_at = models.DateTimeField(auto_now=True)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
db_table = "books_reading_schedule"
|
||||||
|
verbose_name = "Reading Schedule"
|
||||||
|
verbose_name_plural = "Reading Schedules"
|
||||||
|
ordering = ["-created_at"]
|
||||||
|
unique_together = [("ebook", "user")]
|
||||||
|
indexes = [models.Index(fields=["ebook", "user"])]
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return f"Schedule for {self.ebook.title} ({self.meeting_count} meetings)"
|
||||||
|
|
||||||
|
|
||||||
|
class MeetingSection(models.Model):
|
||||||
|
"""A single meeting within a reading schedule, containing assigned chapters."""
|
||||||
|
|
||||||
|
schedule = models.ForeignKey(ReadingSchedule, on_delete=models.CASCADE, related_name="meetings")
|
||||||
|
meeting_index = models.PositiveIntegerField()
|
||||||
|
title = models.CharField(max_length=256, default="Meeting")
|
||||||
|
estimated_time_minutes = models.PositiveIntegerField(default=0)
|
||||||
|
chapter_ids = models.JSONField(default=list)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
db_table = "books_meeting_section"
|
||||||
|
verbose_name = "Meeting Section"
|
||||||
|
verbose_name_plural = "Meeting Sections"
|
||||||
|
ordering = ["meeting_index"]
|
||||||
|
unique_together = [("schedule", "meeting_index")]
|
||||||
|
indexes = [models.Index(fields=["schedule", "meeting_index"])]
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return f"Meeting {self.meeting_index + 1}: {self.title}"
|
||||||
@@ -2,7 +2,7 @@ from rest_framework import serializers
|
|||||||
|
|
||||||
import logging
|
import logging
|
||||||
|
|
||||||
from apps.books.models import Book, BookChapter, EBook, ReadingProgress, ReadingStatus, DownloadRecord
|
from apps.books.models import Book, BookChapter, EBook, MeetingSection, ReadingProgress, ReadingSchedule, ReadingStatus, DownloadRecord
|
||||||
from apps.books.services.ebook_metadata import subjects_from_ebook
|
from apps.books.services.ebook_metadata import subjects_from_ebook
|
||||||
from apps.books.services.metadata import enrich_ebook_metadata
|
from apps.books.services.metadata import enrich_ebook_metadata
|
||||||
from apps.books.services.process_ebook import apply_processing_to_ebook
|
from apps.books.services.process_ebook import apply_processing_to_ebook
|
||||||
@@ -229,3 +229,63 @@ class StorageSummarySerializer(serializers.Serializer):
|
|||||||
total_downloads = serializers.IntegerField()
|
total_downloads = serializers.IntegerField()
|
||||||
total_size_bytes = serializers.IntegerField()
|
total_size_bytes = serializers.IntegerField()
|
||||||
ebooks = serializers.ListField(child=serializers.DictField())
|
ebooks = serializers.ListField(child=serializers.DictField())
|
||||||
|
|
||||||
|
|
||||||
|
class MeetingSectionSerializer(serializers.ModelSerializer):
|
||||||
|
chapters = serializers.SerializerMethodField()
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = MeetingSection
|
||||||
|
fields = [
|
||||||
|
"id", "meeting_index", "title", "estimated_time_minutes",
|
||||||
|
"chapter_ids", "chapters",
|
||||||
|
]
|
||||||
|
read_only_fields = ["id"]
|
||||||
|
|
||||||
|
def get_chapters(self, obj: MeetingSection) -> list[dict[str, str | int]]:
|
||||||
|
"""Resolve chapter_ids to chapter title/index/href for the frontend."""
|
||||||
|
if not obj.chapter_ids:
|
||||||
|
return []
|
||||||
|
chapters_qs = BookChapter.objects.filter(
|
||||||
|
id__in=obj.chapter_ids,
|
||||||
|
ebook=obj.schedule.ebook,
|
||||||
|
).order_by("index").values("id", "title", "index", "href")
|
||||||
|
return list(chapters_qs)
|
||||||
|
|
||||||
|
|
||||||
|
class MeetingSectionUpdateSerializer(serializers.Serializer):
|
||||||
|
"""Used when updating meeting sections (drag-and-drop reassignment)."""
|
||||||
|
meeting_id = serializers.IntegerField(required=False)
|
||||||
|
meeting_index = serializers.IntegerField(required=False)
|
||||||
|
chapter_ids = serializers.ListField(child=serializers.IntegerField(), required=False)
|
||||||
|
title = serializers.CharField(max_length=256, required=False)
|
||||||
|
|
||||||
|
def validate_chapter_ids(self, value: list[int]) -> list[int]:
|
||||||
|
if not value:
|
||||||
|
raise serializers.ValidationError("chapter_ids must not be empty.")
|
||||||
|
return value
|
||||||
|
|
||||||
|
|
||||||
|
class ReadingScheduleSerializer(serializers.ModelSerializer):
|
||||||
|
meetings = MeetingSectionSerializer(many=True, read_only=True)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = ReadingSchedule
|
||||||
|
fields = [
|
||||||
|
"id", "ebook", "meeting_count", "confirmed",
|
||||||
|
"meetings", "created_at", "updated_at",
|
||||||
|
]
|
||||||
|
read_only_fields = ["id", "ebook", "created_at", "updated_at"]
|
||||||
|
|
||||||
|
|
||||||
|
class GenerateRecommendationsSerializer(serializers.Serializer):
|
||||||
|
meeting_count = serializers.IntegerField(default=4, min_value=2, max_value=12)
|
||||||
|
|
||||||
|
def validate_meeting_count(self, value: int) -> int:
|
||||||
|
if value < 2 or value > 12:
|
||||||
|
raise serializers.ValidationError("Meeting count must be between 2 and 12.")
|
||||||
|
return value
|
||||||
|
|
||||||
|
|
||||||
|
class ConfirmScheduleSerializer(serializers.Serializer):
|
||||||
|
confirm = serializers.BooleanField(default=True)
|
||||||
@@ -0,0 +1,229 @@
|
|||||||
|
"""Recommendation engine for splitting book chapters into balanced weekly meetings.
|
||||||
|
|
||||||
|
Algorithm:
|
||||||
|
1. Gather all BookChapters for an ebook (flat list, respecting hierarchy).
|
||||||
|
2. For each chapter, estimate reading time based on content length or default weight.
|
||||||
|
3. Partition chapters into N meetings (default 4) minimizing per-meeting time variance
|
||||||
|
while respecting chapter boundaries (never split a chapter).
|
||||||
|
4. Optionally prefer natural boundaries: if a chapter's children exist,
|
||||||
|
keep siblings together where possible.
|
||||||
|
"""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import logging
|
||||||
|
from dataclasses import dataclass, field
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
from apps.books.models import BookChapter, EBook, MeetingSection, ReadingSchedule
|
||||||
|
|
||||||
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
DEFAULT_MEETING_COUNT = 4
|
||||||
|
|
||||||
|
|
||||||
|
@dataclass
|
||||||
|
class ChapterWithWeight:
|
||||||
|
chapter_id: int
|
||||||
|
title: str
|
||||||
|
href: str
|
||||||
|
index: int
|
||||||
|
weight: float # estimated reading time weight
|
||||||
|
children: list[int] = field(default_factory=list)
|
||||||
|
|
||||||
|
|
||||||
|
def _collect_chapters(ebook: EBook) -> list[ChapterWithWeight]:
|
||||||
|
"""Collect all chapters for an ebook as a flat, ordered list with weights."""
|
||||||
|
chapters_qs = (
|
||||||
|
BookChapter.objects.filter(ebook=ebook)
|
||||||
|
.order_by("index")
|
||||||
|
.prefetch_related("ebook")
|
||||||
|
)
|
||||||
|
chapters = list(chapters_qs)
|
||||||
|
|
||||||
|
# Build a map of chapter id -> ChapterWithWeight
|
||||||
|
result: list[ChapterWithWeight] = []
|
||||||
|
for ch in chapters:
|
||||||
|
weight = _estimate_chapter_weight(ch)
|
||||||
|
result.append(
|
||||||
|
ChapterWithWeight(
|
||||||
|
chapter_id=ch.id,
|
||||||
|
title=ch.title,
|
||||||
|
href=ch.href or "",
|
||||||
|
index=ch.index,
|
||||||
|
weight=weight,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def _estimate_chapter_weight(chapter: BookChapter) -> float:
|
||||||
|
"""Estimate reading time weight for a chapter.
|
||||||
|
|
||||||
|
Defaults to 1.0 per chapter. Sub-chapters (those with non-empty children)
|
||||||
|
get a weight proportional to their child count + 1.
|
||||||
|
"""
|
||||||
|
children = chapter.children or []
|
||||||
|
child_count = len(children)
|
||||||
|
if child_count > 0:
|
||||||
|
return float(child_count + 1)
|
||||||
|
return 1.0
|
||||||
|
|
||||||
|
|
||||||
|
def _partition_chapters(
|
||||||
|
chapters: list[ChapterWithWeight],
|
||||||
|
num_meetings: int = DEFAULT_MEETING_COUNT,
|
||||||
|
) -> list[list[ChapterWithWeight]]:
|
||||||
|
"""Partition chapters into `num_meetings` groups minimizing weight variance.
|
||||||
|
|
||||||
|
Uses a greedy approach: compute target weight per meeting, then place
|
||||||
|
chapters sequentially, starting a new meeting when cumulative weight
|
||||||
|
exceeds the target and adding the overflow to the next meeting.
|
||||||
|
|
||||||
|
Never splits a chapter — boundaries are always at chapter edges.
|
||||||
|
"""
|
||||||
|
if not chapters:
|
||||||
|
return [[] for _ in range(num_meetings)]
|
||||||
|
|
||||||
|
total_weight = sum(ch.weight for ch in chapters)
|
||||||
|
target_weight = total_weight / num_meetings
|
||||||
|
|
||||||
|
meetings: list[list[ChapterWithWeight]] = []
|
||||||
|
current_meeting: list[ChapterWithWeight] = []
|
||||||
|
current_weight = 0.0
|
||||||
|
|
||||||
|
for ch in chapters:
|
||||||
|
# If adding this chapter would overshoot target significantly
|
||||||
|
# and we have at least one chapter in current meeting,
|
||||||
|
# and there are more meetings to fill, start a new meeting
|
||||||
|
if (
|
||||||
|
current_meeting
|
||||||
|
and len(meetings) < num_meetings - 1
|
||||||
|
and current_weight + ch.weight > target_weight * 1.4
|
||||||
|
and current_weight >= target_weight * 0.5
|
||||||
|
):
|
||||||
|
meetings.append(current_meeting)
|
||||||
|
current_meeting = []
|
||||||
|
current_weight = 0.0
|
||||||
|
|
||||||
|
current_meeting.append(ch)
|
||||||
|
current_weight += ch.weight
|
||||||
|
|
||||||
|
# Add the last meeting
|
||||||
|
if current_meeting:
|
||||||
|
meetings.append(current_meeting)
|
||||||
|
|
||||||
|
# Pad or balance: if we have fewer meetings than requested, split the largest
|
||||||
|
while len(meetings) < num_meetings and len(meetings) >= 1:
|
||||||
|
# Find the largest meeting to split
|
||||||
|
largest_idx = max(
|
||||||
|
range(len(meetings)),
|
||||||
|
key=lambda i: sum(c.weight for c in meetings[i]),
|
||||||
|
)
|
||||||
|
largest = meetings[largest_idx]
|
||||||
|
if len(largest) <= 1:
|
||||||
|
break
|
||||||
|
mid = len(largest) // 2
|
||||||
|
meetings[largest_idx] = largest[:mid]
|
||||||
|
meetings.insert(largest_idx + 1, largest[mid:])
|
||||||
|
|
||||||
|
# If we have more meetings than requested (shouldn't normally happen),
|
||||||
|
# merge the smallest adjacent pair
|
||||||
|
while len(meetings) > num_meetings:
|
||||||
|
best_merge = min(
|
||||||
|
range(len(meetings) - 1),
|
||||||
|
key=lambda i: sum(c.weight for c in meetings[i])
|
||||||
|
+ sum(c.weight for c in meetings[i + 1]),
|
||||||
|
)
|
||||||
|
merged = meetings[best_merge] + meetings[best_merge + 1]
|
||||||
|
meetings[best_merge] = merged
|
||||||
|
del meetings[best_merge + 1]
|
||||||
|
|
||||||
|
return meetings
|
||||||
|
|
||||||
|
|
||||||
|
def generate_recommendations(
|
||||||
|
ebook: EBook,
|
||||||
|
user,
|
||||||
|
meeting_count: int = DEFAULT_MEETING_COUNT,
|
||||||
|
) -> ReadingSchedule:
|
||||||
|
"""Generate section-based reading recommendations for an ebook.
|
||||||
|
|
||||||
|
Creates (or replaces) a ReadingSchedule with MeetingSections.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
ebook: The EBook to generate recommendations for.
|
||||||
|
user: The requesting user.
|
||||||
|
meeting_count: Number of weekly meetings (default 4).
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
The created ReadingSchedule instance.
|
||||||
|
"""
|
||||||
|
chapters = _collect_chapters(ebook)
|
||||||
|
|
||||||
|
# Delete any existing schedule for this ebook/user
|
||||||
|
ReadingSchedule.objects.filter(ebook=ebook, user=user).delete()
|
||||||
|
|
||||||
|
schedule = ReadingSchedule.objects.create(
|
||||||
|
ebook=ebook,
|
||||||
|
user=user,
|
||||||
|
meeting_count=meeting_count,
|
||||||
|
)
|
||||||
|
|
||||||
|
if not chapters:
|
||||||
|
# Create empty meetings
|
||||||
|
for i in range(meeting_count):
|
||||||
|
MeetingSection.objects.create(
|
||||||
|
schedule=schedule,
|
||||||
|
meeting_index=i,
|
||||||
|
title=f"Week {i + 1}",
|
||||||
|
)
|
||||||
|
return schedule
|
||||||
|
|
||||||
|
partition = _partition_chapters(chapters, meeting_count)
|
||||||
|
|
||||||
|
for meeting_idx, meeting_chapters in enumerate(partition):
|
||||||
|
chapter_ids = [ch.chapter_id for ch in meeting_chapters]
|
||||||
|
total_weight = sum(ch.weight for ch in meeting_chapters)
|
||||||
|
|
||||||
|
# Build a descriptive title from first and last chapter
|
||||||
|
first = meeting_chapters[0].title if meeting_chapters else "No chapters"
|
||||||
|
last = meeting_chapters[-1].title if len(meeting_chapters) > 1 else ""
|
||||||
|
if last and last != first:
|
||||||
|
title = f"{first} → {last}"
|
||||||
|
else:
|
||||||
|
title = first
|
||||||
|
|
||||||
|
# Truncate title if too long
|
||||||
|
if len(title) > 200:
|
||||||
|
title = title[:197] + "..."
|
||||||
|
|
||||||
|
# Estimate time: ~5 minutes per weight point (adjustable heuristic)
|
||||||
|
estimated_time = max(5, int(total_weight * 5))
|
||||||
|
|
||||||
|
MeetingSection.objects.create(
|
||||||
|
schedule=schedule,
|
||||||
|
meeting_index=meeting_idx,
|
||||||
|
title=title,
|
||||||
|
estimated_time_minutes=estimated_time,
|
||||||
|
chapter_ids=chapter_ids,
|
||||||
|
)
|
||||||
|
|
||||||
|
return schedule
|
||||||
|
|
||||||
|
|
||||||
|
def regenerate_recommendations(schedule: ReadingSchedule) -> ReadingSchedule:
|
||||||
|
"""Regenerate recommendations for an existing schedule."""
|
||||||
|
return generate_recommendations(
|
||||||
|
ebook=schedule.ebook,
|
||||||
|
user=schedule.user,
|
||||||
|
meeting_count=schedule.meeting_count,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def confirm_schedule(schedule: ReadingSchedule) -> ReadingSchedule:
|
||||||
|
"""Confirm/finalize a reading schedule."""
|
||||||
|
schedule.confirmed = True
|
||||||
|
schedule.save(update_fields=["confirmed", "updated_at"])
|
||||||
|
return schedule
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
from django.urls import include, path
|
from django.urls import include, path
|
||||||
from rest_framework.routers import DefaultRouter
|
from rest_framework.routers import DefaultRouter
|
||||||
|
|
||||||
from apps.books.views import BookViewSet, EBookViewSet, book_reading_settings_view
|
from apps.books.views import BookViewSet, EBookViewSet, ScheduleViewSet, book_reading_settings_view
|
||||||
|
|
||||||
router = DefaultRouter()
|
router = DefaultRouter()
|
||||||
router.register(r"ebooks", EBookViewSet, basename="ebook")
|
router.register(r"ebooks", EBookViewSet, basename="ebook")
|
||||||
|
router.register(r"schedules", ScheduleViewSet, basename="schedule")
|
||||||
router.register(r"", BookViewSet, basename="book")
|
router.register(r"", BookViewSet, basename="book")
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
|
|||||||
+172
-4
@@ -13,12 +13,13 @@ from rest_framework.permissions import AllowAny, IsAuthenticated
|
|||||||
from rest_framework.request import Request
|
from rest_framework.request import Request
|
||||||
from rest_framework.response import Response
|
from rest_framework.response import Response
|
||||||
|
|
||||||
from apps.books.models import Book, BookChapter, DownloadRecord, EBook, ReadingProgress
|
from apps.books.models import Book, BookChapter, DownloadRecord, EBook, MeetingSection, ReadingProgress, ReadingSchedule
|
||||||
from apps.books.serializers import (
|
from apps.books.serializers import (
|
||||||
BookChapterSerializer, BookDetailSerializer, BookListSerializer, BookReadingSettingsSerializer,
|
BookChapterSerializer, BookDetailSerializer, BookListSerializer, BookReadingSettingsSerializer,
|
||||||
BookSerializer, DownloadRecordSerializer, EBookContentSerializer, EBookDetailSerializer,
|
BookSerializer, ConfirmScheduleSerializer, DownloadRecordSerializer, EBookContentSerializer,
|
||||||
EBookListSerializer, EBookTocSerializer, EBookUploadSerializer,
|
EBookDetailSerializer, EBookListSerializer, EBookTocSerializer, EBookUploadSerializer,
|
||||||
ReadingProgressSerializer, StorageSummarySerializer,
|
GenerateRecommendationsSerializer, MeetingSectionSerializer, MeetingSectionUpdateSerializer,
|
||||||
|
ReadingProgressSerializer, ReadingScheduleSerializer, StorageSummarySerializer,
|
||||||
)
|
)
|
||||||
from apps.reader.models import ReadingSettings
|
from apps.reader.models import ReadingSettings
|
||||||
from apps.books.services.ebook_metadata import subjects_from_ebook
|
from apps.books.services.ebook_metadata import subjects_from_ebook
|
||||||
@@ -324,3 +325,170 @@ def book_reading_settings_view(request: Request) -> Response:
|
|||||||
serializer.is_valid(raise_exception=True)
|
serializer.is_valid(raise_exception=True)
|
||||||
serializer.save()
|
serializer.save()
|
||||||
return Response(serializer.data)
|
return Response(serializer.data)
|
||||||
|
|
||||||
|
|
||||||
|
class IsScheduleOwner(permissions.BasePermission):
|
||||||
|
def has_permission(self, request: Request, view: object) -> bool:
|
||||||
|
if view.action == "create":
|
||||||
|
ebook_id = request.data.get("ebook") or request.query_params.get("ebook_id")
|
||||||
|
if ebook_id:
|
||||||
|
return EBook.objects.filter(id=ebook_id, user=request.user).exists()
|
||||||
|
return True
|
||||||
|
return True
|
||||||
|
|
||||||
|
def has_object_permission(self, request: Request, view: object, obj: ReadingSchedule) -> bool:
|
||||||
|
return obj.user == request.user
|
||||||
|
|
||||||
|
|
||||||
|
class ScheduleViewSet(viewsets.ModelViewSet):
|
||||||
|
"""ViewSet for generating, viewing, updating, and confirming reading schedules."""
|
||||||
|
|
||||||
|
permission_classes = [IsAuthenticated, IsScheduleOwner]
|
||||||
|
http_method_names = ["get", "post", "patch", "delete", "head", "options"]
|
||||||
|
|
||||||
|
def get_serializer_class(self):
|
||||||
|
if self.action == "generate":
|
||||||
|
return GenerateRecommendationsSerializer
|
||||||
|
if self.action == "confirm":
|
||||||
|
return ConfirmScheduleSerializer
|
||||||
|
if self.action in ("update_meeting",):
|
||||||
|
return MeetingSectionUpdateSerializer
|
||||||
|
return ReadingScheduleSerializer
|
||||||
|
|
||||||
|
def get_queryset(self):
|
||||||
|
return (
|
||||||
|
ReadingSchedule.objects.filter(user=self.request.user)
|
||||||
|
.select_related("ebook")
|
||||||
|
.prefetch_related("meetings")
|
||||||
|
.order_by("-created_at")
|
||||||
|
)
|
||||||
|
|
||||||
|
def list(self, request: Request) -> Response:
|
||||||
|
"""List all schedules for the current user."""
|
||||||
|
queryset = self.get_queryset()
|
||||||
|
serializer = self.get_serializer(queryset, many=True)
|
||||||
|
return Response(serializer.data)
|
||||||
|
|
||||||
|
def retrieve(self, request: Request, pk: int | None = None) -> Response:
|
||||||
|
"""Get a single schedule with meetings."""
|
||||||
|
schedule = self.get_object()
|
||||||
|
serializer = self.get_serializer(schedule)
|
||||||
|
return Response(serializer.data)
|
||||||
|
|
||||||
|
def create(self, request: Request) -> Response:
|
||||||
|
"""Generate recommendations for an ebook. Expects {ebook_id, meeting_count?}."""
|
||||||
|
serializer = GenerateRecommendationsSerializer(data=request.data)
|
||||||
|
serializer.is_valid(raise_exception=True)
|
||||||
|
meeting_count = serializer.validated_data["meeting_count"]
|
||||||
|
|
||||||
|
ebook_id = request.data.get("ebook") or request.data.get("ebook_id")
|
||||||
|
if not ebook_id:
|
||||||
|
return Response(
|
||||||
|
{"error": "ebook (id) is required."},
|
||||||
|
status=status.HTTP_400_BAD_REQUEST,
|
||||||
|
)
|
||||||
|
|
||||||
|
try:
|
||||||
|
ebook = EBook.objects.get(id=ebook_id, user=request.user)
|
||||||
|
except EBook.DoesNotExist:
|
||||||
|
return Response(
|
||||||
|
{"error": "EBook not found or not owned by you."},
|
||||||
|
status=status.HTTP_404_NOT_FOUND,
|
||||||
|
)
|
||||||
|
|
||||||
|
from apps.books.services.recommendation_engine import generate_recommendations
|
||||||
|
|
||||||
|
schedule = generate_recommendations(ebook, request.user, meeting_count=meeting_count)
|
||||||
|
out = ReadingScheduleSerializer(schedule, context={"request": request})
|
||||||
|
return Response(out.data, status=status.HTTP_201_CREATED)
|
||||||
|
|
||||||
|
@action(detail=True, methods=["post"])
|
||||||
|
def generate(self, request: Request, pk: int | None = None) -> Response:
|
||||||
|
"""Re-generate recommendations for an existing schedule."""
|
||||||
|
schedule = self.get_object()
|
||||||
|
serializer = GenerateRecommendationsSerializer(data=request.data)
|
||||||
|
serializer.is_valid(raise_exception=True)
|
||||||
|
meeting_count = serializer.validated_data["meeting_count"]
|
||||||
|
|
||||||
|
from apps.books.services.recommendation_engine import regenerate_recommendations
|
||||||
|
|
||||||
|
schedule.meeting_count = meeting_count
|
||||||
|
schedule.save(update_fields=["meeting_count", "updated_at"])
|
||||||
|
schedule = regenerate_recommendations(schedule)
|
||||||
|
out = ReadingScheduleSerializer(schedule, context={"request": request})
|
||||||
|
return Response(out.data)
|
||||||
|
|
||||||
|
@action(detail=True, methods=["post"])
|
||||||
|
def confirm(self, request: Request, pk: int | None = None) -> Response:
|
||||||
|
"""Confirm/finalize a schedule."""
|
||||||
|
schedule = self.get_object()
|
||||||
|
serializer = ConfirmScheduleSerializer(data=request.data)
|
||||||
|
serializer.is_valid(raise_exception=True)
|
||||||
|
|
||||||
|
from apps.books.services.recommendation_engine import confirm_schedule
|
||||||
|
|
||||||
|
schedule = confirm_schedule(schedule)
|
||||||
|
out = ReadingScheduleSerializer(schedule, context={"request": request})
|
||||||
|
return Response(out.data)
|
||||||
|
|
||||||
|
@action(detail=True, methods=["patch"], url_path="meetings/(?P<meeting_pk>[^/.]+)")
|
||||||
|
def update_meeting(self, request: Request, pk: int | None = None,
|
||||||
|
meeting_pk: str | None = None) -> Response:
|
||||||
|
"""Update a single meeting section (drag-and-drop reassignment)."""
|
||||||
|
schedule = self.get_object()
|
||||||
|
try:
|
||||||
|
meeting = schedule.meetings.get(pk=meeting_pk)
|
||||||
|
except MeetingSection.DoesNotExist:
|
||||||
|
return Response(
|
||||||
|
{"error": "Meeting section not found."},
|
||||||
|
status=status.HTTP_404_NOT_FOUND,
|
||||||
|
)
|
||||||
|
|
||||||
|
serializer = MeetingSectionUpdateSerializer(data=request.data, partial=True)
|
||||||
|
serializer.is_valid(raise_exception=True)
|
||||||
|
data = serializer.validated_data
|
||||||
|
|
||||||
|
if "chapter_ids" in data:
|
||||||
|
meeting.chapter_ids = data["chapter_ids"]
|
||||||
|
if "title" in data:
|
||||||
|
meeting.title = data["title"]
|
||||||
|
if "meeting_index" in data:
|
||||||
|
meeting.meeting_index = data["meeting_index"]
|
||||||
|
|
||||||
|
# Recalculate estimated time
|
||||||
|
chapter_count = len(meeting.chapter_ids) if meeting.chapter_ids else 0
|
||||||
|
meeting.estimated_time_minutes = max(5, chapter_count * 5)
|
||||||
|
meeting.save(update_fields=["chapter_ids", "title", "meeting_index", "estimated_time_minutes"])
|
||||||
|
|
||||||
|
out = MeetingSectionSerializer(meeting, context={"request": request})
|
||||||
|
return Response(out.data)
|
||||||
|
|
||||||
|
@action(detail=True, methods=["patch"], url_path="reorder")
|
||||||
|
def reorder_meetings(self, request: Request, pk: int | None = None) -> Response:
|
||||||
|
"""Reorder meetings. Expects {meetings: [{id, meeting_index}, ...]}."""
|
||||||
|
schedule = self.get_object()
|
||||||
|
meetings_data = request.data.get("meetings", [])
|
||||||
|
if not isinstance(meetings_data, list):
|
||||||
|
return Response(
|
||||||
|
{"error": "meetings must be a list."},
|
||||||
|
status=status.HTTP_400_BAD_REQUEST,
|
||||||
|
)
|
||||||
|
|
||||||
|
meeting_map = {m.id: m for m in schedule.meetings.all()}
|
||||||
|
updated: list[MeetingSection] = []
|
||||||
|
for entry in meetings_data:
|
||||||
|
mid = entry.get("id")
|
||||||
|
new_index = entry.get("meeting_index")
|
||||||
|
if mid is None or new_index is None:
|
||||||
|
continue
|
||||||
|
m = meeting_map.get(mid)
|
||||||
|
if m is None:
|
||||||
|
continue
|
||||||
|
m.meeting_index = new_index
|
||||||
|
updated.append(m)
|
||||||
|
|
||||||
|
MeetingSection.objects.bulk_update(updated, ["meeting_index"])
|
||||||
|
|
||||||
|
schedule.refresh_from_db()
|
||||||
|
out = ReadingScheduleSerializer(schedule, context={"request": request})
|
||||||
|
return Response(out.data)
|
||||||
@@ -12,6 +12,7 @@ const AddBookPage = lazy(() => import("./pages/AddBook").then((m) => ({ default:
|
|||||||
const SettingsPage = lazy(() => import("./pages/Settings").then((m) => ({ default: m.SettingsPage })));
|
const SettingsPage = lazy(() => import("./pages/Settings").then((m) => ({ default: m.SettingsPage })));
|
||||||
const BookmarksNotesPage = lazy(() => import("./components/annotations/BookmarksNotesPage").then((m) => ({ default: m.BookmarksNotesPage })));
|
const BookmarksNotesPage = lazy(() => import("./components/annotations/BookmarksNotesPage").then((m) => ({ default: m.BookmarksNotesPage })));
|
||||||
const ReadingPage = lazy(() => import("./pages/ReadingPage").then((m) => ({ default: m.default })));
|
const ReadingPage = lazy(() => import("./pages/ReadingPage").then((m) => ({ default: m.default })));
|
||||||
|
const RecommendationPage = lazy(() => import("./pages/RecommendationPage").then((m) => ({ default: m.RecommendationPage })));
|
||||||
|
|
||||||
const AuthPage = lazy(() => import("./pages/AuthPage"));
|
const AuthPage = lazy(() => import("./pages/AuthPage"));
|
||||||
|
|
||||||
@@ -40,6 +41,7 @@ function AppRoutes() {
|
|||||||
<Route path="/auth" element={isAuthenticated ? <Navigate to="/" replace /> : <AuthPage />} />
|
<Route path="/auth" element={isAuthenticated ? <Navigate to="/" replace /> : <AuthPage />} />
|
||||||
<Route path="/" element={<ProtectedRoute><LibraryPage /></ProtectedRoute>} />
|
<Route path="/" element={<ProtectedRoute><LibraryPage /></ProtectedRoute>} />
|
||||||
<Route path="/books/:id" element={<ProtectedRoute><BookDetailPage /></ProtectedRoute>} />
|
<Route path="/books/:id" element={<ProtectedRoute><BookDetailPage /></ProtectedRoute>} />
|
||||||
|
<Route path="/books/:ebookId/schedule" element={<ProtectedRoute><RecommendationPage /></ProtectedRoute>} />
|
||||||
<Route path="/read/:id" element={<ProtectedRoute><ReadingPage /></ProtectedRoute>} />
|
<Route path="/read/:id" element={<ProtectedRoute><ReadingPage /></ProtectedRoute>} />
|
||||||
<Route path="/reader/:id" element={<ProtectedRoute><ReaderRedirect /></ProtectedRoute>} />
|
<Route path="/reader/:id" element={<ProtectedRoute><ReaderRedirect /></ProtectedRoute>} />
|
||||||
<Route path="/add" element={<ProtectedRoute><AddBookPage /></ProtectedRoute>} />
|
<Route path="/add" element={<ProtectedRoute><AddBookPage /></ProtectedRoute>} />
|
||||||
|
|||||||
@@ -6,7 +6,9 @@ import type {
|
|||||||
ContentResponse,
|
ContentResponse,
|
||||||
EBookDetail,
|
EBookDetail,
|
||||||
EBookListItem,
|
EBookListItem,
|
||||||
|
GenerateRecommendationsRequest,
|
||||||
ReadingProgress,
|
ReadingProgress,
|
||||||
|
ReadingSchedule,
|
||||||
ReadingSettings,
|
ReadingSettings,
|
||||||
TocResponse,
|
TocResponse,
|
||||||
} from "../types/book";
|
} from "../types/book";
|
||||||
@@ -132,3 +134,64 @@ export const booksApi = {
|
|||||||
return data;
|
return data;
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const schedulesApi = {
|
||||||
|
async getSchedules(): Promise<ReadingSchedule[]> {
|
||||||
|
const { data } = await api.get<ReadingSchedule[]>("/books/schedules/");
|
||||||
|
return data;
|
||||||
|
},
|
||||||
|
|
||||||
|
async getSchedule(id: number): Promise<ReadingSchedule> {
|
||||||
|
const { data } = await api.get<ReadingSchedule>(`/books/schedules/${id}/`);
|
||||||
|
return data;
|
||||||
|
},
|
||||||
|
|
||||||
|
async generateRecommendations(request: GenerateRecommendationsRequest): Promise<ReadingSchedule> {
|
||||||
|
const { data } = await api.post<ReadingSchedule>("/books/schedules/", {
|
||||||
|
ebook_id: request.ebook_id,
|
||||||
|
meeting_count: request.meeting_count ?? 4,
|
||||||
|
});
|
||||||
|
return data;
|
||||||
|
},
|
||||||
|
|
||||||
|
async regenerateRecommendations(scheduleId: number, meetingCount?: number): Promise<ReadingSchedule> {
|
||||||
|
const { data } = await api.post<ReadingSchedule>(`/books/schedules/${scheduleId}/generate/`, {
|
||||||
|
meeting_count: meetingCount ?? 4,
|
||||||
|
});
|
||||||
|
return data;
|
||||||
|
},
|
||||||
|
|
||||||
|
async confirmSchedule(scheduleId: number): Promise<ReadingSchedule> {
|
||||||
|
const { data } = await api.post<ReadingSchedule>(`/books/schedules/${scheduleId}/confirm/`, {
|
||||||
|
confirm: true,
|
||||||
|
});
|
||||||
|
return data;
|
||||||
|
},
|
||||||
|
|
||||||
|
async updateMeeting(
|
||||||
|
scheduleId: number,
|
||||||
|
meetingId: number,
|
||||||
|
update: { chapter_ids?: number[]; title?: string; meeting_index?: number },
|
||||||
|
): Promise<unknown> {
|
||||||
|
const { data } = await api.patch(
|
||||||
|
`/books/schedules/${scheduleId}/meetings/${meetingId}/`,
|
||||||
|
update,
|
||||||
|
);
|
||||||
|
return data;
|
||||||
|
},
|
||||||
|
|
||||||
|
async reorderMeetings(
|
||||||
|
scheduleId: number,
|
||||||
|
meetings: { id: number; meeting_index: number }[],
|
||||||
|
): Promise<ReadingSchedule> {
|
||||||
|
const { data } = await api.patch<ReadingSchedule>(
|
||||||
|
`/books/schedules/${scheduleId}/reorder/`,
|
||||||
|
{ meetings },
|
||||||
|
);
|
||||||
|
return data;
|
||||||
|
},
|
||||||
|
|
||||||
|
async deleteSchedule(id: number): Promise<void> {
|
||||||
|
await api.delete(`/books/schedules/${id}/`);
|
||||||
|
},
|
||||||
|
};
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { useEffect, useLayoutEffect, useRef, useState } from "react";
|
import { useEffect, useLayoutEffect, useRef, useState } from "react";
|
||||||
|
import { useNavigate } from "react-router-dom";
|
||||||
import { useTranslation } from "react-i18n-lite";
|
import { useTranslation } from "react-i18n-lite";
|
||||||
import { booksApi } from "../api/books";
|
import { booksApi } from "../api/books";
|
||||||
import { getApiErrorMessage } from "../api/errors";
|
import { getApiErrorMessage } from "../api/errors";
|
||||||
@@ -46,6 +47,7 @@ export function BookContextMenu({
|
|||||||
const { t, language } = useTranslation();
|
const { t, language } = useTranslation();
|
||||||
const locale = language as SupportedLanguage;
|
const locale = language as SupportedLanguage;
|
||||||
const { showToast } = useToast();
|
const { showToast } = useToast();
|
||||||
|
const navigate = useNavigate();
|
||||||
const menuRef = useRef<HTMLDivElement>(null);
|
const menuRef = useRef<HTMLDivElement>(null);
|
||||||
const [position, setPosition] = useState({ left: x, top: y });
|
const [position, setPosition] = useState({ left: x, top: y });
|
||||||
const [activeAction, setActiveAction] = useState<ActionKind>(null);
|
const [activeAction, setActiveAction] = useState<ActionKind>(null);
|
||||||
@@ -148,6 +150,18 @@ export function BookContextMenu({
|
|||||||
>
|
>
|
||||||
{activeAction === "sync" ? t("contextMenu.syncingMetadata") : t("contextMenu.syncMetadata")}
|
{activeAction === "sync" ? t("contextMenu.syncingMetadata") : t("contextMenu.syncMetadata")}
|
||||||
</button>
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className={styles.item}
|
||||||
|
role="menuitem"
|
||||||
|
disabled={busy}
|
||||||
|
onClick={() => {
|
||||||
|
navigate(`/books/${book.id}/schedule`);
|
||||||
|
onClose();
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
📅 Schedule Reading
|
||||||
|
</button>
|
||||||
<div className={styles.separator} role="separator" />
|
<div className={styles.separator} role="separator" />
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
|
|||||||
@@ -0,0 +1,601 @@
|
|||||||
|
import React, { useCallback, useEffect, useState } from "react";
|
||||||
|
import { useNavigate, useParams } from "react-router-dom";
|
||||||
|
import { useTranslation } from "react-i18n-lite";
|
||||||
|
import { schedulesApi } from "../api/books";
|
||||||
|
import { booksApi } from "../api/books";
|
||||||
|
import type {
|
||||||
|
BookChapter,
|
||||||
|
EBookListItem,
|
||||||
|
MeetingSection,
|
||||||
|
ReadingSchedule,
|
||||||
|
} from "../types/book";
|
||||||
|
import { useMediaQuery, BREAKPOINTS } from "../hooks/useMediaQuery";
|
||||||
|
|
||||||
|
/* ---- drag-and-drop types ---- */
|
||||||
|
interface DragData {
|
||||||
|
chapterId: number;
|
||||||
|
sourceMeetingId: number | null; // null = unassigned
|
||||||
|
}
|
||||||
|
|
||||||
|
function formatTime(minutes: number): string {
|
||||||
|
if (minutes < 60) return `${minutes} min`;
|
||||||
|
const h = Math.floor(minutes / 60);
|
||||||
|
const m = minutes % 60;
|
||||||
|
return m > 0 ? `${h}h ${m}m` : `${h}h`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function RecommendationPage() {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
const { ebookId } = useParams<{ ebookId: string }>();
|
||||||
|
const navigate = useNavigate();
|
||||||
|
const isMobile = useMediaQuery(BREAKPOINTS.md);
|
||||||
|
|
||||||
|
const [ebook, setEbook] = useState<EBookListItem | null>(null);
|
||||||
|
const [schedule, setSchedule] = useState<ReadingSchedule | null>(null);
|
||||||
|
const [loading, setLoading] = useState(true);
|
||||||
|
const [generating, setGenerating] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [draggedChapter, setDraggedChapter] = useState<DragData | null>(null);
|
||||||
|
const [dropTarget, setDropTarget] = useState<number | null>(null);
|
||||||
|
|
||||||
|
const bookId = Number(ebookId);
|
||||||
|
const validId = !Number.isNaN(bookId);
|
||||||
|
|
||||||
|
const loadData = useCallback(async () => {
|
||||||
|
if (!validId) {
|
||||||
|
setError("Invalid ebook ID.");
|
||||||
|
setLoading(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
setLoading(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const [ebookData, schedules] = await Promise.all([
|
||||||
|
booksApi.getEBook(bookId),
|
||||||
|
schedulesApi.getSchedules(),
|
||||||
|
]);
|
||||||
|
setEbook({
|
||||||
|
id: ebookData.id,
|
||||||
|
title: ebookData.title,
|
||||||
|
author: ebookData.author,
|
||||||
|
filename: ebookData.filename,
|
||||||
|
format: ebookData.format,
|
||||||
|
page_count: ebookData.page_count,
|
||||||
|
cover_image:
|
||||||
|
typeof ebookData.cover_image === "string" ? ebookData.cover_image : null,
|
||||||
|
created_at: ebookData.created_at,
|
||||||
|
progress: ebookData.progress?.current_position ?? null,
|
||||||
|
started: ebookData.progress != null,
|
||||||
|
});
|
||||||
|
const existing = schedules.find((s) => s.ebook === bookId);
|
||||||
|
setSchedule(existing ?? null);
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : "Failed to load data.");
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
}, [bookId, validId]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
void loadData();
|
||||||
|
}, [loadData]);
|
||||||
|
|
||||||
|
const handleGenerate = useCallback(async () => {
|
||||||
|
if (!validId) return;
|
||||||
|
setGenerating(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const newSchedule = await schedulesApi.generateRecommendations({
|
||||||
|
ebook_id: bookId,
|
||||||
|
meeting_count: 4,
|
||||||
|
});
|
||||||
|
setSchedule(newSchedule);
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : "Failed to generate recommendations.");
|
||||||
|
} finally {
|
||||||
|
setGenerating(false);
|
||||||
|
}
|
||||||
|
}, [bookId, validId]);
|
||||||
|
|
||||||
|
const handleRegenerate = useCallback(async () => {
|
||||||
|
if (!schedule) return;
|
||||||
|
setGenerating(true);
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const updated = await schedulesApi.regenerateRecommendations(schedule.id);
|
||||||
|
setSchedule(updated);
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : "Failed to regenerate recommendations.");
|
||||||
|
} finally {
|
||||||
|
setGenerating(false);
|
||||||
|
}
|
||||||
|
}, [schedule]);
|
||||||
|
|
||||||
|
const handleConfirm = useCallback(async () => {
|
||||||
|
if (!schedule) return;
|
||||||
|
setError(null);
|
||||||
|
try {
|
||||||
|
const updated = await schedulesApi.confirmSchedule(schedule.id);
|
||||||
|
setSchedule(updated);
|
||||||
|
} catch (err) {
|
||||||
|
setError(err instanceof Error ? err.message : "Failed to confirm schedule.");
|
||||||
|
}
|
||||||
|
}, [schedule]);
|
||||||
|
|
||||||
|
/* ---- drag-and-drop handlers ---- */
|
||||||
|
const handleDragStart = useCallback(
|
||||||
|
(chapterId: number, sourceMeetingId: number | null) => (e: React.DragEvent) => {
|
||||||
|
setDraggedChapter({ chapterId, sourceMeetingId });
|
||||||
|
e.dataTransfer.effectAllowed = "move";
|
||||||
|
e.dataTransfer.setData("text/plain", String(chapterId));
|
||||||
|
},
|
||||||
|
[],
|
||||||
|
);
|
||||||
|
|
||||||
|
const handleDragOver = useCallback(
|
||||||
|
(targetMeetingId: number) => (e: React.DragEvent) => {
|
||||||
|
e.preventDefault();
|
||||||
|
e.dataTransfer.dropEffect = "move";
|
||||||
|
setDropTarget(targetMeetingId);
|
||||||
|
},
|
||||||
|
[],
|
||||||
|
);
|
||||||
|
|
||||||
|
const handleDragLeave = useCallback(() => {
|
||||||
|
setDropTarget(null);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleDrop = useCallback(
|
||||||
|
async (targetMeetingId: number) => {
|
||||||
|
setDropTarget(null);
|
||||||
|
if (!draggedChapter || !schedule) return;
|
||||||
|
|
||||||
|
const { chapterId, sourceMeetingId } = draggedChapter;
|
||||||
|
setDraggedChapter(null);
|
||||||
|
|
||||||
|
// Same meeting — no-op
|
||||||
|
if (sourceMeetingId === targetMeetingId) return;
|
||||||
|
|
||||||
|
// Optimistically update UI
|
||||||
|
const updatedMeetings = schedule.meetings.map((m) => ({
|
||||||
|
...m,
|
||||||
|
chapter_ids: [...m.chapter_ids],
|
||||||
|
chapters: [...m.chapters],
|
||||||
|
}));
|
||||||
|
|
||||||
|
// Remove from source
|
||||||
|
if (sourceMeetingId !== null) {
|
||||||
|
const source = updatedMeetings.find((m) => m.id === sourceMeetingId);
|
||||||
|
if (source) {
|
||||||
|
source.chapter_ids = source.chapter_ids.filter((id) => id !== chapterId);
|
||||||
|
source.chapters = source.chapters.filter((ch) => ch.id !== chapterId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Add to target
|
||||||
|
const target = updatedMeetings.find((m) => m.id === targetMeetingId);
|
||||||
|
if (target && !target.chapter_ids.includes(chapterId)) {
|
||||||
|
target.chapter_ids = [...target.chapter_ids, chapterId];
|
||||||
|
// Find chapter data
|
||||||
|
const allChapters = schedule.meetings.flatMap((m) => m.chapters);
|
||||||
|
const movedChapter = allChapters.find((ch) => ch.id === chapterId);
|
||||||
|
if (movedChapter) {
|
||||||
|
target.chapters = [...target.chapters, movedChapter];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
setSchedule({ ...schedule, meetings: updatedMeetings });
|
||||||
|
|
||||||
|
// Persist to backend
|
||||||
|
try {
|
||||||
|
await schedulesApi.updateMeeting(schedule.id, targetMeetingId, {
|
||||||
|
chapter_ids: target?.chapter_ids ?? [],
|
||||||
|
});
|
||||||
|
if (sourceMeetingId !== null) {
|
||||||
|
const source = updatedMeetings.find((m) => m.id === sourceMeetingId);
|
||||||
|
if (source) {
|
||||||
|
await schedulesApi.updateMeeting(schedule.id, sourceMeetingId, {
|
||||||
|
chapter_ids: source.chapter_ids,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
setError("Failed to save changes. Please try again.");
|
||||||
|
// Reload to reset
|
||||||
|
void loadData();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[draggedChapter, schedule, loadData],
|
||||||
|
);
|
||||||
|
|
||||||
|
const handleUnassignDrop = useCallback(
|
||||||
|
async () => {
|
||||||
|
setDropTarget(null);
|
||||||
|
if (!draggedChapter || !schedule) return;
|
||||||
|
const { chapterId, sourceMeetingId } = draggedChapter;
|
||||||
|
setDraggedChapter(null);
|
||||||
|
|
||||||
|
if (sourceMeetingId === null) return;
|
||||||
|
|
||||||
|
// Remove from source
|
||||||
|
const updatedMeetings = schedule.meetings.map((m) => ({
|
||||||
|
...m,
|
||||||
|
chapter_ids: [...m.chapter_ids],
|
||||||
|
chapters: [...m.chapters],
|
||||||
|
}));
|
||||||
|
const source = updatedMeetings.find((m) => m.id === sourceMeetingId);
|
||||||
|
if (source) {
|
||||||
|
source.chapter_ids = source.chapter_ids.filter((id) => id !== chapterId);
|
||||||
|
source.chapters = source.chapters.filter((ch) => ch.id !== chapterId);
|
||||||
|
}
|
||||||
|
|
||||||
|
setSchedule({ ...schedule, meetings: updatedMeetings });
|
||||||
|
|
||||||
|
try {
|
||||||
|
await schedulesApi.updateMeeting(schedule.id, sourceMeetingId, {
|
||||||
|
chapter_ids: source?.chapter_ids ?? [],
|
||||||
|
});
|
||||||
|
} catch {
|
||||||
|
setError("Failed to save changes.");
|
||||||
|
void loadData();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[draggedChapter, schedule, loadData],
|
||||||
|
);
|
||||||
|
|
||||||
|
const handleDragEnd = useCallback(() => {
|
||||||
|
setDraggedChapter(null);
|
||||||
|
setDropTarget(null);
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
/* ---- styles ---- */
|
||||||
|
const containerStyle: React.CSSProperties = {
|
||||||
|
maxWidth: 1200,
|
||||||
|
margin: "0 auto",
|
||||||
|
padding: isMobile ? 12 : 24,
|
||||||
|
minHeight: "100vh",
|
||||||
|
background: "#f8f9fa",
|
||||||
|
};
|
||||||
|
|
||||||
|
const headerStyle: React.CSSProperties = {
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "center",
|
||||||
|
gap: 12,
|
||||||
|
marginBottom: 24,
|
||||||
|
flexWrap: "wrap",
|
||||||
|
};
|
||||||
|
|
||||||
|
const backBtnStyle: React.CSSProperties = {
|
||||||
|
padding: "8px 16px",
|
||||||
|
borderRadius: 8,
|
||||||
|
border: "1px solid #e5e7eb",
|
||||||
|
background: "#fff",
|
||||||
|
color: "#374151",
|
||||||
|
fontSize: 14,
|
||||||
|
cursor: "pointer",
|
||||||
|
};
|
||||||
|
|
||||||
|
const btnPrimaryStyle: React.CSSProperties = {
|
||||||
|
padding: "10px 24px",
|
||||||
|
borderRadius: 8,
|
||||||
|
border: "none",
|
||||||
|
background: "#4f46e5",
|
||||||
|
color: "#fff",
|
||||||
|
fontSize: 14,
|
||||||
|
fontWeight: 600,
|
||||||
|
cursor: "pointer",
|
||||||
|
opacity: generating ? 0.7 : 1,
|
||||||
|
minHeight: 44,
|
||||||
|
};
|
||||||
|
|
||||||
|
const confirmBtnStyle: React.CSSProperties = {
|
||||||
|
...btnPrimaryStyle,
|
||||||
|
background: "#16a34a",
|
||||||
|
};
|
||||||
|
|
||||||
|
const meetingsGridStyle: React.CSSProperties = {
|
||||||
|
display: "grid",
|
||||||
|
gridTemplateColumns: isMobile
|
||||||
|
? "1fr"
|
||||||
|
: `repeat(${schedule?.meeting_count ?? 4}, 1fr)`,
|
||||||
|
gap: 16,
|
||||||
|
marginTop: 16,
|
||||||
|
};
|
||||||
|
|
||||||
|
const meetingCardStyle = (isDropTarget: boolean): React.CSSProperties => ({
|
||||||
|
background: isDropTarget ? "#eef2ff" : "#fff",
|
||||||
|
borderRadius: 12,
|
||||||
|
border: `2px solid ${isDropTarget ? "#4f46e5" : "#e5e7eb"}`,
|
||||||
|
padding: 16,
|
||||||
|
minHeight: 200,
|
||||||
|
transition: "border-color 0.2s, background 0.2s",
|
||||||
|
});
|
||||||
|
|
||||||
|
const chapterChipStyle: React.CSSProperties = {
|
||||||
|
background: "#f3f4f6",
|
||||||
|
borderRadius: 8,
|
||||||
|
padding: "8px 12px",
|
||||||
|
marginBottom: 8,
|
||||||
|
cursor: "grab",
|
||||||
|
fontSize: 13,
|
||||||
|
color: "#374151",
|
||||||
|
border: "1px solid #e5e7eb",
|
||||||
|
userSelect: "none" as const,
|
||||||
|
};
|
||||||
|
|
||||||
|
/* ---- render ---- */
|
||||||
|
|
||||||
|
if (!validId) {
|
||||||
|
return (
|
||||||
|
<div style={containerStyle}>
|
||||||
|
<p style={{ color: "#ef4444" }}>Invalid ebook ID.</p>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (loading) {
|
||||||
|
return (
|
||||||
|
<div style={containerStyle}>
|
||||||
|
<div style={{ display: "flex", justifyContent: "center", alignItems: "center", minHeight: 400 }}>
|
||||||
|
<p style={{ color: "#888" }}>{t("common.loading")}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (error) {
|
||||||
|
return (
|
||||||
|
<div style={containerStyle}>
|
||||||
|
<button onClick={() => navigate(-1)} style={backBtnStyle}>← Back</button>
|
||||||
|
<div style={{ textAlign: "center", padding: 60 }}>
|
||||||
|
<p style={{ color: "#ef4444", marginBottom: 16 }}>{error}</p>
|
||||||
|
<button onClick={() => void loadData()} style={btnPrimaryStyle}>
|
||||||
|
{t("common.retry")}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div style={containerStyle}>
|
||||||
|
{/* Header */}
|
||||||
|
<div style={headerStyle}>
|
||||||
|
<button onClick={() => navigate("/")} style={backBtnStyle}>
|
||||||
|
← {isMobile ? "Library" : "Back to Library"}
|
||||||
|
</button>
|
||||||
|
<div style={{ flex: 1 }}>
|
||||||
|
<h1 style={{ fontSize: isMobile ? 18 : 24, margin: 0, color: "#1f2937" }}>
|
||||||
|
Reading Schedule
|
||||||
|
</h1>
|
||||||
|
{ebook && (
|
||||||
|
<p style={{ color: "#6b7280", fontSize: 14, margin: "4px 0 0" }}>
|
||||||
|
{ebook.title}{ebook.author ? ` — ${ebook.author}` : ""}
|
||||||
|
</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
{!schedule && (
|
||||||
|
<button onClick={handleGenerate} style={btnPrimaryStyle} disabled={generating}>
|
||||||
|
{generating ? "Generating..." : "Generate Recommendations"}
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
{schedule && (
|
||||||
|
<div style={{ display: "flex", gap: 8, flexWrap: "wrap" }}>
|
||||||
|
<button onClick={handleRegenerate} style={btnPrimaryStyle} disabled={generating}>
|
||||||
|
{generating ? "Regenerating..." : "Regenerate"}
|
||||||
|
</button>
|
||||||
|
{!schedule.confirmed && (
|
||||||
|
<button onClick={handleConfirm} style={confirmBtnStyle}>
|
||||||
|
Confirm Schedule
|
||||||
|
</button>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Status badge */}
|
||||||
|
{schedule && (
|
||||||
|
<div style={{ marginBottom: 16 }}>
|
||||||
|
<span style={{
|
||||||
|
padding: "4px 12px",
|
||||||
|
borderRadius: 999,
|
||||||
|
fontSize: 13,
|
||||||
|
fontWeight: 600,
|
||||||
|
background: schedule.confirmed ? "#dcfce7" : "#fef3c7",
|
||||||
|
color: schedule.confirmed ? "#16a34a" : "#b45309",
|
||||||
|
}}>
|
||||||
|
{schedule.confirmed ? "✓ Confirmed" : "Draft — drag chapters to adjust"}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* No schedule yet */}
|
||||||
|
{!schedule && (
|
||||||
|
<div style={{ textAlign: "center", padding: "60px 16px" }}>
|
||||||
|
<div style={{ fontSize: 48, marginBottom: 16 }}>📅</div>
|
||||||
|
<h2 style={{ fontSize: 20, color: "#1f2937", marginBottom: 8 }}>
|
||||||
|
No Schedule Yet
|
||||||
|
</h2>
|
||||||
|
<p style={{ color: "#6b7280", marginBottom: 24, maxWidth: 400, margin: "0 auto 24px" }}>
|
||||||
|
Generate a reading schedule to split this book into balanced weekly assignments for your group.
|
||||||
|
</p>
|
||||||
|
<button onClick={handleGenerate} style={btnPrimaryStyle} disabled={generating}>
|
||||||
|
{generating ? "Generating..." : "Generate Recommendations"}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Schedule meetings */}
|
||||||
|
{schedule && (
|
||||||
|
<>
|
||||||
|
{/* Unassigned drop zone */}
|
||||||
|
<div
|
||||||
|
style={{
|
||||||
|
padding: "12px 16px",
|
||||||
|
background: dropTarget === null && draggedChapter ? "#fef2f2" : "#f9fafb",
|
||||||
|
borderRadius: 8,
|
||||||
|
border: `2px dashed ${dropTarget === null && draggedChapter ? "#ef4444" : "#d1d5db"}`,
|
||||||
|
marginBottom: 16,
|
||||||
|
textAlign: "center",
|
||||||
|
color: "#6b7280",
|
||||||
|
fontSize: 13,
|
||||||
|
minHeight: 44,
|
||||||
|
display: "flex",
|
||||||
|
alignItems: "center",
|
||||||
|
justifyContent: "center",
|
||||||
|
transition: "all 0.2s",
|
||||||
|
}}
|
||||||
|
onDragOver={(e) => { e.preventDefault(); e.dataTransfer.dropEffect = "move"; setDropTarget(null); }}
|
||||||
|
onDrop={handleUnassignDrop}
|
||||||
|
onDragLeave={() => setDropTarget(null)}
|
||||||
|
>
|
||||||
|
{dropTarget === null && draggedChapter
|
||||||
|
? "Drop here to unassign"
|
||||||
|
: "Drag chapters here to unassign from meetings"}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Meetings grid */}
|
||||||
|
<div style={meetingsGridStyle}>
|
||||||
|
{schedule.meetings.map((meeting, idx) => (
|
||||||
|
<MeetingColumn
|
||||||
|
key={meeting.id}
|
||||||
|
meeting={meeting}
|
||||||
|
index={idx}
|
||||||
|
isDropTarget={dropTarget === meeting.id}
|
||||||
|
isConfirmed={schedule.confirmed}
|
||||||
|
onDragStart={handleDragStart}
|
||||||
|
onDragOver={handleDragOver(meeting.id)}
|
||||||
|
onDragLeave={handleDragLeave}
|
||||||
|
onDrop={() => void handleDrop(meeting.id)}
|
||||||
|
onDragEnd={handleDragEnd}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Drag overlay instruction */}
|
||||||
|
{draggedChapter && (
|
||||||
|
<div style={{
|
||||||
|
position: "fixed",
|
||||||
|
bottom: 24,
|
||||||
|
left: "50%",
|
||||||
|
transform: "translateX(-50%)",
|
||||||
|
background: "#1f2937",
|
||||||
|
color: "#fff",
|
||||||
|
padding: "12px 24px",
|
||||||
|
borderRadius: 12,
|
||||||
|
fontSize: 14,
|
||||||
|
boxShadow: "0 4px 16px rgba(0,0,0,0.2)",
|
||||||
|
zIndex: 999,
|
||||||
|
}}>
|
||||||
|
Drop the chapter into a meeting column
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ---- Meeting Column Sub-component ---- */
|
||||||
|
|
||||||
|
interface MeetingColumnProps {
|
||||||
|
meeting: MeetingSection;
|
||||||
|
index: number;
|
||||||
|
isDropTarget: boolean;
|
||||||
|
isConfirmed: boolean;
|
||||||
|
onDragStart: (chapterId: number, sourceMeetingId: number | null) => (e: React.DragEvent) => void;
|
||||||
|
onDragOver: (e: React.DragEvent) => void;
|
||||||
|
onDragLeave: () => void;
|
||||||
|
onDrop: () => void;
|
||||||
|
onDragEnd: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
function MeetingColumn({
|
||||||
|
meeting,
|
||||||
|
index,
|
||||||
|
isDropTarget,
|
||||||
|
isConfirmed,
|
||||||
|
onDragStart,
|
||||||
|
onDragOver,
|
||||||
|
onDragLeave,
|
||||||
|
onDrop,
|
||||||
|
onDragEnd,
|
||||||
|
}: MeetingColumnProps) {
|
||||||
|
const chapterCount = meeting.chapter_ids.length;
|
||||||
|
|
||||||
|
const cardStyle: React.CSSProperties = {
|
||||||
|
background: isDropTarget ? "#eef2ff" : "#fff",
|
||||||
|
borderRadius: 12,
|
||||||
|
border: `2px solid ${isDropTarget ? "#4f46e5" : "#e5e7eb"}`,
|
||||||
|
overflow: "hidden",
|
||||||
|
transition: "border-color 0.2s, background 0.2s",
|
||||||
|
};
|
||||||
|
|
||||||
|
const headerStyle: React.CSSProperties = {
|
||||||
|
padding: "12px 16px",
|
||||||
|
background: "#f9fafb",
|
||||||
|
borderBottom: "1px solid #e5e7eb",
|
||||||
|
};
|
||||||
|
|
||||||
|
const bodyStyle: React.CSSProperties = {
|
||||||
|
padding: "12px 16px",
|
||||||
|
minHeight: 120,
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div style={cardStyle}>
|
||||||
|
<div style={headerStyle}>
|
||||||
|
<div style={{ fontWeight: 700, color: "#1f2937", fontSize: 15, marginBottom: 4 }}>
|
||||||
|
Week {index + 1}
|
||||||
|
</div>
|
||||||
|
<div style={{ display: "flex", gap: 16, fontSize: 12, color: "#6b7280" }}>
|
||||||
|
<span>{chapterCount} {chapterCount === 1 ? "chapter" : "chapters"}</span>
|
||||||
|
<span>{formatTime(meeting.estimated_time_minutes)}</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
style={bodyStyle}
|
||||||
|
onDragOver={isConfirmed ? undefined : onDragOver}
|
||||||
|
onDragLeave={isConfirmed ? undefined : onDragLeave}
|
||||||
|
onDrop={isConfirmed ? undefined : onDrop}
|
||||||
|
>
|
||||||
|
{meeting.chapters.length === 0 && (
|
||||||
|
<div style={{
|
||||||
|
color: "#9ca3af",
|
||||||
|
fontSize: 13,
|
||||||
|
textAlign: "center",
|
||||||
|
padding: "20px 0",
|
||||||
|
fontStyle: "italic",
|
||||||
|
}}>
|
||||||
|
{isDropTarget ? "Drop here" : "No chapters assigned"}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{meeting.chapters.map((chapter) => (
|
||||||
|
<div
|
||||||
|
key={`${meeting.id}-${chapter.id}`}
|
||||||
|
draggable={!isConfirmed}
|
||||||
|
onDragStart={isConfirmed ? undefined : onDragStart(chapter.id, meeting.id)}
|
||||||
|
onDragEnd={isConfirmed ? undefined : onDragEnd}
|
||||||
|
style={{
|
||||||
|
background: "#f3f4f6",
|
||||||
|
borderRadius: 8,
|
||||||
|
padding: "8px 12px",
|
||||||
|
marginBottom: 8,
|
||||||
|
cursor: isConfirmed ? "default" : "grab",
|
||||||
|
fontSize: 13,
|
||||||
|
color: "#374151",
|
||||||
|
border: "1px solid #e5e7eb",
|
||||||
|
userSelect: "none" as const,
|
||||||
|
opacity: isConfirmed ? 0.8 : 1,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<div style={{ fontWeight: 600, marginBottom: 2 }}>{chapter.title}</div>
|
||||||
|
{chapter.href && (
|
||||||
|
<div style={{ fontSize: 11, color: "#9ca3af" }}>{chapter.href}</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@@ -102,3 +102,27 @@ export interface BookSearchParams {
|
|||||||
page?: number;
|
page?: number;
|
||||||
page_size?: number;
|
page_size?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface MeetingSection {
|
||||||
|
id: number;
|
||||||
|
meeting_index: number;
|
||||||
|
title: string;
|
||||||
|
estimated_time_minutes: number;
|
||||||
|
chapter_ids: number[];
|
||||||
|
chapters: BookChapter[];
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface ReadingSchedule {
|
||||||
|
id: number;
|
||||||
|
ebook: number;
|
||||||
|
meeting_count: number;
|
||||||
|
confirmed: boolean;
|
||||||
|
meetings: MeetingSection[];
|
||||||
|
created_at: string;
|
||||||
|
updated_at: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface GenerateRecommendationsRequest {
|
||||||
|
ebook_id: number;
|
||||||
|
meeting_count?: number;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user