feat: ENT-11468 PR-A Updated Models layer (data + migration) by shravani-sonata-gottapu · Pull Request #174 · edx/enterprise-access

shravani-sonata-gottapu · 2026-05-21T19:19:30Z

Description :
In this PR we included the database and model layer changes required to support Academy-based checkout intents alongside existing Teams checkout flows.
It updates the CheckoutIntent model to allow multiple intents per user, adds stripe_product_id for product-specific intent handling, and implements partial unique constraints to prevent duplicate active intents.
The PR also renames enterprise_catalog_uuid to catalog_query_id in EnterpriseAcademy while preserving existing data through migrations.
Additionally, it improves intent retrieval logic with deterministic filtering and adds new Stripe metadata constants for cross-service checkout tracking.

Copilot

Pull request overview

This PR updates the customer_billing model layer and migrations to support Academy-based checkout intents alongside existing Teams flows, including a renamed Academy catalog identifier and new CheckoutIntent retrieval/uniqueness behavior.

Changes:

Renamed EnterpriseAcademy.enterprise_catalog_uuid to catalog_query_id via data-preserving migrations and updated tests.
Updated CheckoutIntent to support multiple intents per user by switching user to a ForeignKey, adding stripe_product_id, and introducing partial unique constraints.
Adjusted checkout BFF tests to use CheckoutIntent.for_user and added model tests for the new constraints and retrieval logic.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
enterprise_access/apps/customer_billing/tests/test_models.py	Updates Academy field rename assertions; adds tests for new CheckoutIntent constraints and `for_user` filtering behavior.
enterprise_access/apps/customer_billing/models.py	Renames Academy model field; adds `stripe_product_id`, changes intent ownership cardinality, introduces partial unique constraints, and updates `for_user` query logic.
enterprise_access/apps/customer_billing/migrations/0032_remove_enterpriseacademy_enterprise_catalog_uuid_and_more.py	Renames Academy field in both main and historical models; adds CheckoutIntent fields and DB constraints.
enterprise_access/apps/bffs/tests/test_checkout_handlers.py	Updates handler tests to mock `CheckoutIntent.for_user` instead of queryset filtering.
enterprise_access/apps/api/v1/tests/test_checkout_bff_views.py	Updates BFF context endpoint test to patch `CheckoutIntent.for_user`.

codecov · 2026-05-21T19:25:29Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 86.14%. Comparing base (4a4f726) to head (4c3c645).
⚠️ Report is 2 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #174      +/-   ##
==========================================
+ Coverage   86.08%   86.14%   +0.05%     
==========================================
  Files         149      151       +2     
  Lines       12500    12557      +57     
  Branches     1194     1199       +5     
==========================================
+ Hits        10761    10817      +56     
- Misses       1424     1425       +1     
  Partials      315      315

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

vshaikismail-sonata

LGTM.....!!!!

pwnage101 · 2026-05-21T20:10:15Z

Neither the PR title nor the commit message is descriptive enough. Please see https://open-edx-proposals.readthedocs.io/en/latest/best-practices/oep-0051-bp-conventional-commits.html

pwnage101 · 2026-05-26T18:25:11Z

