xiaoxia/xiaoxia-saas
1
0
Fork 0
Code Issues 11 Pull Requests 3 Actions 2 Packages Projects Releases 7 Wiki Activity

fix: 剪辑计划编辑再生成 - completed/failed后编辑自动切回editing #383

Merged
xiaoxia merged 2 commits from fix/edit-plan-resume-editing into develop 2026-07-16 08:18:19 +08:00
Conversation 2 Commits 2 Files Changed 3
+142 -1
xiaoxia commented 2026-07-16 08:00:24 +08:00
Owner
Copy Link
Copy Source

问题

剪辑计划生成一次后状态变为 COMPLETED，无法再次生成——can_generate() 要求 status == EDITING，没有回退路径。

修复方案

用户编辑操作时自动从 completed/failed 切回 editing 状态，不需要额外的"重新编辑"按钮。

  • EditPlan 新增 resume_editing 方法（completed/failed → editing）
  • transition_status 支持从 completed/failed 切回 editing
  • 5个编辑操作入口自动回退状态：update_plan / update_plan_config / create_clip / update_clip / assign_asset
  • 新增7个单元测试，覆盖各种编辑操作触发重新编辑的场景

验证

51个相关单测全绿，零回归

## 问题 剪辑计划生成一次后状态变为 COMPLETED，无法再次生成——can_generate() 要求 status == EDITING，没有回退路径。 ## 修复方案 用户编辑操作时自动从 completed/failed 切回 editing 状态，不需要额外的"重新编辑"按钮。 - EditPlan 新增 resume_editing 方法（completed/failed → editing） - transition_status 支持从 completed/failed 切回 editing - 5个编辑操作入口自动回退状态：update_plan / update_plan_config / create_clip / update_clip / assign_asset - 新增7个单元测试，覆盖各种编辑操作触发重新编辑的场景 ## 验证 51个相关单测全绿，零回归
xiaoxia added 1 commit 2026-07-16 08:00:24 +08:00
fix: 剪辑计划'编辑再生成'P1修复 - completed/failed后编辑自动切回editing
CI Build & Deploy Pipeline / Build Staging API Image (push) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Web Image (push) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Worker Image (push) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (push) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production API Image (push) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Web Image (push) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Worker Image (push) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (push) Has been skipped
Details
CI Build & Deploy Pipeline / Staging API Integration Tests (push) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (push) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (push) Has been skipped
Details
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 46s
Details
CI/CD Pipeline / Frontend Lint (push) Successful in 49s
Details
CI/CD Pipeline / Unit Tests (push) Successful in 2m3s
Details
CI/CD Pipeline / Integration Tests (push) Successful in 1m30s
Details
CI Build & Deploy Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Failing after 1m3s
Details
CI Build & Deploy Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 56s
Details
CI/CD Pipeline / Unit Tests (pull_request) Has been cancelled
Details
CI/CD Pipeline / Integration Tests (pull_request) Has been cancelled
Details
bee52f04b7 
- EditPlan新增resume_editing方法（completed/failed → editing）
- transition_status支持从completed/failed切回editing
- 5个编辑操作入口自动回退状态：update_plan / update_plan_config / create_clip / update_clip / assign_asset
- 新增7个单元测试，覆盖各种编辑操作触发重新编辑的场景
- 112个相关单测全绿，零回归
xiaoxia added 1 commit 2026-07-16 08:03:09 +08:00
style: black格式化
CI Build & Deploy Pipeline / Build Staging API Image (push) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Web Image (push) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Worker Image (push) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Staging Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (push) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Staging (Watchtower auto-deploy) (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (push) Has been skipped
Details
CI Build & Deploy Pipeline / Staging API Integration Tests (push) Has been skipped
Details
CI Build & Deploy Pipeline / Staging E2E Tests (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Staging API Integration Tests (pull_request) Has been skipped
Details
CI/CD Pipeline / Frontend Lint (push) Successful in 1m25s
Details
CI/CD Pipeline / Frontend Lint (pull_request) Successful in 1m16s
Details
CI Build & Deploy Pipeline / Build Production API Image (push) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Web Image (push) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Worker Image (push) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production API Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (push) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Web Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Build Production Worker Image (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (push) Has been skipped
Details
CI Build & Deploy Pipeline / Deploy Production (pull_request) Has been skipped
Details
CI Build & Deploy Pipeline / Production Browser E2E (pull_request) Has been skipped
Details
CI/CD Pipeline / Validate Code Quality And Tests (pull_request) Successful in 2m54s
Details
CI/CD Pipeline / Unit Tests (push) Successful in 3m13s
Details
CI/CD Pipeline / Validate Code Quality And Tests (push) Successful in 3m16s
Details
CI/CD Pipeline / Unit Tests (pull_request) Successful in 3m7s
Details
CI/CD Pipeline / Integration Tests (pull_request) Successful in 2m16s
Details
CI/CD Pipeline / Integration Tests (push) Successful in 1m30s
Details
fb1fc1cff2
auto-approve-bot approved these changes 2026-07-16 08:07:23 +08:00
auto-approve-bot left a comment
Collaborator
Copy Link
Copy Source

CI全绿，自动审批通过。

CI全绿，自动审批通过。
xiaoxia reviewed 2026-07-16 08:15:45 +08:00
xiaoxia left a comment
Author
Owner
Copy Link
Copy Source

代码审核通过：112个单测全绿，resume_editing逻辑正确，5个编辑入口自动回退覆盖完整

代码审核通过：112个单测全绿，resume_editing逻辑正确，5个编辑入口自动回退覆盖完整
xiaoxia merged commit 731d82412b into develop 2026-07-16 08:18:19 +08:00
Sign in to join this conversation.
Reviewers
No Reviewers
auto-approve-bot
Labels
Clear labels
P0
阻塞性，必须立即处理
 P1
高优先级
 P2
中优先级
 P3
低优先级/后考虑
 architecture
架构设计
 backend
后端相关
 blocked
阻塞中
 bug
Bug修复
 ci-bug
CI本身的bug
 ci-optimization
CI优化类任务
 ci-pipeline
CI流水线/workflow相关
 cleanup
代码清理
 devops
运维/部署/CI
 documentation
文档相关
 feature
新功能
 frontend
前端相关
 question
需要讨论确认
 ready
PR CI通过，可合并
 refactor
代码重构
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
auto-approve-bot xiaoxia
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#383
Delete Branch "fix/edit-plan-resume-editing"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?