refactor: sync workspace removal to main #40

Merged

xiaoxia merged 92 commits from develop into main 2026-06-27 00:51:52 +08:00

Conversation 1 Commits 92 Files Changed 61

+880 -3209

xiaoxia commented 2026-06-27 00:44:41 +08:00

Owner

Copy Link

Copy Source

变更内容

将 workspace 移除的架构变更同步到 main 分支。

架构变更

旧架构: User → Workspace → Project
新架构: User → Project

主要变更

• 移除 Workspace/WorkspaceMember/WorkspaceInvitation 实体
• Project 现在直接关联 owner_user_id 和 shared_users
• 订阅/配额迁移到 User 级别

注意事项

⚠️ 此 PR 包含大量 commit (631个)，建议使用 squash merge

变更类型

• 重构

测试情况

• CI 在 develop 分支已通过
• 需要在 main 合并后重新验证

相关 Issue

关闭 PR #18 (#18)，该 PR 基于旧版 main 已过时。

## 变更内容 将 workspace 移除的架构变更同步到 main 分支。 ### 架构变更 ``` 旧架构: User → Workspace → Project 新架构: User → Project ``` ### 主要变更 - 移除 Workspace/WorkspaceMember/WorkspaceInvitation 实体 - Project 现在直接关联 owner_user_id 和 shared_users - 订阅/配额迁移到 User 级别 ### 注意事项 ⚠️ 此 PR 包含大量 commit (631个)，建议使用 squash merge ## 变更类型 - [x] 重构 ## 测试情况 - [x] CI 在 develop 分支已通过 - [ ] 需要在 main 合并后重新验证 ## 相关 Issue 关闭 PR #18 (#18)，该 PR 基于旧版 main 已过时。

xiaoxia added 88 commits 2026-06-27 00:44:41 +08:00

merge: release V21 UI and core E2E hardening ... 31c0f23297

Merge develop into main through protected Gitea PR flow.

fix(ci): pass production API base to E2E ... b914f55b7d

Merge production E2E API base hotfix.

test(web): scope generation approval assertion ... 2f9a1a42f5

Merge production E2E assertion hotfix.

test(web): target generation approval pill ... 06857d0a0d

Merge generation approval pill hotfix.

