<!--IssueSummary start--> <details> <summary> Everyone can contribute. [Help move this issue forward](https://handbook.gitlab.com/handbook/marketing/developer-relations/engineering/community-contributors-workflows/#contributor-links) while earning points, leveling up and collecting rewards. </summary> - [Label this issue](https://contributors.gitlab.com/manage-issue?action=label&projectId=278964&issueIid=571923) </details> <!--IssueSummary end--> ## Objective Phase B of the plans → hard-coded migration (epic &19409): make `Plan` a `FixedItemsModel` and drop the `plans` table, once Phase A (#571422 / #596992–#596997) has moved all reads and writes onto the `*_plan_name_uid` columns. `GitlabSubscriptions::SystemDefined::Plan` already exists (created in !237348, used by `Ci::Runner`) and is the sanctioned FixedItemsModel for this data. > **Decision (2026-07-02): consolidate on `SystemDefined::Plan` and drop the legacy top-level `Plan` model + `plans` table.** Do not keep two plan models. (`SystemDefined::Plan` is the blessed reference pattern for the whole convert-static-tables epic &16840; reversing it to preserve the bare `Plan` constant would fragment the convention.) ## Prerequisites - Phase A complete for every referencing table: `ci_runners` (#596992 ✅), `ci_pending_builds` (#596994 ✅), `gitlab_subscription_histories` (#596995 ✅), `gitlab_subscriptions` (#596996 ✅), `plan_limits` (#596997 ✅). - Confirm no table outside the tracked set still FKs to `plans.id`. ## Scope ### Consolidate on `SystemDefined::Plan` - Migrate the ~90 legacy `Plan` references to `GitlabSubscriptions::SystemDefined::Plan`: ~19 `Plan::` constants (`Plan::FREE`, `Plan::PREMIUM`, `Plan::ALL_ULTIMATE_PLANS`, `Plan::PLAN_NAME_UID_LIST`, …), ~72 `Plan.<method>` call sites (`Plan.default`, `Plan.plan_name_uids`, `Plan.find_by(name:)`, …), plus the enum helpers Phase A introduced. - Ensure `SystemDefined::Plan` provides the surface those callers need: the constants, `names_for_uids` / `uids_for_names`, name/title lookups, and any `paid?` / `default?`-style predicates ported from `Plan`. ### Associations — belongs_to side (keep via fixed-items) - Repoint the referencing tables' `belongs_to :plan` / `belongs_to :hosted_plan` to `belongs_to_fixed_items` keyed on their `*_plan_name_uid` column, pointing at `SystemDefined::Plan`. Instance reads like `plan_limits.plan.name` / `subscription.hosted_plan.title` then keep working in-memory and do **not** need rewriting. - This is the lighter pattern than the "rewrite every read" approach in the already-written Phase A issues (which predate `belongs_to_fixed_items`). Apply it to tables **not yet shipped**; do not rework merged / in-review Phase A work (#596997, !235913). ### Associations — reverse side (must be rewritten) - `Plan.has_one :limits`, `Plan.has_many :hosted_subscriptions`, `Plan.has_many :gitlab_subscription_histories` cannot survive on a FixedItemsModel (a fixed model cannot own a `has_one` / `has_many` to a real table). Rewrite these reads to uid-based lookups (e.g. `PlanLimits.find_by(plan_name_uid: …)`) and remove the associations. This is mandatory regardless of the belongs_to shortcut above. ### Drop the table + model - Once nothing joins or FKs `plans`, drop the `plans` table and its sequence (post-deploy, `with_lock_retries`), and remove the top-level `Plan` model (`app/models/plan.rb`). - Repoint any `Plan`-based finders / seeds to `SystemDefined::Plan`. ## Deploy ordering - `plan_limits.plan_id` is `NOT NULL` today. Any table whose `belongs_to :plan` is repointed to write `plan_name_uid` (and stop writing `plan_id`) needs its `plan_id` FK + `NOT NULL` relaxed **first** — owned by each table's Phase 3 (#596997 for plan_limits) / #571424. Do not repoint before the constraint is relaxed, or inserts fail. (Same ordering rule the add-ons chain uses: #15787-B1 before #15784.) - Drop the `plans` table only after every referencing `*_plan_id` column/FK is gone. ## Success Criteria - `SystemDefined::Plan` is the single source of truth; the top-level `Plan` model and `plans` table are removed. - No `Plan.` / `Plan::` references, no AR `belongs_to :plan` / `:hosted_plan`, and no `plans` joins remain. - Referencing tables resolve their plan via `belongs_to_fixed_items` on `*_plan_name_uid`; reverse-direction reads use uid lookups. - All tests pass at each intermediate step. ## Work list The MR-sized steps for the `Plan` half of &20087. Gates in parentheses; the AddOn steps live in #15784. - [x] `plan_limits` reverse sync, !251875 (#596997) - [x] subscription comparisons to uid, !253082 (#596996) - [x] `::GitlabSubscriptions` qualification in EE, !252395 (#571422) - [x] legacy `Plan` surface on `SystemDefined::Plan`, !252396 - [x] `gitlab_subscription.rb` scopes to uid, !254886 (#596996) - [x] `ee/namespace.rb` scopes to uid, !257107 (#596996) - [x] `ee/project.rb` and `ee/user.rb` plan reads to uid, !257665 (#596996) - [x] stop writing `ci_pending_builds.plan_id`, !255743 - [x] admin plan-limits API to uid, !257670 (#596997) - [x] admin plans / limits UI, !258859 - [x] `PlanLimits` to `belongs_to_fixed_items`, reverse sync kept, !258860 - [ ] `Plan.default` / `actual_limits` cluster, !258839 - [ ] `GitlabSubscription` to `belongs_to_fixed_items`, with the tier cookie finder, the storage-stats preload and the Duo dev-setup seed, !259099 - [ ] `SubscriptionHistory` to `belongs_to_fixed_items`, !261209 - [ ] plan uid lookups and finder plans, !260939 - [ ] plan tiers for rate limits, !261261 - [ ] upgrade and purchase plan names, !261262 - [ ] plan constants in plan checks, !261263 - [ ] admin plan dropdown to `SystemDefined::Plan` (after !259099) - [ ] `Plan::CURRENT_ACTIVE_PLANS` in `current_active_plans_for_user_finder.rb` to `SystemDefined::Plan` (after !259099) - [ ] delete the dead plan code: `has_many :hosted_subscriptions` and `by_namespace` on `EE::Plan`, `Plan.names_for_ids` and `Plan.ids_for_plan_name_uids`, and `include_gitlab_subscription_with_hosted_plan` on `EE::Namespace` once its two callers use `include_gitlab_subscription` (after !259099) - [ ] drop the `plans` table and delete the `Plan` model (after the column drops below) After !259099, !258860 and !255743, no app code reads a plan through `plans.id`. Some writes stay until the column drops: !259099 keeps writing `gitlab_subscriptions.hosted_plan_id` from the uid because the previous release reads it during a deploy, the histories copy that id, and the reverse sync fills `plan_limits.plan_id` while the column is `NOT NULL`. The column drops are #600315 (`gitlab_subscriptions`), #622081 (`gitlab_subscription_histories`), #600314 (`plan_limits`) and #600317 (`ci_pending_builds`). ## References - Parent epic: https://gitlab.com/groups/gitlab-org/-/epics/19409 - Reference impl: !237348 (SystemDefined::Plan + Ci::Runner) - Phase A: #571422 (umbrella), #596992 / #596994 / #596995 / #596996 / #596997 (per-table) - Cleanup: #571424 (rescoped to dropping the `plans` table — see note there)