After successful workspace data migration in Phase 1, Phase 2 represents the final cleanup phase - removing all fallback mechanisms, legacy code, and org_id dependencies to achieve a fully workspace-native architecture.

Objective

Remove all RBACv1 (org_id) dependencies from SWATCH services, completing the full transition to workspace-based authorization and data isolation.

Scope

• Remove org_id fallback logic from all services
• Remove Unleash feature flags (rbac-v2-workspace-mapping)
• Drop org_id columns from all tables
• Update all database queries to use workspace_id exclusively
• Update API contracts to reflect workspace-only filtering

Dependencies

• SWATCH-3892 Phase 1 completion (data migration and production rollout)
• Confirmation of stable workspace resolution performance
• Stakeholder approval for final RBACv1 removal

Key Deliverables

• Code refactoring removing all org_id logic
• Database schema migration removing org_id columns
• Updated API specifications and documentation
• Infrastructure configuration cleanup
• Comprehensive testing validation

Success Criteria

• Zero references to org_id in active codebase
• All database tables use workspace_id for data isolation
• APIs exclusively use workspace-based filtering
• Zero feature flags related to RBACv1/RBACv2 transition
• Performance metrics show no degradation from cleanup

Post-Completion Benefits

• Simplified architecture with single authorization model
• Improved performance without dual-filtering overhead
• Easier maintenance with fewer code paths
• Enhanced security with single source of truth

Status: Placeholder - depends on Phase 1 completion