biss/Academic-Affairs-System
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 8 Wiki Activity

优化考试排考

Browse Source
This commit is contained in:
biss
2026-07-27 19:31:19 +08:00 Unverified
parent 64decdab7e
commit c3e8a42641
14 changed files with 7013 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Jiaowu.Api.Tests/AutomaticScheduleGeneratorTests.cs
+12
View File
@@ -21,6 +21,14 @@ public sealed class AutomaticScheduleGeneratorTests
await db.Database.EnsureCreatedAsync();
await db.Database.ExecuteSqlRawAsync(
"DROP TABLE \"BackgroundJobOutboxMessages\"");
await db.Database.ExecuteSqlRawAsync(
"DROP TABLE \"ExamRoomInvigilators\"");
await db.Database.ExecuteSqlRawAsync(
"DROP TABLE \"ExamSeats\"");
await db.Database.ExecuteSqlRawAsync(
"DROP TABLE \"ExamRoomSessions\"");
await db.Database.ExecuteSqlRawAsync(
"DROP TABLE \"ExamRooms\"");
var migrator = new DevelopmentSqliteMigrator(
db,
@@ -30,6 +38,10 @@ public sealed class AutomaticScheduleGeneratorTests
Assert.True(await db.ScheduleTimeSlots.CountAsync() == 0);
Assert.True(await db.AutomaticScheduleJobs.CountAsync() == 0);
Assert.True(await db.BackgroundJobOutboxMessages.CountAsync() == 0);
Assert.True(await db.ExamRooms.CountAsync() == 0);
Assert.True(await db.ExamRoomSessions.CountAsync() == 0);
Assert.True(await db.ExamSeats.CountAsync() == 0);
Assert.True(await db.ExamRoomInvigilators.CountAsync() == 0);
Assert.True(await db.Database
.SqlQueryRaw<int>(
"""
tests/Jiaowu.Api.Tests/ExamArrangementServiceTests.cs
+131 -14
View File
@@ -9,7 +9,7 @@ namespace Jiaowu.Api.Tests;
public sealed class ExamArrangementServiceTests
{
[Fact]
public async Task Normal_arrangement_only_updates_selected_session()
public async Task Normal_arrangement_creates_room_seats_for_selected_session()
{
await using var connection = new SqliteConnection("Data Source=:memory:");
await connection.OpenAsync();
@@ -40,23 +40,76 @@ public sealed class ExamArrangementServiceTests
assignInvigilators: true,
CancellationToken.None);
var persistedSelected = await db.ExamSessions
var room = await db.ExamRooms
.Include(x => x.SessionLinks)
.Include(x => x.Seats)
.Include(x => x.Invigilators)
.SingleAsync(x => x.Id == selected.Id);
var persistedUntouched = await db.ExamSessions
.Include(x => x.Invigilators)
.SingleAsync(x => x.Id == untouched.Id);
.SingleAsync();
Assert.True(result.Success);
Assert.NotNull(persistedSelected.ClassroomId);
Assert.Equal(seed.LargeClassroom.Id, persistedSelected.ClassroomId);
Assert.Null(persistedUntouched.ClassroomId);
Assert.Single(persistedSelected.Invigilators);
Assert.Empty(persistedUntouched.Invigilators);
Assert.Contains("1个场次处理完成", result.Message);
Assert.Equal(seed.LargeClassroom.Id, room.ClassroomId);
Assert.Equal(selected.Id, Assert.Single(room.SessionLinks).ExamSessionId);
Assert.Equal(3, room.Seats.Count);
Assert.Single(room.Invigilators);
Assert.False(await db.ExamRoomSessions.AnyAsync(
x => x.ExamSessionId == untouched.Id));
Assert.Contains("1个教学班场次处理完成", result.Message);
Assert.Contains("1名监考教师", result.Message);
Assert.Contains("程序设计", result.Message);
}
[Fact]
public async Task Same_course_sessions_are_interleaved_and_split_across_rooms()
{
await using var connection = new SqliteConnection("Data Source=:memory:");
await connection.OpenAsync();
var options = new DbContextOptionsBuilder<AppDbContext>()
.UseSqlite(connection)
.Options;
await using var db = new AppDbContext(options);
await db.Database.EnsureCreatedAsync();
var seed = await SeedBaseDataAsync(db, "MIXED");
seed.LargeClassroom.Capacity = 4;
seed.SmallClassroom.Capacity = 4;
var plan = new ExamPlan
{
AcademicTermId = seed.Term.Id,
Name = "期末考试"
};
var first = NewExamSession(plan.Id, seed.FirstTask.Id);
var second = NewExamSession(plan.Id, seed.SameCourseTask.Id);
plan.Sessions.Add(first);
plan.Sessions.Add(second);
db.ExamPlans.Add(plan);
await db.SaveChangesAsync();
db.ChangeTracker.Clear();
var result = await new ExamArrangementService(db).ArrangeAsync(
plan.Id,
[first.Id],
assignClassrooms: true,
assignInvigilators: false,
CancellationToken.None);
var rooms = await db.ExamRooms
.Include(x => x.SessionLinks)
.Include(x => x.Seats)
.OrderByDescending(x => x.Seats.Count)
.ToListAsync();
Assert.True(result.Success);
Assert.Equal(2, rooms.Count);
Assert.Equal([4, 2], rooms.Select(x => x.Seats.Count).ToArray());
Assert.All(rooms, room =>
{
Assert.Equal(2, room.SessionLinks.Count);
Assert.Equal(2, room.Seats.Select(x => x.ExamSessionId).Distinct().Count());
Assert.True(room.Seats.Count <= 4);
});
Assert.Equal(6, await db.ExamSeats.CountAsync());
Assert.Contains("2个教学班混排至2个考场", result.Message);
Assert.Contains("自动包含同组1个场次", result.Message);
}
[Fact]
public async Task Makeup_arrangement_only_updates_selected_session()
{
@@ -181,6 +234,13 @@ public sealed class ExamArrangementServiceTests
MajorId = major.Id,
Grade = 2026
};
var secondAdministrativeClass = new AdministrativeClass
{
Code = $"CLASS-2-{suffix}",
Name = "计科 2026-2 班",
MajorId = major.Id,
Grade = 2026
};
var firstCourse = new Course
{
Code = $"COURSE-1-{suffix}",
@@ -216,6 +276,21 @@ public sealed class ExamArrangementServiceTests
CourseId = secondCourse.Id,
Status = TeachingTaskStatus.Published
};
var sameCourseTask = new TeachingTask
{
TaskNumber = $"TASK-3-{suffix}",
Name = "程序设计第二教学班",
AcademicTermId = term.Id,
CourseId = firstCourse.Id,
Status = TeachingTaskStatus.Published,
Classes =
[
new TeachingTaskClass
{
AdministrativeClassId = secondAdministrativeClass.Id
}
]
};
var invigilator = new Teacher
{
TeacherNumber = $"INVIGILATOR-{suffix}",
@@ -233,6 +308,7 @@ public sealed class ExamArrangementServiceTests
smallClassroom,
major,
administrativeClass,
secondAdministrativeClass,
new Student
{
StudentNumber = $"STUDENT-1-{suffix}",
@@ -249,10 +325,43 @@ public sealed class ExamArrangementServiceTests
EnrollmentYear = 2026,
EnrollmentDate = new DateOnly(2026, 9, 1)
},
new Student
{
StudentNumber = $"STUDENT-3-{suffix}",
Name = "学生丙",
AdministrativeClassId = administrativeClass.Id,
EnrollmentYear = 2026,
EnrollmentDate = new DateOnly(2026, 9, 1)
},
new Student
{
StudentNumber = $"STUDENT-4-{suffix}",
Name = "学生丁",
AdministrativeClassId = secondAdministrativeClass.Id,
EnrollmentYear = 2026,
EnrollmentDate = new DateOnly(2026, 9, 1)
},
new Student
{
StudentNumber = $"STUDENT-5-{suffix}",
Name = "学生戊",
AdministrativeClassId = secondAdministrativeClass.Id,
EnrollmentYear = 2026,
EnrollmentDate = new DateOnly(2026, 9, 1)
},
new Student
{
StudentNumber = $"STUDENT-6-{suffix}",
Name = "学生己",
AdministrativeClassId = secondAdministrativeClass.Id,
EnrollmentYear = 2026,
EnrollmentDate = new DateOnly(2026, 9, 1)
},
firstCourse,
secondCourse,
firstTask,
secondTask,
sameCourseTask,
invigilator,
new ScheduleTimeSlot
{
@@ -271,12 +380,20 @@ public sealed class ExamArrangementServiceTests
EndsAt = new TimeOnly(9, 50)
});
await db.SaveChangesAsync();
return new SeedData(term, firstTask, secondTask, classroom);
return new SeedData(
term,
firstTask,
secondTask,
sameCourseTask,
classroom,
smallClassroom);
}
private sealed record SeedData(
AcademicTerm Term,
TeachingTask FirstTask,
TeachingTask SecondTask,
Classroom LargeClassroom);
TeachingTask SameCourseTask,
Classroom LargeClassroom,
Classroom SmallClassroom);
}
tests/Jiaowu.Api.Tests/MySqlMigrationTests.cs
+5 -1
View File
@@ -11,7 +11,7 @@ namespace Jiaowu.Api.Tests;
public sealed class MySqlMigrationTests
{
private const string LatestMigration =
"20260726190000_PersonalCalendarSubscription";
"20260727105716_ExamRoomMixing";
[Fact]
public void Production_migration_is_discoverable_and_generates_mysql_sql()
@@ -54,6 +54,10 @@ public sealed class MySqlMigrationTests
Assert.Contains(
"ADD `CalendarSubscriptionCreatedAt` datetime(6) NULL",
script);
Assert.Contains("CREATE TABLE `ExamRooms`", script);
Assert.Contains("CREATE TABLE `ExamRoomSessions`", script);
Assert.Contains("CREATE TABLE `ExamSeats`", script);
Assert.Contains("CREATE TABLE `ExamRoomInvigilators`", script);
Assert.Contains("SET `ExamDate` = DATE(`StartsAt`)", script);
Assert.Contains("DEFAULT 1", script);
Assert.DoesNotContain("0001-01-01", script);
tests/Jiaowu.Api.Tests/TeachingWorkflowRosterTests.cs
+74 -6
View File
@@ -41,7 +41,26 @@ public sealed class TeachingWorkflowRosterTests
NormalizedUserName = "202601001",
DisplayName = "周同学"
};
var college = new College { Code = "CS", Name = "计算机学院" };
var campus = new Campus { Code = "MAIN", Name = "主校区" };
var college = new College
{
Code = "CS",
Name = "计算机学院",
CampusId = campus.Id
};
var building = new Building
{
Code = "B01",
Name = "第一教学楼",
CampusId = campus.Id
};
var classroom = new Classroom
{
Code = "B01-101",
Name = "101",
BuildingId = building.Id,
Capacity = 60
};
var major = new Major
{
Code = "080901",
@@ -120,7 +139,10 @@ public sealed class TeachingWorkflowRosterTests
db.AddRange(
teacherUser,
studentUser,
campus,
college,
building,
classroom,
major,
administrativeClass,
student,
@@ -130,22 +152,57 @@ public sealed class TeachingWorkflowRosterTests
task);
await db.SaveChangesAsync();
var examSession = new ExamSession
{
TeachingTaskId = task.Id,
ExamDate = new DateOnly(2027, 1, 8),
StartPeriod = 1,
PeriodCount = 2,
StartsAt = new DateTime(2027, 1, 8, 8, 0, 0, DateTimeKind.Utc),
EndsAt = new DateTime(2027, 1, 8, 9, 50, 0, DateTimeKind.Utc),
RequiredInvigilatorCount = 1
};
var examPlan = new ExamPlan
{
AcademicTermId = term.Id,
Name = "期末考试",
Status = ExamPlanStatus.Published,
Sessions =
Status = ExamPlanStatus.Draft,
Sessions = [examSession],
Rooms =
[
new ExamSession
new ExamRoomAssignment
{
TeachingTaskId = task.Id,
CourseId = course.Id,
ClassroomId = classroom.Id,
ExamDate = new DateOnly(2027, 1, 8),
StartPeriod = 1,
PeriodCount = 2,
StartsAt = new DateTime(2027, 1, 8, 8, 0, 0, DateTimeKind.Utc),
EndsAt = new DateTime(2027, 1, 8, 9, 50, 0, DateTimeKind.Utc),
RequiredInvigilatorCount = 1
RequiredInvigilatorCount = 1,
SessionLinks =
[
new ExamRoomSession
{
ExamSessionId = examSession.Id
}
],
Seats =
[
new ExamSeatAssignment
{
ExamSessionId = examSession.Id,
StudentId = student.Id,
SeatNumber = 1
}
],
Invigilators =
[
new ExamRoomInvigilator
{
TeacherId = teacher.Id
}
]
}
]
};
@@ -195,10 +252,14 @@ public sealed class TeachingWorkflowRosterTests
managerScope,
new ExamArrangementService(db),
NoOpAppCache.Instance);
var publishResult = await exams.Publish(examPlan.Id, CancellationToken.None);
Assert.IsType<NoContentResult>(publishResult);
var planResult = Assert.IsType<OkObjectResult>(
await exams.GetPlan(examPlan.Id, CancellationToken.None));
var planSessions = ReadEnumerableProperty(planResult.Value!, "Sessions");
Assert.Equal(1, ReadIntProperty(planSessions.Single(), "StudentCount"));
Assert.Single(ReadEnumerableProperty(planSessions.Single(), "ExamRooms"));
var examSessionId = examPlan.Sessions.Single().Id;
var rosterResult = Assert.IsType<OkObjectResult>(
@@ -212,6 +273,13 @@ public sealed class TeachingWorkflowRosterTests
NoOpAppCache.Instance);
Assert.Single(ReadItems(
await studentExams.GetMySchedule(CancellationToken.None)));
var teacherExams = new ExamsController(
db,
scope,
new ExamArrangementService(db),
NoOpAppCache.Instance);
Assert.Single(ReadItems(
await teacherExams.GetMySchedule(CancellationToken.None)));
var exportResult = Assert.IsType<FileContentResult>(
await exams.ExportSignInSheets(examPlan.Id, CancellationToken.None));