feat: enhance update_archive_course functionality to support course transfer by name and category, and update related frontend services and components

Author: gainsborouo

backend/app/api/services/courses.py

@@ -160,6 +160,7 @@ async def update_archive_course(
 ):
     """
     Update archive's course. Only admins can change archive's course.
+    Supports both transferring to existing course by ID or creating new course by name and category.
     """
     if not current_user.is_admin:
         raise HTTPException(
@@ -181,16 +182,59 @@ async def update_archive_course(
             detail="Archive not found"
         )
 
-    new_course_query = select(Course).where(Course.id == course_update.course_id)
-    new_course_result = await db.execute(new_course_query)
-    new_course = new_course_result.scalar_one_or_none()
+    # Determine target course
+    new_course = None
 
-    if not new_course:
+    if course_update.course_id:
+        # Check if trying to transfer to the same course
+        if course_update.course_id == course_id:
+            raise HTTPException(
+                status_code=status.HTTP_400_BAD_REQUEST,
+                detail="Cannot transfer archive to the same course"
+            )
+            
+        # Transfer to existing course by ID
+        new_course_query = select(Course).where(Course.id == course_update.course_id)
+        new_course_result = await db.execute(new_course_query)
+        new_course = new_course_result.scalar_one_or_none()
+        
+        if not new_course:
+            raise HTTPException(
+                status_code=status.HTTP_404_NOT_FOUND,
+                detail="Target course not found"
+            )
+    elif course_update.course_name and course_update.course_category:
+        # Transfer to course by name and category, create if not exists
+        new_course_query = select(Course).where(
+            Course.name == course_update.course_name,
+            Course.category == course_update.course_category
+        )
+        new_course_result = await db.execute(new_course_query)
+        new_course = new_course_result.scalar_one_or_none()
+        
+        if new_course:
+            # Check if trying to transfer to the same course
+            if new_course.id == course_id:
+                raise HTTPException(
+                    status_code=status.HTTP_400_BAD_REQUEST,
+                    detail="Cannot transfer archive to the same course"
+                )
+        else:
+            # Create new course if it doesn't exist
+            new_course = Course(
+                name=course_update.course_name,
+                category=course_update.course_category
+            )
+            db.add(new_course)
+            await db.commit()
+            await db.refresh(new_course)
+    else:
         raise HTTPException(
-            status_code=status.HTTP_404_NOT_FOUND,
-            detail="Target course not found"
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Either course_id or both course_name and course_category must be provided"
         )
-    archive.course_id = course_update.course_id
+    
+    archive.course_id = new_course.id
     archive.updated_at = datetime.now(timezone.utc)
 
     await db.commit()
@@ -200,7 +244,7 @@ async def update_archive_course(
         "message": f"Archive moved to course '{new_course.name}'",
         "archive_id": archive.id,
         "old_course_id": course_id,
-        "new_course_id": course_update.course_id
+        "new_course_id": new_course.id
     }
 
 @router.delete("/{course_id}/archives/{archive_id}")

backend/app/models/models.py

@@ -191,6 +191,8 @@ class Config:
         from_attributes = True
 
 class ArchiveUpdateCourse(BaseModel):
-    course_id: int
+    course_id: Optional[int] = None
+    course_name: Optional[str] = None
+    course_category: Optional[CourseCategory] = None
 
 

frontend/src/api/services/archives.js

@@ -32,4 +32,16 @@ export const archiveService = {
       course_id: newCourseId,
     });
   },
+
+  updateArchiveCourseByCategoryAndName(
+    courseId,
+    archiveId,
+    courseName,
+    courseCategory
+  ) {
+    return api.patch(`/courses/${courseId}/archives/${archiveId}/course`, {
+      course_name: courseName,
+      course_category: courseCategory,
+    });
+  },
 };

frontend/src/components/UploadArchiveDialog.vue

@@ -41,7 +41,7 @@
               </div>
 
               <div class="flex flex-column gap-2">
-                <label>科目名稱</label>
+                <label>科目</label>
                 <AutoComplete
                   v-model="form.subject"
                   :suggestions="availableSubjects"
