Convert GitlabSubscriptions::AddOn to a fixed items model

What does this MR do and why?

Closes customers-gitlab-com#15784 (closed) (phase B2 of gitlab-org#19981).

Points every add-on writer and the AddOnPurchase association at GitlabSubscriptions::SystemDefined::AddOn, the fixed items model added in !255153 (merged) (merged Sep 15). Item ids match the subscription_add_on_uid values we already write in production. The read-only name and uid lookups went out in !256255 (merged) (merged Sep 25).

  • AddOnPurchase#add_on is now belongs_to_fixed_items on subscription_add_on_uid. A before_validation still fills subscription_add_on_id from the uid, so a revert of this MR needs no backfill. That write goes away with ignore_columns in 19.6. The uniqueness validation moves to the uid column, backed by index_add_on_purchases_on_add_on_uid_and_namespace_id_not_null.
  • Provisioning looks up add-ons with SystemDefined::AddOn.find_by!(name:). The only remaining find_or_create_by_name callers are the id callback above and the dev seed.

The schema side (FK, NOT NULL, id index drops) went out in !248390 (merged) (19.4). This is 19.5, so old and new code both work against the relaxed schema.

How to set up and validate locally

  1. Create a purchase:

    add_on = GitlabSubscriptions::SystemDefined::AddOn.find_by!(name: "code_suggestions")
    GitlabSubscriptions::AddOnPurchases::CreateService.new(
      Group.first, add_on,
      quantity: 1, started_on: Time.current, expires_on: 1.year.from_now.to_date,
      purchase_xid: SecureRandom.hex(8)
    ).execute
  2. Check the row:

    purchase = GitlabSubscriptions::AddOnPurchase.last
    purchase.subscription_add_on_uid
    # => 1
    purchase.subscription_add_on_id == GitlabSubscriptions::AddOn.code_suggestions.pick(:id)
    # => true
    purchase.add_on.name
    # => "code_suggestions"

Database review

No migration. Plans use code_suggestions (uid 1): <subscription_add_on_id> is its subscription_add_ons.id, and <namespace_id> and <id> come from its latest purchase.

AddOnPurchase.find_by_namespace_and_add_on

Before:

SELECT
    "subscription_add_on_purchases".*
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."namespace_id" IS NULL
    AND "subscription_add_on_purchases"."subscription_add_on_id" IN (<duo_amazon_q_id>, <duo_enterprise_id>, <code_suggestions_id>)
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163961

After:

SELECT
    "subscription_add_on_purchases".*
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."namespace_id" IS NULL
    AND "subscription_add_on_purchases"."subscription_add_on_uid" IN (4, 3, 1)
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163962

AddOnPurchases::UpdateService#add_on_purchase

GitLab.com (namespace)

Before:

SELECT
    "subscription_add_on_purchases".*
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."namespace_id" = <namespace_id>
    AND "subscription_add_on_purchases"."subscription_add_on_id" = <subscription_add_on_id>
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163963

After:

SELECT
    "subscription_add_on_purchases".*
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."namespace_id" = <namespace_id>
    AND "subscription_add_on_purchases"."subscription_add_on_uid" = <subscription_add_on_uid>
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163964

Self-managed (namespace: nil)

Before:

SELECT
    "subscription_add_on_purchases".*
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."namespace_id" IS NULL
    AND "subscription_add_on_purchases"."subscription_add_on_id" = <subscription_add_on_id>
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163973

After:

SELECT
    "subscription_add_on_purchases".*
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."namespace_id" IS NULL
    AND "subscription_add_on_purchases"."subscription_add_on_uid" = <subscription_add_on_uid>
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163965

API::Helpers#find_subscription_add_on_purchase!

Before:

SELECT
    "subscription_add_on_purchases".*
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."namespace_id" = <namespace_id>
    AND "subscription_add_on_purchases"."subscription_add_on_id" = <subscription_add_on_id>
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163963

After:

SELECT
    "subscription_add_on_purchases".*
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."namespace_id" = <namespace_id>
    AND "subscription_add_on_purchases"."subscription_add_on_uid" = <subscription_add_on_uid>
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163964

validates :subscription_add_on_uid, uniqueness: { scope: :namespace_id }

Create, GitLab.com

Before:

SELECT
    1 AS one
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."subscription_add_on_id" = <subscription_add_on_id>
    AND "subscription_add_on_purchases"."namespace_id" = <namespace_id>
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163966

After:

SELECT
    1 AS one
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."subscription_add_on_uid" = <subscription_add_on_uid>
    AND "subscription_add_on_purchases"."namespace_id" = <namespace_id>
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163967

Create, self-managed

Before:

SELECT
    1 AS one
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."subscription_add_on_id" = <subscription_add_on_id>
    AND "subscription_add_on_purchases"."namespace_id" IS NULL
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163968

After:

SELECT
    1 AS one
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."subscription_add_on_uid" = <subscription_add_on_uid>
    AND "subscription_add_on_purchases"."namespace_id" IS NULL
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163969

Update, GitLab.com

Before:

SELECT
    1 AS one
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."subscription_add_on_id" = <subscription_add_on_id>
    AND "subscription_add_on_purchases"."id" != <id>
    AND "subscription_add_on_purchases"."namespace_id" = <namespace_id>
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163970

After:

SELECT
    1 AS one
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."subscription_add_on_uid" = <subscription_add_on_uid>
    AND "subscription_add_on_purchases"."id" != <id>
    AND "subscription_add_on_purchases"."namespace_id" = <namespace_id>
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163971

Update, self-managed

Before:

SELECT
    1 AS one
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."subscription_add_on_id" = <subscription_add_on_id>
    AND "subscription_add_on_purchases"."id" != <id>
    AND "subscription_add_on_purchases"."namespace_id" IS NULL
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163972

After:

SELECT
    1 AS one
FROM
    "subscription_add_on_purchases"
WHERE
    "subscription_add_on_purchases"."subscription_add_on_uid" = <subscription_add_on_uid>
    AND "subscription_add_on_purchases"."id" != <id>
    AND "subscription_add_on_purchases"."namespace_id" IS NULL
LIMIT 1

Plan: https://postgres.ai/console/gitlab/gitlab-production-main/sessions/58878/commands/163974

MR acceptance checklist

Evaluate this MR against the MR acceptance checklist.

Edited by Ryan Cobb

Merge request reports

Loading
Loading