Merge pull request 'feat(web): complete V21 UI redesign' (#6) from develop into main a31145950f

fix(security): P0 - JWT密钥强制环境变量，拒绝默认值 7a4bbbe512

fix(security): P0 - JWTConfig强制注入密钥，禁止无参数实例化 a12d5d7b12

fix(security): P0 - 日志过滤敏感参数(token/password/secret等) e58293a51f

feat(ui): V21 design system overhaul cae16d547e

fix: resolve CI check failures - format code and add nosec comment 950f63bb69

fix: resolve CI check failures - format code and add nosec comment 071f0e990e

fix: resolve CI check failures - format code and fix line length issues 3d29dc0c83

fix: resolve CI check failures - format code and fix line length issues a4f721528e

ci: enable auto-deploy for feature branches a0f8540a09

Merge pull request 'ci: enable auto-deploy for feature branches' (#10) from ci/enable-feature-deploy into main a717dd17c8

Merge pull request 'fix(security): P0 - JWT密钥强制环境变量 + 日志敏感信息过滤' (#8) from fix/security-p0-jwt-logging into main f34f654a84

Merge pull request 'feat(ui): V21 design system overhaul' (#9) from feature/v21-design-system into main 53055afa43

fix(p1): resolve 4 P1 technical debt issues ... 7fa327aa27

- P1-1: CORS configuration security - use DEBUG mode to differentiate
  production vs development CORS settings
- P1-2: Implement token refresh logic in RefreshTokenUseCase
  - Add get_session_by_refresh_token to SessionStore
  - Verify session validity and expiry
  - Generate new access token on refresh
- P1-3: Fix database connection leak in worker ingest task
  - Add proper try-except-finally block
  - Ensure db.close() is always called
- P1-4: Implement real media metadata extraction
  - Use ffprobe for video metadata
  - Use Pillow for image metadata
  - Return empty dict on failure (no mock data)

Merge pull request 'fix(p1): 修复 4 个 P1 技术债务问题' (#11) from fix/p1-technical-debt into main 13113f50c5

chore: remove temporary script 6e73d37857

chore: remove temporary script 4c86944c7a

chore: remove temporary script d79561d266

chore: remove temporary script 0e86857e0d

chore: remove temporary script e1ba142cb5

chore: remove temporary script 6bea2f38ff

chore: remove temporary script 08c73b00ef

chore: remove temporary script f6b261e194

chore: remove temporary script 42d5ce34b9

chore: remove temporary script 6d9677087e

chore: remove temporary script 5da250de14

chore: remove temporary script 4803273419

chore: remove temporary script 766a06ede6

chore: remove temporary script 96b75b8db5

chore: remove temporary script ae2c5500be

chore: remove temporary script aa700fb5e8

chore: remove temporary script 638ad99a4d

chore: remove temporary script 72936c944d

chore: remove obsolete phase progress reports 23471034c7

chore: remove obsolete phase progress reports bafe88a750

chore: remove obsolete phase progress reports 15882bd019

chore: remove obsolete phase progress reports 701f5ebc23

chore: remove obsolete phase progress reports fda807086d

chore: remove obsolete phase progress reports 94bec9a860

chore: remove obsolete phase progress reports dc4ce4006a

chore: remove obsolete phase progress reports 581c643684

chore: remove obsolete phase progress reports 0305509764

chore: remove obsolete phase progress reports 3204848bb5

chore: remove obsolete files bf9da32595

chore: remove obsolete files 46b0d4beea

chore: remove obsolete audit and project docs 2c53e644bc

chore: remove obsolete audit and project docs 47871d79dc

chore: remove obsolete audit and project docs 372c3861c9

chore: remove obsolete audit and project docs 0e9c771915

chore: remove obsolete audit and project docs 353868904a

chore: remove obsolete audit and project docs e66ac2bd6c

chore: remove obsolete audit and project docs a87b1ae3a1

chore: remove obsolete audit and project docs 1bb2a83214

chore: remove obsolete audit and project docs aaf0096ac6

chore: remove obsolete audit and project docs fc72ff4a47

chore: remove obsolete audit and project docs 9255a3af05

chore: remove obsolete audit and project docs 12bbecc9fe

chore: remove obsolete audit and project docs fcd518d4a6

chore: remove obsolete audit and project docs 0d1f7ca8d5

chore: remove obsolete audit and project docs d0f43530e7

chore: remove obsolete audit and project docs 2748408ac0

chore: update .gitignore for temp files 55d2b25f08

Merge pull request 'chore: 清理仓库 - 删除过时文件和已合并分支' (#13) from chore/repo-cleanup into main 3c54dcbef4

P2-1: 移除 projects.py 中重复的 _require_workspace_member 函数，使用 permissions.py 中的共享函数 d5bc23d488

P2-1 & P2-5: 移除 upload.py 中重复的 _require_workspace_member，添加服务端 MIME type 验证 33a0ed13fe

P2-2: 创建 packages/application/auth/jwt_handler.py 委托层，隔离 Domain 层对 jwt 库的依赖 cc51da0bd7

P2-2: 创建 packages/application/auth/password_handler.py 委托层，隔离 Domain 层对 bcrypt 库的依赖 4015929e3f

P2-2: 更新 packages/application/auth/__init__.py 导出 JWT 和 Password 委托处理器 129a0235ad

P2-3: workspace_member_repository.py find_by_workspace 方法添加 JOIN 预加载用户数据 a85790f24a

P2-4: dependencies.py 添加返回类型注解 c913e7cd89

P2-6: processor.py 使用 NamedTemporaryFile + try-finally 确保临时文件清理 36ffd9004a

P3-1: database.py 统一使用 config.py 中的 Settings，消除配置重复定义 5a05b804f2

P3-3: infra/docker/api.Dockerfile 转换为多阶段构建 8b248cf035

P3-4: .gitea/workflows/ci-cd.yml 添加 frontend-lint job 443588eebd

P3-5: 添加 tests/integration/test_auth.py 认证集成测试 b300f66630

fix(ci): remove container field to run on host directly 8575ee772f

Merge pull request 'fix: 移除 CI container 配置，直接在 host 运行' (#16) from fix/ci-remove-container into main c393c38d89

Merge pull request 'chore: 修复 P2/P3 技术债务' (#15) from fix/p2p3-tech-debt-v2 into main f2fe27eda6

fix(deploy): use ubuntu-latest runner label 1ba3543fa0

Merge pull request 'fix: 部署workflow使用ubuntu-latest runner label' (#17) from fix/deploy-runner-label into main 42c543917e

chore: trigger CI/Deploy pipeline test dbf2092e89

refactor: Remove workspace concept - Projects now directly under User ... c5f8c50872

BREAKING CHANGES:
- Removed Workspace, WorkspaceMember, WorkspaceInvitation entities
- Project now has owner_user_id instead of workspace_id
- Added shared_users list to Project for collaboration
- Subscription/quota moved from Workspace to User level

Changes:
- packages/domain/entities.py: Removed Workspace entities, updated Project
- packages/adapters/sqlalchemy_impl/models.py: Updated models
- packages/application/: Removed workspace use cases, updated other use cases
- packages/ports/: Removed workspace repository interfaces
- apps/api/: Updated routes, schemas, dependencies, router
- alembic/versions/007_remove_workspace_concept.py: Database migration

New APIs:
- POST /projects/{id}/share: Share project with user
- DELETE /projects/{id}/share/{user_id}: Unshare project

fix: replace GitHub Actions checkout with Gitea API download in ci-cd.yml ... 692743d61d

- validate job: add container xiaoxia-ci-python:3.12, use shell-based checkout via Gitea API
- frontend-lint job: remove container, use docker run with local images instead
- All steps converted to shell: sh to avoid uses: actions/* dependencies

Fixes CI timeout on private runner unable to access GitHub Actions marketplace

chore: remove redundant .github/workflows (using Gitea Actions) c96ac31132

xiaoxia reviewed 2026-06-27 00:48:55 +08:00

xiaoxia left a comment

Author

Owner

Copy Link

Copy Source

LGTM

LGTM

xiaoxia added 4 commits 2026-06-27 00:51:02 +08:00

chore: unify CI/CD runner labels to runtime-builder:host 44e9ef362a

feat: add auto-merge scripts and CI failure notification ... d6a30bd4eb

- Auto merge script for PRs targeting develop/main
- CI failure check script
- Gitea Actions workflow for scheduled auto-merge
- Cron jobs for periodic execution

fix: update default APP_VERSION to 0.1.61 c0f6c148a3

Merge pull request 'docs: add release process and update git workflow' (#39) from chore/unify-ci-runners into develop 34f6a6cde9

xiaoxia merged commit f9675f95df into main 2026-06-27 00:51:52 +08:00

xiaoxia referenced this issue from a commit 2026-06-27 00:51:53 +08:00

Merge pull request 'refactor: sync workspace removal to main' (#40) from develop into main

xiaoxia referenced this issue from a commit 2026-06-27 19:11:48 +08:00

Merge pull request 'refactor: sync workspace removal to main' (#40) from develop into main

Sign in to join this conversation.

Reviewers

No Reviewers

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

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#40