delcourse

app/bot/handlers/admin.py

@@ -41,10 +41,11 @@ router.callback_query.filter(IsAdmin())
 HELP = (
     "<b>Admin tools</b>\n"
     "/addcourse &lt;natural|social|all&gt; &lt;year 0-5&gt; &lt;code&gt; &lt;name...&gt;\n"
-    "  e.g. <code>/addcourse natural 1 Math1011 Calculus I</code>\n"
+    "  e.g. <code>/addcourse natural 1 XXX0000 My New Course</code> (use <code>-</code> if no code)\n"
     "  (use <code>-</code> as the code if a course has none)\n"
     "/seedcourses : add the Year-1 course list (safe to run twice)\n"
     "/courses : list courses with ids\n"
+    "/delcourse &lt;id&gt; [move_files_to_id] : delete a course (refuses if it still has files)\n"
     "/stats : numbers\n"
     "/ping : measure database and Telegram speed\n"
     "/season : live weekly standings + fraud flags\n"
@@ -168,6 +169,36 @@ async def seed_courses(message: Message, session: AsyncSession) -> None:
     await message.answer(f"✅ Added <b>{added}</b> courses, skipped {skipped} that already existed.\nSee /courses for ids.")
 
 
+@router.message(Command("delcourse"))
+async def del_course(message: Message, command: CommandObject, session: AsyncSession) -> None:
+    parts = (command.args or "").split()
+    if not parts or not parts[0].isdigit() or (len(parts) > 1 and not parts[1].isdigit()):
+        await message.answer("Usage: <code>/delcourse &lt;id&gt; [move_files_to_id]</code>")
+        return
+    cid, target = int(parts[0]), (int(parts[1]) if len(parts) > 1 else None)
+    course = await repo.get_course(session, cid)
+    if not course:
+        await message.answer(f"No course with id {cid}. See /courses")
+        return
+    files = await repo.count_course_files(session, cid)
+    if files and target is None:
+        await message.answer(
+            f"❗ Course #{cid} “{course.name}” still has <b>{files}</b> file(s), so I did not delete it.\n"
+            f"Move them and delete in one go: <code>/delcourse {cid} &lt;other_course_id&gt;</code>"
+        )
+        return
+    if target is not None:
+        if target == cid or not await repo.get_course(session, target):
+            await message.answer("The target course must exist and be a different course.")
+            return
+        await repo.move_course_files(session, cid, target)
+    await repo.delete_course(session, cid)
+    session.sync_session.info["wrote"] = True
+    library_service.invalidate_courses()
+    moved = f" ({files} file(s) moved to #{target})" if files else ""
+    await message.answer(f"🗑 Deleted course #{cid} “{course.name}”{moved}.")
+
+
 @router.message(Command("courses"))
 async def list_courses(message: Message, session: AsyncSession) -> None:
     courses = await repo.all_courses(session)

app/db/repos/library.py

@@ -263,3 +263,20 @@ async def unstamped_pdfs(session: AsyncSession, limit: int, max_size: int) -> li
         .limit(limit)
     )
     return list(res.scalars())
+
+
+async def count_course_files(session: AsyncSession, course_id: int) -> int:
+    res = await session.execute(select(func.count()).select_from(Material).where(Material.course_id == course_id))
+    return int(res.scalar_one())
+
+
+async def move_course_files(session: AsyncSession, from_id: int, to_id: int) -> None:
+    await session.execute(
+        update(Material).where(Material.course_id == from_id).values(course_id=to_id)
+        .execution_options(synchronize_session=False)
+    )
+
+
+async def delete_course(session: AsyncSession, course_id: int) -> bool:
+    res = await session.execute(delete(Course).where(Course.id == course_id))
+    return bool(res.rowcount)