后端:
1. 阶段 5 schedule 首刀服务化落地,新增 `cmd/schedule`、`services/schedule/{dao,rpc,sv,core}`、`gateway/client/schedule`、`shared/contracts/schedule` 和 schedule port
2. gateway `/api/v1/schedule/*` 切到 schedule zrpc client,HTTP 门面只保留鉴权、参数绑定、超时和轻量转发
3. active-scheduler 的 schedule facts、feedback 和 confirm apply 改为调用 schedule RPC adapter,减少对 `schedule_events`、`schedules`、`task_classes`、`task_items` 的跨域 DB 依赖
4. 单体聊天主动调度 rerun 的 schedule 读写链路切到 schedule RPC,迁移期仅保留 task facts 直读 Gorm
5. 为 schedule zrpc 补充 `Ping` 启动健康检查,并在 gateway client 与 active-scheduler adapter 初始化时校验服务可用
6. `cmd/schedule` 独立初始化 DB / Redis,只 AutoMigrate schedule 自有表,并显式检查迁移期 task / task-class 依赖表
7. 更新 active-scheduler 依赖表检查和 preview confirm apply 抽象,保留旧 Gorm 实现作为迁移期回退路径
8. 补充 `schedule.rpc` 示例配置和 schedule HTTP RPC 超时配置
文档:
1. 更新微服务迁移计划,将阶段 5 schedule 首刀进展、当前切流点、旧实现保留范围和 active-scheduler DB 依赖收缩情况写入基线
115 lines
4.3 KiB
Go
115 lines
4.3 KiB
Go
package sv
|
||
|
||
import (
|
||
"context"
|
||
"errors"
|
||
|
||
rootmodel "github.com/LoveLosita/smartflow/backend/model"
|
||
"github.com/LoveLosita/smartflow/backend/services/schedule/core/applyadapter"
|
||
schedulecontracts "github.com/LoveLosita/smartflow/backend/shared/contracts/schedule"
|
||
)
|
||
|
||
// DeleteScheduleEventByContract 把跨进程删除契约转换为既有 schedule 核心逻辑入参。
|
||
func (ss *ScheduleService) DeleteScheduleEventByContract(ctx context.Context, req schedulecontracts.DeleteScheduleEventsRequest) error {
|
||
events := make([]rootmodel.UserDeleteScheduleEvent, 0, len(req.Events))
|
||
for _, event := range req.Events {
|
||
events = append(events, rootmodel.UserDeleteScheduleEvent{
|
||
ID: event.ID,
|
||
DeleteCourse: event.DeleteCourse,
|
||
DeleteEmbeddedTask: event.DeleteEmbeddedTask,
|
||
})
|
||
}
|
||
return ss.DeleteScheduleEvent(ctx, events, req.UserID)
|
||
}
|
||
|
||
// GetScheduleFactsByWindow 暴露主动调度需要的滚动窗口日程事实。
|
||
func (ss *ScheduleService) GetScheduleFactsByWindow(ctx context.Context, req schedulecontracts.ScheduleWindowRequest) (schedulecontracts.ScheduleWindowFacts, error) {
|
||
if ss == nil || ss.scheduleDAO == nil {
|
||
return schedulecontracts.ScheduleWindowFacts{}, errors.New("schedule facts service 未初始化")
|
||
}
|
||
return ss.scheduleDAO.GetScheduleFactsByWindow(ctx, req)
|
||
}
|
||
|
||
// GetFeedbackSignal 暴露主动调度 unfinished_feedback 的日程目标定位事实。
|
||
func (ss *ScheduleService) GetFeedbackSignal(ctx context.Context, req schedulecontracts.FeedbackRequest) (schedulecontracts.FeedbackFact, bool, error) {
|
||
if ss == nil || ss.scheduleDAO == nil {
|
||
return schedulecontracts.FeedbackFact{}, false, errors.New("schedule feedback service 未初始化")
|
||
}
|
||
return ss.scheduleDAO.GetFeedbackSignal(ctx, req)
|
||
}
|
||
|
||
// ApplyActiveScheduleChanges 在 schedule 服务内执行主动调度正式写入。
|
||
//
|
||
// 职责边界:
|
||
// 1. 只把 shared 契约转换为 schedule 私有 applyadapter 入参;
|
||
// 2. 具体事务、锁定、冲突检查和写库仍由搬运后的 applyadapter 负责;
|
||
// 3. 返回结果只包含正式落库 ID,不回写 active-scheduler preview 状态。
|
||
func (ss *ScheduleService) ApplyActiveScheduleChanges(ctx context.Context, req schedulecontracts.ApplyActiveScheduleRequest) (schedulecontracts.ApplyActiveScheduleResult, error) {
|
||
if ss == nil || ss.applyAdapter == nil {
|
||
return schedulecontracts.ApplyActiveScheduleResult{}, errors.New("schedule apply adapter 未初始化")
|
||
}
|
||
result, err := ss.applyAdapter.ApplyActiveScheduleChanges(ctx, toAdapterApplyRequest(req))
|
||
if err != nil {
|
||
return schedulecontracts.ApplyActiveScheduleResult{}, err
|
||
}
|
||
return schedulecontracts.ApplyActiveScheduleResult{
|
||
ApplyID: result.ApplyID,
|
||
AppliedEventIDs: result.AppliedEventIDs,
|
||
AppliedScheduleIDs: result.AppliedScheduleIDs,
|
||
}, nil
|
||
}
|
||
|
||
func toAdapterApplyRequest(req schedulecontracts.ApplyActiveScheduleRequest) applyadapter.ApplyActiveScheduleRequest {
|
||
changes := make([]applyadapter.ApplyChange, 0, len(req.Changes))
|
||
for _, change := range req.Changes {
|
||
changes = append(changes, applyadapter.ApplyChange{
|
||
ChangeID: change.ChangeID,
|
||
ChangeType: change.ChangeType,
|
||
TargetType: change.TargetType,
|
||
TargetID: change.TargetID,
|
||
ToSlot: toAdapterSlotSpan(change.ToSlot),
|
||
DurationSections: change.DurationSections,
|
||
Metadata: cloneStringMap(change.Metadata),
|
||
})
|
||
}
|
||
return applyadapter.ApplyActiveScheduleRequest{
|
||
PreviewID: req.PreviewID,
|
||
ApplyID: req.ApplyID,
|
||
UserID: req.UserID,
|
||
CandidateID: req.CandidateID,
|
||
Changes: changes,
|
||
RequestedAt: req.RequestedAt,
|
||
TraceID: req.TraceID,
|
||
}
|
||
}
|
||
|
||
func toAdapterSlotSpan(span *schedulecontracts.SlotSpan) *applyadapter.SlotSpan {
|
||
if span == nil {
|
||
return nil
|
||
}
|
||
return &applyadapter.SlotSpan{
|
||
Start: applyadapter.Slot{
|
||
Week: span.Start.Week,
|
||
DayOfWeek: span.Start.DayOfWeek,
|
||
Section: span.Start.Section,
|
||
},
|
||
End: applyadapter.Slot{
|
||
Week: span.End.Week,
|
||
DayOfWeek: span.End.DayOfWeek,
|
||
Section: span.End.Section,
|
||
},
|
||
DurationSections: span.DurationSections,
|
||
}
|
||
}
|
||
|
||
func cloneStringMap(input map[string]string) map[string]string {
|
||
if len(input) == 0 {
|
||
return nil
|
||
}
|
||
output := make(map[string]string, len(input))
|
||
for key, value := range input {
|
||
output[key] = value
|
||
}
|
||
return output
|
||
}
|