feat: 🗓️ 新增任务块排期能力并完善课程与日程模型

Version: 0.1.1.dev.260207

- 新增并测试通过将任务块排进日程接口 
- 批量导入课程接口增加单双周功能,支持只在单双周上课的课程 📚
- 任务块时间定位逻辑调整为「第几周-周几」模式 🧭

refactor: 🔨 重构时间与日程数据结构

- 完成绝对日期与相对时间的转换逻辑 🔄
  - 后续可根据需求灵活决定时间的传入与输出类型
- 再次重构 schedule 表单结构
  - 拆分为 schedule_event(单)与 schedule(多)
  - 建立前者对后者的一对多关系 🧩

fix: 🐛 大幅调整表结构与业务逻辑,修复大量历史遗留 bug 🔥
This commit is contained in:
LoveLosita
2026-02-07 16:33:30 +08:00
parent 132b7095ac
commit f4bea0576c
17 changed files with 546 additions and 40 deletions

View File

@@ -41,33 +41,61 @@ func (ss *CourseService) AddUserCourses(ctx context.Context, req model.UserImpor
return respond.WrongCourseInfo
}
}
//2.转换为 Schedule 切片
var finalSchedules []model.Schedule
var finalScheduleEvents []model.ScheduleEvent
var pos []int
for _, course := range req.Courses {
var schedules []model.Schedule
// 避免取 range 迭代变量字段地址导致指针复用问题
location := course.Location
for _, arrangement := range course.Arrangements {
weekType := arrangement.WeekType
for week := arrangement.StartWeek; week <= arrangement.EndWeek; week++ {
if weekType == "odd" && week%2 == 0 {
continue
}
if weekType == "even" && week%2 != 0 {
continue
}
//2.转换为 Schedule_event 切片
scheduleEvent := model.ScheduleEvent{
UserID: userID,
Name: course.CourseName,
Location: &location,
Type: "course",
RelID: nil,
CanBeEmbedded: course.IsAllowTasks,
}
finalScheduleEvents = append(finalScheduleEvents, scheduleEvent)
//3.转换为 Schedule 切片
for section := arrangement.StartSection; section <= arrangement.EndSection; section++ {
schedule := model.Schedule{
Type: "course",
Week: week,
DayOfWeek: arrangement.DayOfWeek,
Section: section,
Status: "normal",
UserID: userID,
CanBeEmbedded: course.IsAllowTasks,
Week: week,
DayOfWeek: arrangement.DayOfWeek,
Section: section,
Status: "normal",
UserID: userID,
EventID: 0,
}
schedules = append(schedules, schedule)
finalSchedules = append(finalSchedules, schedule)
pos = append(pos, len(finalScheduleEvents)-1)
}
}
}
finalSchedules = append(finalSchedules, schedules...)
}
//3.调用 DAO 方法添加课程
err := ss.dao.AddUserCourses(finalSchedules)
if err != nil {
return err
}
//4.返回结果
return nil
//TODO 冲突处理、重复检测...预计0.2.0版本之前完成
//4.事务:插入两个表要么都成功,要么都回滚
return ss.dao.Transaction(func(txDAO *dao.CourseDAO) error {
ids, err := txDAO.AddUserCoursesIntoScheduleEvents(ctx, finalScheduleEvents)
if err != nil {
return err
}
// 将生成的 ScheduleEvent ID 赋值给对应的 Schedule 的 EventID 字段
for i := range finalSchedules {
finalSchedules[i].EventID = ids[pos[i]]
}
if err := txDAO.AddUserCoursesIntoSchedule(ctx, finalSchedules); err != nil {
return err
}
return nil
})
}