@@ -50,7 +50,7 @@
                   @focus="() => searchSubject({ query: '' })"
                   @click="() => searchSubject({ query: '' })"
                   optionLabel="name"
-                  placeholder="選擇科目"
+                  placeholder="搜尋或輸入科目名稱"
                   class="w-full"
                   :disabled="!form.category"
                   dropdown
@@ -75,7 +75,7 @@
                   @focus="() => searchProfessor({ query: '' })"
                   @click="() => searchProfessor({ query: '' })"
                   optionLabel="name"
-                  placeholder="選擇教授"
+                  placeholder="搜尋或輸入教授名稱"
                   class="w-full"
                   :disabled="!form.subject"
                   dropdown

frontend/src/views/Archive.vue

@@ -479,7 +479,7 @@
                     @focus="() => searchTargetCourse({ query: '' })"
                     @click="() => searchTargetCourse({ query: '' })"
                     optionLabel="label"
-                    placeholder="搜尋目標課程"
+                    placeholder="搜尋或輸入目標課程名稱"
                     class="w-full"
                     :disabled="!editForm.targetCategory"
                     dropdown
@@ -1060,9 +1060,18 @@ watch(
   () => groupedArchives.value,
   (newGroups) => {
     if (newGroups.length) {
-      expandedPanels.value = newGroups
-        .slice(0, 3)
-        .map((group) => group.year.toString());
+      // Only set default expanded panels if no panels are currently expanded
+      if (expandedPanels.value.length === 0) {
+        expandedPanels.value = newGroups
+          .slice(0, 3)
+          .map((group) => group.year.toString());
+      } else {
+        // Keep existing expanded panels that are still valid
+        const validYears = newGroups.map((group) => group.year.toString());
+        expandedPanels.value = expandedPanels.value.filter((panel) =>
+          validYears.includes(panel)
+        );
+      }
     }
   },
   { immediate: true }
@@ -1218,15 +1227,32 @@ const handleEdit = async () => {
       }
     );
 
-    if (editForm.value.shouldTransfer && editForm.value.targetCourseId) {
-      await archiveService.updateArchiveCourse(
-        selectedCourse.value,
-        editForm.value.id,
-        editForm.value.targetCourseId
-      );
+    if (editForm.value.shouldTransfer && editForm.value.targetCategory) {
+      if (editForm.value.targetCourseId) {
+        // Transfer to existing course
+        await archiveService.updateArchiveCourse(
+          selectedCourse.value,
+          editForm.value.id,
+          editForm.value.targetCourseId
+        );
+      } else if (editForm.value.targetCourse) {
+        // Transfer to new course (create if not exists)
+        await archiveService.updateArchiveCourseByCategoryAndName(
+          selectedCourse.value,
+          editForm.value.id,
+          editForm.value.targetCourse,
+          editForm.value.targetCategory
+        );
+      }
     }
 
     await fetchArchives();
+
+    // If transfer was performed, refresh the course list to show the new course
+    if (editForm.value.shouldTransfer) {
+      await fetchCourses();
+    }
+
     closeEditDialog();
 
     const successMessage = editForm.value.shouldTransfer
@@ -1396,9 +1422,31 @@ const onTargetCourseSelect = (event) => {
   if (event.value && typeof event.value === "object") {
     editForm.value.targetCourse = event.value.label;
     editForm.value.targetCourseId = event.value.id;
+  } else if (typeof event.value === "string") {
+    // User typed a new course name
+    editForm.value.targetCourse = event.value;
+    editForm.value.targetCourseId = null;
   }
 };
 
+// Handle direct input of course name
+watch(
+  () => editForm.value.targetCourse,
+  (newValue) => {
+    if (typeof newValue === "string" && newValue) {
+      // Check if it's an existing course
+      const existingCourse = allAvailableCoursesForTransfer.value.find(
+        (course) => course.label === newValue
+      );
+      if (existingCourse) {
+        editForm.value.targetCourseId = existingCourse.id;
+      } else {
+        editForm.value.targetCourseId = null;
+      }
+    }
+  }
+);
+
 watch(
   () => editForm.value.targetCategory,
   () => {