自动排课

src/Jiaowu.Api/Controllers/ScheduleSettingsController.cs

@@ -91,6 +91,8 @@ public sealed class ScheduleSettingsController(AppDbContext db) : ControllerBase
                     .OrderByDescending(item => item.IsPrimary)
                     .Select(item => item.Teacher!.Name),
                  x.Capacity,
+                 x.StartWeek,
+                 x.EndWeek,
                  x.WeeklyHours,
                  x.SchedulingMode
             })
@@ -114,6 +116,8 @@ public sealed class ScheduleSettingsController(AppDbContext db) : ControllerBase
                  task.CollegeName,
                  task.TeacherNames,
                  task.Capacity,
+                 task.StartWeek,
+                 task.EndWeek,
                  task.WeeklyHours,
                  task.SchedulingMode,
                  HasCustomConstraint = constraint is not null,

src/Jiaowu.Api/Infrastructure/Scheduling/AutomaticScheduleGenerator.cs

@@ -233,10 +233,10 @@ public sealed class AutomaticScheduleGenerator(AppDbContext db)
                     student.Status == StudentStatus.Active) ?? 0));
         return classrooms.Where(room =>
                 room.Capacity >= minimumCapacity &&
-                (!constraint?.RequiredCampusId.HasValue ?? true ||
+                (constraint?.RequiredCampusId is not Guid requiredCampusId ||
-                    room.Building!.CampusId == constraint.RequiredCampusId) &&
+                    room.Building!.CampusId == requiredCampusId) &&
-                (!constraint?.RequiredBuildingId.HasValue ?? true ||
+                (constraint?.RequiredBuildingId is not Guid requiredBuildingId ||
-                    room.BuildingId == constraint.RequiredBuildingId) &&
+                    room.BuildingId == requiredBuildingId) &&
                 (allowedRoomIds.Count == 0 || allowedRoomIds.Contains(room.Id)))
             .ToList();
     }

tests/Jiaowu.Api.Tests/AutomaticScheduleGeneratorTests.cs

@@ -224,7 +224,7 @@ public sealed class AutomaticScheduleGeneratorTests
     }
 
     [Fact]
-    public async Task Generator_does_not_attach_duplicate_buildings_from_untracked_classrooms()
+    public async Task Generator_uses_scoped_rooms_without_attaching_duplicate_buildings()
     {
         await using var connection = new SqliteConnection("Data Source=:memory:");
         await connection.OpenAsync();
@@ -333,6 +333,34 @@ public sealed class AutomaticScheduleGeneratorTests
                 EndsAt = new TimeOnly(9, 40)
             });
         await db.SaveChangesAsync();
+        db.TeachingTaskScheduleConstraints.AddRange(
+            new TeachingTaskScheduleConstraint
+            {
+                TeachingTaskId = smallTask.Id,
+                RequiredCampusId = campus.Id,
+                RequiredBuildingId = building.Id,
+                AllowedClassrooms =
+                [
+                    new TeachingTaskAllowedClassroom
+                    {
+                        ClassroomId = smallRoom.Id
+                    }
+                ]
+            },
+            new TeachingTaskScheduleConstraint
+            {
+                TeachingTaskId = largeTask.Id,
+                RequiredCampusId = campus.Id,
+                RequiredBuildingId = building.Id,
+                AllowedClassrooms =
+                [
+                    new TeachingTaskAllowedClassroom
+                    {
+                        ClassroomId = largeRoom.Id
+                    }
+                ]
+            });
+        await db.SaveChangesAsync();
 
         db.ChangeTracker.Clear();
         plan = await db.SchedulePlans.SingleAsync();