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

自选项目实验优化

Browse Source
This commit is contained in:
biss
2026-08-11 09:29:44 +08:00 Unverified
parent 9b32ee916c
commit e69ab6f580
11 changed files with 7578 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Jiaowu.Api/Controllers/ExperimentGradesController.cs
+40 -2
View File
@@ -419,6 +419,14 @@ public sealed class ExperimentGradesController(
var recordsSource = db.ExperimentGradeRecords.AsNoTracking()
.Where(x => x.ExperimentGradeSheetId == id);
var scope = currentUserDataScope.Current;
var isBoundInstructor = scope.Scope == DataScope.Self &&
scope.IsInRole(SystemRoles.Teacher) &&
sheet.ArrangementMode == ExperimentArrangementMode.SelfScheduled;
if (isBoundInstructor)
recordsSource = recordsSource.Where(x =>
x.ExperimentSession != null && x.ExperimentSession.Instructors.Any(
instructor => instructor.Teacher!.UserId == scope.UserId));
if (studentKeyword is not null)
recordsSource = recordsSource.Where(x =>
x.Student!.StudentNumber.Contains(studentKeyword) ||
@@ -512,7 +520,7 @@ public sealed class ExperimentGradesController(
sheet.CreatedAt,
sheet.UpdatedAt
},
CanEdit = CanEdit(task) &&
CanEdit = (CanEdit(task) || isBoundInstructor) &&
sheet.Status is
ExperimentGradeSheetStatus.Draft or
ExperimentGradeSheetStatus.Returned,
@@ -584,13 +592,18 @@ public sealed class ExperimentGradesController(
.Include(x => x.Items)
.Include(x => x.Records)
.ThenInclude(x => x.ItemScores)
.Include(x => x.Records)
.ThenInclude(x => x.ExperimentSession)
.ThenInclude(x => x!.Instructors)
.ThenInclude(x => x.Teacher)
.Include(x => x.ExperimentProject)
.ThenInclude(x => x!.TeachingTask)
.ThenInclude(x => x!.Teachers)
.ThenInclude(x => x.Teacher)
.FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
if (sheet is null) return NotFound();
if (!CanEdit(sheet.ExperimentProject!.TeachingTask!)) return Forbid();
if (!CanEdit(sheet.ExperimentProject!.TeachingTask!) &&
!CanEditBoundSessionRecords(sheet, request.Records)) return Forbid();
if (sheet.Status is not (
ExperimentGradeSheetStatus.Draft or
ExperimentGradeSheetStatus.Returned))
@@ -1138,6 +1151,15 @@ public sealed class ExperimentGradesController(
private IQueryable<ExperimentProject> ScopedProjects()
{
var scope = currentUserDataScope.Current;
if (scope.Scope == DataScope.Self && scope.IsInRole(SystemRoles.Teacher))
return db.ExperimentProjects.Where(x =>
(x.ArrangementMode == ExperimentArrangementMode.Centralized &&
x.TeachingTask!.Teachers.Any(item =>
item.Teacher!.UserId == scope.UserId)) ||
(x.ArrangementMode == ExperimentArrangementMode.SelfScheduled &&
x.Sessions.Any(session => session.Instructors.Any(instructor =>
instructor.Teacher!.UserId == scope.UserId))));
var taskIds = AccessibleTeachingTasks().Select(x => x.Id);
return db.ExperimentProjects.Where(x =>
taskIds.Contains(x.TeachingTaskId));
@@ -1160,6 +1182,22 @@ public sealed class ExperimentGradesController(
currentUserDataScope.Current.IsInRole(SystemRoles.SuperAdmin) ||
IsAssignedTeacher(task);
private bool CanEditBoundSessionRecords(
ExperimentGradeSheet sheet,
IReadOnlyCollection<ExperimentGradeRecordRequest> requestedRecords)
{
var scope = currentUserDataScope.Current;
if (sheet.ExperimentProject!.ArrangementMode != ExperimentArrangementMode.SelfScheduled ||
scope.Scope != DataScope.Self || !scope.IsInRole(SystemRoles.Teacher) ||
requestedRecords.Count == 0)
return false;
var requestedIds = requestedRecords.Select(x => x.Id).ToHashSet();
return requestedIds.All(recordId => sheet.Records.Any(record =>
record.Id == recordId &&
record.ExperimentSession?.Instructors.Any(instructor =>
instructor.Teacher?.UserId == scope.UserId) == true));
}
private bool IsAssignedTeacher(TeachingTask task) =>
task.Teachers.Any(x =>
x.Teacher?.UserId == currentUserDataScope.Current.UserId);
src/Jiaowu.Api/Controllers/ExperimentsController.cs
+140 -23
View File
@@ -87,6 +87,7 @@ public sealed class ExperimentsController(
x.Name,
x.AcademicTermId,
x.CourseId,
x.SchedulingMode,
TermName = x.AcademicTerm!.Name,
TermStartDate = x.AcademicTerm.StartDate,
TermEndDate = x.AcademicTerm.EndDate,
@@ -163,6 +164,19 @@ public sealed class ExperimentsController(
,x.TeachingVenueNature
})
.ToListAsync(cancellationToken),
Teachers = await AccessibleTeachingTasks().AsNoTracking()
.SelectMany(x => x.Teachers)
.Where(x => x.Teacher != null && x.Teacher.Status == TeacherStatus.Active)
.Select(x => new
{
x.TeachingTaskId,
x.TeacherId,
TeacherNumber = x.Teacher!.TeacherNumber,
TeacherName = x.Teacher.Name
})
.Distinct()
.OrderBy(x => x.TeacherNumber)
.ToListAsync(cancellationToken),
Periods = periodItems
});
}
@@ -183,6 +197,11 @@ public sealed class ExperimentsController(
int pageSize = 20)
{
var source = ScopedProjects().AsNoTracking();
var scope = currentUserDataScope.Current;
if (scope.Scope == DataScope.Self && scope.IsInRole(SystemRoles.Teacher))
source = source.Where(x => x.Sessions.Any(session =>
session.Instructors.Any(instructor =>
instructor.Teacher!.UserId == scope.UserId)));
if (academicTermId.HasValue)
source = source.Where(x =>
x.TeachingTask!.AcademicTermId == academicTermId);
@@ -249,6 +268,8 @@ public sealed class ExperimentsController(
x.Requirements,
x.StartDate,
x.EndDate,
x.SelectionStartsAt,
x.SelectionEndsAt,
x.Status,
x.PublishedAt,
x.ClosedAt,
@@ -294,6 +315,14 @@ public sealed class ExperimentsController(
ClassroomName = item.Classroom!.Name,
BuildingName = item.Classroom.Building!.Name,
CampusName = item.Classroom.Building.Campus!.Name
,InstructorNames = item.Instructors
.OrderBy(instructor => instructor.Teacher!.TeacherNumber)
.Select(instructor => instructor.Teacher!.Name)
,InstructorTeacherIds = item.Instructors
.Select(instructor => instructor.TeacherId)
,CanManage = scope.Scope != DataScope.Self ||
item.Instructors.Any(instructor =>
instructor.Teacher!.UserId == scope.UserId)
})
})
.ToListAsync(cancellationToken);
@@ -337,6 +366,8 @@ public sealed class ExperimentsController(
x.Requirements,
x.StartDate,
x.EndDate,
x.SelectionStartsAt,
x.SelectionEndsAt,
x.Status,
AcademicTermId = x.TeachingTask!.AcademicTermId,
TermName = x.TeachingTask.AcademicTerm!.Name,
@@ -376,6 +407,9 @@ public sealed class ExperimentsController(
ClassroomName = item.Classroom!.Name,
BuildingName = item.Classroom.Building!.Name,
CampusName = item.Classroom.Building.Campus!.Name
,InstructorNames = item.Instructors
.OrderBy(instructor => instructor.Teacher!.TeacherNumber)
.Select(instructor => instructor.Teacher!.Name)
}),
MyBooking = x.Bookings
.Where(item =>
@@ -430,7 +464,9 @@ public sealed class ExperimentsController(
Description = Normalize(request.Description),
Requirements = Normalize(request.Requirements),
StartDate = request.StartDate,
EndDate = request.EndDate
EndDate = request.EndDate,
SelectionStartsAt = NormalizeSelectionTime(request.SelectionStartsAt),
SelectionEndsAt = NormalizeSelectionTime(request.SelectionEndsAt)
};
db.ExperimentProjects.Add(project);
await db.SaveChangesAsync(cancellationToken);
@@ -569,7 +605,9 @@ public sealed class ExperimentsController(
Description = Normalize(request.Description),
Requirements = Normalize(request.Requirements),
StartDate = request.StartDate,
EndDate = request.EndDate
EndDate = request.EndDate,
SelectionStartsAt = NormalizeSelectionTime(request.SelectionStartsAt),
SelectionEndsAt = NormalizeSelectionTime(request.SelectionEndsAt)
});
}
}
@@ -645,6 +683,8 @@ public sealed class ExperimentsController(
project.Requirements = Normalize(request.Requirements);
project.StartDate = request.StartDate;
project.EndDate = request.EndDate;
project.SelectionStartsAt = NormalizeSelectionTime(request.SelectionStartsAt);
project.SelectionEndsAt = NormalizeSelectionTime(request.SelectionEndsAt);
await db.SaveChangesAsync(cancellationToken);
return NoContent();
}
@@ -755,6 +795,7 @@ public sealed class ExperimentsController(
{
var project = await ScopedProjects()
.Include(x => x.Sessions)
.ThenInclude(x => x.Instructors)
.Include(x => x.TeachingTask)
.ThenInclude(x => x!.Course)
.FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
@@ -774,6 +815,14 @@ public sealed class ExperimentsController(
(x.SessionDate < project.StartDate ||
x.SessionDate > project.EndDate)))
return ConflictProblem("存在不在项目开放日期范围内的实验场次。");
if (project.ArrangementMode == ExperimentArrangementMode.SelfScheduled &&
(project.SelectionStartsAt is null || project.SelectionEndsAt is null ||
project.SelectionStartsAt >= project.SelectionEndsAt))
return ConflictProblem("请先设置有效的开始选课和截至选课时间。");
if (project.ArrangementMode == ExperimentArrangementMode.SelfScheduled &&
project.Sessions.Any(x => x.Status == ExperimentSessionStatus.Scheduled &&
x.Instructors.Count == 0))
return ConflictProblem("请为每个有效实验场次至少指定一位指导老师。");
project.Status = ExperimentProjectStatus.Published;
project.PublishedAt = DateTime.UtcNow;
@@ -872,6 +921,10 @@ public sealed class ExperimentsController(
cancellationToken),
Notes = Normalize(request.Notes)
};
session.Instructors = request.InstructorTeacherIds!
.Distinct()
.Select(teacherId => new ExperimentSessionInstructor { TeacherId = teacherId })
.ToList();
db.ExperimentSessions.Add(session);
await db.SaveChangesAsync(cancellationToken);
@@ -907,16 +960,14 @@ public sealed class ExperimentsController(
if (request.Items.Count > 100)
return Task.FromResult<ActionResult>(
ValidationProblem("单次最多安排 100 条实验场次。"));
if (request.Items.Any(x => x.ProjectId == Guid.Empty) ||
request.Items.Select(x => x.ProjectId).Distinct().Count() !=
request.Items.Count)
if (request.Items.Any(x => x.ProjectId == Guid.Empty))
return Task.FromResult<ActionResult>(
ValidationProblem("同一批次中每个实验项目只能安排一个场次。"));
ValidationProblem("实验项目不能为空。"));
return db.ExecuteInRetriableTransactionAsync<ActionResult>(
async transaction =>
{
var projectIds = request.Items.Select(x => x.ProjectId).ToList();
var projectIds = request.Items.Select(x => x.ProjectId).Distinct().ToList();
var projects = await ScopedProjects()
.Include(x => x.TeachingTask)
.ThenInclude(x => x!.AcademicTerm)
@@ -960,6 +1011,10 @@ public sealed class ExperimentsController(
cancellationToken),
Notes = Normalize(item.Notes)
};
session.Instructors = item.InstructorTeacherIds!
.Distinct()
.Select(teacherId => new ExperimentSessionInstructor { TeacherId = teacherId })
.ToList();
db.ExperimentSessions.Add(session);
await db.SaveChangesAsync(cancellationToken);
createdSessions.Add((project, session));
@@ -1003,12 +1058,11 @@ public sealed class ExperimentsController(
.Include(x => x.ExperimentProject)
.ThenInclude(x => x!.TeachingTask)
.ThenInclude(x => x!.Course)
.Include(x => x.Instructors)
.ThenInclude(x => x.Teacher)
.FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
if (session is null ||
!await ScopedProjects().AnyAsync(
x => x.Id == session.ExperimentProjectId,
cancellationToken))
return NotFound();
if (session is null) return NotFound();
if (!CanManageSession(session)) return Forbid();
if (session.Status == ExperimentSessionStatus.Cancelled)
return NoContent();
@@ -1070,12 +1124,11 @@ public sealed class ExperimentsController(
{
var session = await db.ExperimentSessions.AsNoTracking()
.Include(x => x.ExperimentProject)
.Include(x => x.Instructors)
.ThenInclude(x => x.Teacher)
.FirstOrDefaultAsync(x => x.Id == id, cancellationToken);
if (session is null ||
!await ScopedProjects().AnyAsync(
x => x.Id == session.ExperimentProjectId,
cancellationToken))
return NotFound();
if (session is null) return NotFound();
if (!CanManageSession(session)) return Forbid();
if (session.ExperimentProject!.ArrangementMode ==
ExperimentArrangementMode.Centralized)
@@ -1138,6 +1191,12 @@ public sealed class ExperimentsController(
if (session.ExperimentProject.ArrangementMode !=
ExperimentArrangementMode.SelfScheduled)
return ConflictProblem("集中安排实验无需学生预约。");
var now = DateTime.UtcNow;
if (session.ExperimentProject.SelectionStartsAt is null ||
session.ExperimentProject.SelectionEndsAt is null ||
now < session.ExperimentProject.SelectionStartsAt ||
now > session.ExperimentProject.SelectionEndsAt)
return ConflictProblem("当前不在该实验项目的选课时间范围内。");
if (!await TeachingTaskRosterQuery
.TaskIdsForStudent(db, student.Id)
.ContainsAsync(
@@ -1243,11 +1302,34 @@ public sealed class ExperimentsController(
IsolationLevel.Serializable);
}
private async Task<string?> ValidateInstructorTeacherIdsAsync(
ExperimentProject project,
IReadOnlyList<Guid>? instructorTeacherIds,
CancellationToken cancellationToken)
{
var ids = instructorTeacherIds?.Where(x => x != Guid.Empty).Distinct().ToList() ?? [];
if (ids.Count == 0) return "请至少选择一位指导老师。";
if (ids.Count > 20) return "单个实验场次最多选择 20 位指导老师。";
var validCount = await db.TeachingTaskTeachers.AsNoTracking()
.Where(x => x.TeachingTaskId == project.TeachingTaskId &&
ids.Contains(x.TeacherId) &&
x.Teacher!.Status == TeacherStatus.Active)
.Select(x => x.TeacherId)
.Distinct()
.CountAsync(cancellationToken);
return validCount == ids.Count
? null
: "指导老师必须是该教学任务的在职任课教师。";
}
private async Task<string?> ValidateSessionAsync(
ExperimentProject project,
ExperimentSessionRequest request,
CancellationToken cancellationToken)
{
var instructorProblem = await ValidateInstructorTeacherIdsAsync(
project, request.InstructorTeacherIds, cancellationToken);
if (instructorProblem is not null) return instructorProblem;
if (request.SessionDate < project.StartDate ||
request.SessionDate > project.EndDate)
return "实验场次日期必须在项目开放日期范围内。";
@@ -1475,6 +1557,16 @@ public sealed class ExperimentsController(
taskIds.Contains(x.TeachingTaskId));
}
private bool CanManageSession(ExperimentSession session)
{
var scope = currentUserDataScope.Current;
if (scope.Scope is DataScope.All or DataScope.College)
return true;
return scope.IsInRole(SystemRoles.Teacher) &&
session.Instructors.Any(instructor =>
instructor.Teacher?.UserId == scope.UserId);
}
private bool CanCorrectPublishedProject(TeachingTask task)
{
var scope = currentUserDataScope.Current;
@@ -1569,6 +1661,12 @@ public sealed class ExperimentsController(
return "实验安排方式无效。";
if (request.StartDate > request.EndDate)
return "项目开始日期不能晚于结束日期。";
if (request.ArrangementMode == ExperimentArrangementMode.SelfScheduled &&
request.SelectionStartsAt.HasValue != request.SelectionEndsAt.HasValue)
return "开始选课和截至选课时间需要同时填写。";
if (request.SelectionStartsAt.HasValue && request.SelectionEndsAt.HasValue &&
request.SelectionStartsAt >= request.SelectionEndsAt)
return "开始选课时间必须早于截至选课时间。";
if (request.StartDate < term.StartDate ||
request.EndDate > term.EndDate)
return "实验项目日期必须在所属学期起止日期内。";
@@ -1602,6 +1700,15 @@ public sealed class ExperimentsController(
private static string? Normalize(string? value) =>
string.IsNullOrWhiteSpace(value) ? null : value.Trim();
private static DateTime? NormalizeSelectionTime(DateTime? value)
{
if (!value.HasValue) return null;
if (value.Value.Kind == DateTimeKind.Utc) return value.Value;
var china = TimeZoneInfo.FindSystemTimeZoneById("China Standard Time");
return TimeZoneInfo.ConvertTimeToUtc(
DateTime.SpecifyKind(value.Value, DateTimeKind.Unspecified), china);
}
private static List<string>? NormalizeBatchProjectNames(IReadOnlyList<string>? names)
{
if (names is null || names.Count == 0) return null;
@@ -1626,7 +1733,9 @@ public sealed record ExperimentProjectRequest(
[MaxLength(1000)] string? Requirements,
DateOnly StartDate,
DateOnly EndDate,
Guid? ScheduleEntryId = null);
Guid? ScheduleEntryId = null,
DateTime? SelectionStartsAt = null,
DateTime? SelectionEndsAt = null);
public sealed record PublishedExperimentProjectCorrectionRequest(
[Required, MaxLength(120)] string Name,
@@ -1643,7 +1752,9 @@ public sealed record ExperimentProjectBatchRequest(
DateOnly StartDate,
DateOnly EndDate,
IReadOnlyList<string>? Names = null,
bool GenerateSequentialNames = false)
bool GenerateSequentialNames = false,
DateTime? SelectionStartsAt = null,
DateTime? SelectionEndsAt = null)
{
public ExperimentProjectRequest ForTeachingTask(Guid teachingTaskId) =>
new(
@@ -1654,7 +1765,10 @@ public sealed record ExperimentProjectBatchRequest(
Description,
Requirements,
StartDate,
EndDate);
EndDate,
null,
SelectionStartsAt,
SelectionEndsAt);
}
public sealed record ExperimentProjectBulkRequest(
@@ -1670,7 +1784,8 @@ public sealed record ExperimentSessionRequest(
[Range(1, 30)] int StartPeriod,
[Range(1, 30)] int PeriodCount,
[Range(1, 10000)] int Capacity,
[MaxLength(500)] string? Notes);
[MaxLength(500)] string? Notes,
[Required, MinLength(1)] IReadOnlyList<Guid>? InstructorTeacherIds = null);
public sealed record ExperimentSessionBatchRequest(
[Required] IReadOnlyList<ExperimentSessionBatchItem> Items);
@@ -1682,7 +1797,8 @@ public sealed record ExperimentSessionBatchItem(
[Range(1, 30)] int StartPeriod,
[Range(1, 30)] int PeriodCount,
[Range(1, 10000)] int Capacity,
[MaxLength(500)] string? Notes)
[MaxLength(500)] string? Notes,
[Required, MinLength(1)] IReadOnlyList<Guid>? InstructorTeacherIds = null)
{
public ExperimentSessionRequest ToSessionRequest() =>
new(
@@ -1691,7 +1807,8 @@ public sealed record ExperimentSessionBatchItem(
StartPeriod,
PeriodCount,
Capacity,
Notes);
Notes,
InstructorTeacherIds);
}
public sealed record ExperimentPeriodOption(
src/Jiaowu.Api/Domain/Academic/ExperimentEntities.cs
+12
View File
@@ -18,6 +18,9 @@ public sealed class ExperimentProject : EntityBase
public string? Requirements { get; set; }
public DateOnly StartDate { get; set; }
public DateOnly EndDate { get; set; }
// 自主预约项目可单独控制学生可选场次的时间窗口（UTC 时刻）。
public DateTime? SelectionStartsAt { get; set; }
public DateTime? SelectionEndsAt { get; set; }
public ExperimentProjectStatus Status { get; set; } =
ExperimentProjectStatus.Draft;
public DateTime? PublishedAt { get; set; }
@@ -43,6 +46,15 @@ public sealed class ExperimentSession : EntityBase
ExperimentSessionStatus.Scheduled;
public DateTime? CancelledAt { get; set; }
public ICollection<ExperimentBooking> Bookings { get; set; } = [];
public ICollection<ExperimentSessionInstructor> Instructors { get; set; } = [];
}
public sealed class ExperimentSessionInstructor : EntityBase
{
public Guid ExperimentSessionId { get; set; }
public ExperimentSession? ExperimentSession { get; set; }
public Guid TeacherId { get; set; }
public Teacher? Teacher { get; set; }
}
public sealed class ExperimentBooking : EntityBase
src/Jiaowu.Api/Infrastructure/Exams/ExamPublishJobs.cs
+9
View File
@@ -263,6 +263,7 @@ public sealed class ExamPublishJobProcessor(
var projects = await db.ExperimentProjects
.Include(x => x.Sessions)
.ThenInclude(x => x.Instructors)
.Include(x => x.TeachingTask)
.ThenInclude(x => x!.Course)
.Where(x => ids.Contains(x.Id))
@@ -282,6 +283,14 @@ public sealed class ExamPublishJobProcessor(
if (project.Sessions.Any(x => x.Status == ExperimentSessionStatus.Scheduled &&
(x.SessionDate < project.StartDate || x.SessionDate > project.EndDate)))
throw new ExamPublishValidationException($"“{project.Name}”存在不在开放日期范围内的实验场次。");
if (project.ArrangementMode == ExperimentArrangementMode.SelfScheduled &&
(project.SelectionStartsAt is null || project.SelectionEndsAt is null ||
project.SelectionStartsAt >= project.SelectionEndsAt))
throw new ExamPublishValidationException($"“{project.Name}”未设置有效的选课时间范围。");
if (project.ArrangementMode == ExperimentArrangementMode.SelfScheduled &&
project.Sessions.Any(x => x.Status == ExperimentSessionStatus.Scheduled &&
x.Instructors.Count == 0))
throw new ExamPublishValidationException($"“{project.Name}”存在未指定指导老师的实验场次。");
}
job.CurrentStep = "正在发布实验项目";
src/Jiaowu.Api/Infrastructure/Persistence/AppDbContext.cs
+17
View File
@@ -51,6 +51,8 @@ public sealed class AppDbContext(DbContextOptions<AppDbContext> options)
Set<ClassroomReservation>();
public DbSet<ExperimentProject> ExperimentProjects => Set<ExperimentProject>();
public DbSet<ExperimentSession> ExperimentSessions => Set<ExperimentSession>();
public DbSet<ExperimentSessionInstructor> ExperimentSessionInstructors =>
Set<ExperimentSessionInstructor>();
public DbSet<ExperimentBooking> ExperimentBookings => Set<ExperimentBooking>();
public DbSet<ExperimentGradeSheet> ExperimentGradeSheets =>
Set<ExperimentGradeSheet>();
@@ -690,6 +692,8 @@ public sealed class AppDbContext(DbContextOptions<AppDbContext> options)
entity.Property(x => x.Name).HasMaxLength(120);
entity.Property(x => x.Description).HasMaxLength(1000);
entity.Property(x => x.Requirements).HasMaxLength(1000);
entity.Property(x => x.SelectionStartsAt).HasConversion<UtcDateTimeConverter>();
entity.Property(x => x.SelectionEndsAt).HasConversion<UtcDateTimeConverter>();
// 集中安排会为同一教学任务的每一条实验课表记录生成项目；
// 自行安排仍由控制器保持“教学任务 + 编码”唯一。
entity.HasIndex(x => new
@@ -805,6 +809,19 @@ public sealed class AppDbContext(DbContextOptions<AppDbContext> options)
.OnDelete(DeleteBehavior.Restrict);
});
builder.Entity<ExperimentSessionInstructor>(entity =>
{
entity.HasIndex(x => new { x.ExperimentSessionId, x.TeacherId })
.IsUnique();
entity.HasIndex(x => x.TeacherId);
entity.HasOne(x => x.ExperimentSession).WithMany(x => x.Instructors)
.HasForeignKey(x => x.ExperimentSessionId)
.OnDelete(DeleteBehavior.Cascade);
entity.HasOne(x => x.Teacher).WithMany()
.HasForeignKey(x => x.TeacherId)
.OnDelete(DeleteBehavior.Restrict);
});
builder.Entity<ExperimentCourseGrade>(entity =>
{
entity.Property(x => x.WeightedAverageScore).HasPrecision(5, 1);
src/Jiaowu.Api/Infrastructure/Persistence/DevelopmentSqliteMigrator.cs
+27
View File
@@ -104,6 +104,8 @@ public sealed class DevelopmentSqliteMigrator(
"20260809_54_experiment_course_grades";
private const string NotificationInboxIndexesMigration =
"20260810_55_notification_inbox_indexes";
private const string SelfScheduledExperimentSelectionMigration =
"20260811_56_self_scheduled_experiment_selection";
public async Task MigrateAsync(CancellationToken cancellationToken = default)
{
@@ -737,6 +739,10 @@ public sealed class DevelopmentSqliteMigrator(
NotificationInboxIndexesMigration,
NotificationInboxIndexesStatements,
cancellationToken);
await ApplyMigrationAsync(
SelfScheduledExperimentSelectionMigration,
SelfScheduledExperimentSelectionStatements,
cancellationToken);
}
private async Task ApplyMigrationAsync(
@@ -3129,6 +3135,27 @@ public sealed class DevelopmentSqliteMigrator(
"""
];
private static readonly string[] SelfScheduledExperimentSelectionStatements =
[
"ALTER TABLE \"ExperimentProjects\" ADD COLUMN \"SelectionStartsAt\" TEXT NULL;",
"ALTER TABLE \"ExperimentProjects\" ADD COLUMN \"SelectionEndsAt\" TEXT NULL;",
"""
CREATE TABLE "ExperimentSessionInstructors" (
"Id" TEXT NOT NULL CONSTRAINT "PK_ExperimentSessionInstructors" PRIMARY KEY,
"ExperimentSessionId" TEXT NOT NULL,
"TeacherId" TEXT NOT NULL,
"CreatedAt" TEXT NOT NULL,
"UpdatedAt" TEXT NOT NULL,
CONSTRAINT "FK_ExperimentSessionInstructors_ExperimentSessions_ExperimentSessionId"
FOREIGN KEY ("ExperimentSessionId") REFERENCES "ExperimentSessions" ("Id") ON DELETE CASCADE,
CONSTRAINT "FK_ExperimentSessionInstructors_Teachers_TeacherId"
FOREIGN KEY ("TeacherId") REFERENCES "Teachers" ("Id") ON DELETE RESTRICT
);
""",
"CREATE UNIQUE INDEX \"IX_ExperimentSessionInstructors_ExperimentSessionId_TeacherId\" ON \"ExperimentSessionInstructors\" (\"ExperimentSessionId\", \"TeacherId\");",
"CREATE INDEX \"IX_ExperimentSessionInstructors_TeacherId\" ON \"ExperimentSessionInstructors\" (\"TeacherId\");"
];
private static readonly string[] ReusableCourseGroupsStatements =
[
"""
src/Jiaowu.Api/Infrastructure/Persistence/Migrations/MySql/20260811011348_AddSelfScheduledExperimentSelectionWindowsAndInstructors.Designer.cs
Generated
+6991
View File
File diff suppressed because it is too large Load Diff
src/Jiaowu.Api/Infrastructure/Persistence/Migrations/MySql/20260811011348_AddSelfScheduledExperimentSelectionWindowsAndInstructors.cs
+81
View File
@@ -0,0 +1,81 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
{
/// <inheritdoc />
public partial class AddSelfScheduledExperimentSelectionWindowsAndInstructors : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<DateTime>(
name: "SelectionEndsAt",
table: "ExperimentProjects",
type: "datetime(6)",
nullable: true);
migrationBuilder.AddColumn<DateTime>(
name: "SelectionStartsAt",
table: "ExperimentProjects",
type: "datetime(6)",
nullable: true);
migrationBuilder.CreateTable(
name: "ExperimentSessionInstructors",
columns: table => new
{
Id = table.Column<Guid>(type: "char(36)", nullable: false),
ExperimentSessionId = table.Column<Guid>(type: "char(36)", nullable: false),
TeacherId = table.Column<Guid>(type: "char(36)", nullable: false),
CreatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false),
UpdatedAt = table.Column<DateTime>(type: "datetime(6)", nullable: false)
},
constraints: table =>
{
table.PrimaryKey("PK_ExperimentSessionInstructors", x => x.Id);
table.ForeignKey(
name: "FK_ExperimentSessionInstructors_ExperimentSessions_ExperimentSe~",
column: x => x.ExperimentSessionId,
principalTable: "ExperimentSessions",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
table.ForeignKey(
name: "FK_ExperimentSessionInstructors_Teachers_TeacherId",
column: x => x.TeacherId,
principalTable: "Teachers",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
})
.Annotation("MySQL:Charset", "utf8mb4");
migrationBuilder.CreateIndex(
name: "IX_ExperimentSessionInstructors_ExperimentSessionId_TeacherId",
table: "ExperimentSessionInstructors",
columns: new[] { "ExperimentSessionId", "TeacherId" },
unique: true);
migrationBuilder.CreateIndex(
name: "IX_ExperimentSessionInstructors_TeacherId",
table: "ExperimentSessionInstructors",
column: "TeacherId");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropTable(
name: "ExperimentSessionInstructors");
migrationBuilder.DropColumn(
name: "SelectionEndsAt",
table: "ExperimentProjects");
migrationBuilder.DropColumn(
name: "SelectionStartsAt",
table: "ExperimentProjects");
}
}
}
src/Jiaowu.Api/Infrastructure/Persistence/Migrations/MySql/AppDbContextModelSnapshot.cs
+55
View File
@@ -2520,6 +2520,12 @@ namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
b.Property<int?>("ScheduleWeek")
.HasColumnType("int");
b.Property<DateTime?>("SelectionEndsAt")
.HasColumnType("datetime(6)");
b.Property<DateTime?>("SelectionStartsAt")
.HasColumnType("datetime(6)");
b.Property<DateTime>("StartDate")
.HasColumnType("date");
@@ -2596,6 +2602,34 @@ namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
b.ToTable("ExperimentSessions");
});
modelBuilder.Entity("Jiaowu.Api.Domain.Academic.ExperimentSessionInstructor", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<DateTime>("CreatedAt")
.HasColumnType("datetime(6)");
b.Property<Guid>("ExperimentSessionId")
.HasColumnType("char(36)");
b.Property<Guid>("TeacherId")
.HasColumnType("char(36)");
b.Property<DateTime>("UpdatedAt")
.HasColumnType("datetime(6)");
b.HasKey("Id");
b.HasIndex("TeacherId");
b.HasIndex("ExperimentSessionId", "TeacherId")
.IsUnique();
b.ToTable("ExperimentSessionInstructors");
});
modelBuilder.Entity("Jiaowu.Api.Domain.Academic.GradeItem", b =>
{
b.Property<Guid>("Id")
@@ -5970,6 +6004,25 @@ namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
b.Navigation("ExperimentProject");
});
modelBuilder.Entity("Jiaowu.Api.Domain.Academic.ExperimentSessionInstructor", b =>
{
b.HasOne("Jiaowu.Api.Domain.Academic.ExperimentSession", "ExperimentSession")
.WithMany("Instructors")
.HasForeignKey("ExperimentSessionId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.HasOne("Jiaowu.Api.Domain.Academic.Teacher", "Teacher")
.WithMany()
.HasForeignKey("TeacherId")
.OnDelete(DeleteBehavior.Restrict)
.IsRequired();
b.Navigation("ExperimentSession");
b.Navigation("Teacher");
});
modelBuilder.Entity("Jiaowu.Api.Domain.Academic.GradeItem", b =>
{
b.HasOne("Jiaowu.Api.Domain.Academic.GradeSheet", "GradeSheet")
@@ -6843,6 +6896,8 @@ namespace Jiaowu.Api.Infrastructure.Persistence.Migrations.MySql
modelBuilder.Entity("Jiaowu.Api.Domain.Academic.ExperimentSession", b =>
{
b.Navigation("Bookings");
b.Navigation("Instructors");
});
modelBuilder.Entity("Jiaowu.Api.Domain.Academic.GradeItem", b =>