+            models.UniqueConstraint(
+                fields=["user", "enterprise_slug", "stripe_product_id"],
+                condition=models.Q(
+                    stripe_product_id__isnull=False,
+                    state__in=["created", "paid"],
+                ),
+                name="unique_active_checkout_intent_with_product",
+            ),
+            models.UniqueConstraint(
+                fields=["user", "enterprise_slug"],
+                condition=models.Q(
+                    stripe_product_id__isnull=True,
+                    state__in=["created", "paid"],
+                ),
+                name="unique_active_checkout_intent_without_product",


❌ Limiting uniqueness constraints to just created and paid states would result in a change in behavior for Teams. Right now we do not want to allow a user to create multiple trials. However, as written these constraints would allow trial A to be fulfilled while trial B can progress from created -> paid -> fulfilled without encountering any database errors.

❌ enterprise_slug cannot be included in the constraints because it would result in a single user being able to provision multiple trials (using different slugs).

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 4 comments.

macdiesel · 2026-05-27T01:34:26Z

+    stripe_product_id = models.CharField(
+        max_length=255,
+        null=False,
+        blank=True,


Resolve or comment?

macdiesel · 2026-05-27T01:34:36Z

+    user = models.ForeignKey(
        User,
        on_delete=models.CASCADE,
    )


Resolve or comment?

macdiesel · 2026-05-27T01:34:41Z

+        # Alter type from UUIDField -> IntegerField
+        migrations.AlterField(
+            model_name="enterpriseacademy",
+            name="catalog_query_id",
+            field=models.IntegerField(
+                blank=True,
+                db_index=True,
+                help_text="Catalog query integer ID for this Academy.",
+                null=True,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="historicalenterpriseacademy",
+            name="catalog_query_id",
+            field=models.IntegerField(
+                blank=True,
+                db_index=True,
+                help_text="Catalog query integer ID for this Academy.",


Resolve or comment?

macdiesel · 2026-05-27T01:34:51Z

+    def test_unique_active_for_blank_stripe_product_id(self):
+        """Two active intents with the same user+enterprise_slug and blank stripe_product_id should conflict."""
+        CheckoutIntent.objects.create(
+            user=self.user,
+            enterprise_slug='test-enterprise',


Resolve or comment?

pwnage101 · 2026-05-26T21:29:25Z

+    stripe_product_id = models.CharField(
+        max_length=255,
+        null=True,
+        blank=True,
+        db_index=True,
+        help_text="Stripe Product ID for paid/academy intents. NULL for Teams intents.",
+    )


❌ Please keep stripe decoupled from the CheckoutIntent domain. An alternative option would be to associate the CheckoutIntent with an SSP product:

Suggested change

stripe_product_id = models.CharField(

max_length=255,

null=True,

blank=True,

db_index=True,

help_text="Stripe Product ID for paid/academy intents. NULL for Teams intents.",

)

ssp_product_selection = models.ForeignKey(

SspProduct,

help_text="The selected Self-Service Purchasing product.",

)

Then you could rename EnterpriseAcademy -> SspProduct so that it covers both essentials AND teams, and also centralizes the place to map the product selection to the license-manager product ID used for provisioning:

# Delete EnterpriseAcademy model, replace with: class SspProduct(TimeStampedModel): slug = models.SlugField( unique=True, null=True, help_text='Use this as the unique, cross-service identifier for the product.', ) academy_uuid = models.UUIDField( null=True, help_text="UUID synced from the Academy table in enterprise-catalog IFF this is an Essentials product.", ) academy_title = models.CharField( null=True, blank=True, help_text='Title synced from the Academy table in enterprise-catalog IFF this is an Essentials product.', ) stripe_lookup_key = models.CharField( null=True, blank=False, help_text="Stripe Price lookup_key, to help quickly determine the price for this product.", ) trial_subscription_product_id = models.IntegerField( null=True, help_text="License-manager product ID representing the trial period.", ) paid_subscription_product_id = models.IntegerField( null=True, help_text="License-manager product ID representing a paid period.", )

The sync logic in #171 could be updated to just upsert academy_uuid and academy_title, leaving all the other field untouched so that an operator can manually configure them.

@pwnage101 Is this the only comment on this ticket? Or will there be other items? I am hoping that we can capture all current feedback in one review. Just double checking to make sure there are not additional items.

Please refer to https://2u-internal.atlassian.net/wiki/spaces/SOL/pages/3740565518/Troy+s+ADR+for+SspProduct for a more complete proposal.

Copilot AI review requested due to automatic review settings May 21, 2026 19:19

shravani-sonata-gottapu requested review from a team as code owners May 21, 2026 19:19

Copilot started reviewing on behalf of shravani-sonata-gottapu May 21, 2026 19:20 View session

Copilot AI reviewed May 21, 2026

View reviewed changes

vshaikismail-sonata approved these changes May 21, 2026

View reviewed changes

shravani-sonata-gottapu changed the title ~~feat: updated field in models~~ feat: ENT-11468 PR-A updated field in models May 21, 2026

shravani-sonata-gottapu changed the title ~~feat: ENT-11468 PR-A updated field in models~~ feat: ENT-11468 PR-A Updated Models layer (data + migration) May 22, 2026

feat: update model fields in enterpriseacademy and models

4482d43

shravani-sonata-gottapu force-pushed the ENT-11468/PR-A branch from 70d55fe to 4482d43 Compare May 22, 2026 05:47

pwnage101 requested changes May 26, 2026

View reviewed changes

Comment thread enterprise_access/apps/customer_billing/models.py Outdated

Comment thread enterprise_access/apps/customer_billing/models.py Outdated

Comment thread enterprise_access/apps/customer_billing/models.py Outdated

pwnage101 reviewed May 26, 2026

View reviewed changes

feat: Addressed comments

4c3c645

Copilot AI review requested due to automatic review settings May 26, 2026 19:28

Copilot started reviewing on behalf of shravani-sonata-gottapu May 26, 2026 19:28 View session

Copilot AI reviewed May 26, 2026

View reviewed changes

pwnage101 requested changes May 26, 2026

View reviewed changes

Conversation

shravani-sonata-gottapu commented May 21, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov Bot commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

vshaikismail-sonata left a comment

Choose a reason for hiding this comment

Uh oh!

pwnage101 commented May 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov Bot commented May 21, 2026 •

edited

Loading

pwnage101 commented May 21, 2026 •

edited

Loading