From 8ee36a8406dfc005636c3477a7deaf96434db799 Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 10 Jul 2024 23:31:23 +0000 Subject: [PATCH 1/2] feat(models): remove merchant_id from transitagency model --- .../0012_remove_transitagency_merchant_id.py | 17 +++++++++++++++++ benefits/core/models.py | 1 - 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 benefits/core/migrations/0012_remove_transitagency_merchant_id.py diff --git a/benefits/core/migrations/0012_remove_transitagency_merchant_id.py b/benefits/core/migrations/0012_remove_transitagency_merchant_id.py new file mode 100644 index 000000000..ebd0798d3 --- /dev/null +++ b/benefits/core/migrations/0012_remove_transitagency_merchant_id.py @@ -0,0 +1,17 @@ +# Generated by Django 5.0.6 on 2024-07-10 23:27 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("core", "0011_move_enrollment_success_template_field"), + ] + + operations = [ + migrations.RemoveField( + model_name="transitagency", + name="merchant_id", + ), + ] diff --git a/benefits/core/models.py b/benefits/core/models.py index b0c378448..0eb411941 100644 --- a/benefits/core/models.py +++ b/benefits/core/models.py @@ -262,7 +262,6 @@ class TransitAgency(models.Model): short_name = models.TextField() long_name = models.TextField() agency_id = models.TextField() - merchant_id = models.TextField() info_url = models.URLField() phone = models.TextField() active = models.BooleanField(default=False) From 50ce866ef19fed806834b64aa9c9ae489ee9253c Mon Sep 17 00:00:00 2001 From: Machiko Yasuda Date: Wed, 10 Jul 2024 23:32:06 +0000 Subject: [PATCH 2/2] chore: remove merchant_id from fixtures, test fixtures --- benefits/core/migrations/local_fixtures.json | 3 --- tests/pytest/conftest.py | 1 - 2 files changed, 4 deletions(-) diff --git a/benefits/core/migrations/local_fixtures.json b/benefits/core/migrations/local_fixtures.json index a6910b280..4ea7cc35e 100644 --- a/benefits/core/migrations/local_fixtures.json +++ b/benefits/core/migrations/local_fixtures.json @@ -341,7 +341,6 @@ "short_name": "MST (local)", "long_name": "Monterey-Salinas Transit (local)", "agency_id": "mst", - "merchant_id": "mst", "info_url": "https://mst.org/benefits", "phone": "888-678-2871", "active": true, @@ -363,7 +362,6 @@ "short_name": "SacRT (local)", "long_name": "Sacramento Regional Transit (local)", "agency_id": "sacrt", - "merchant_id": "sacrt", "info_url": "https://sacrt.com/", "phone": "916-321-2877", "active": true, @@ -385,7 +383,6 @@ "short_name": "SBMTD (local)", "long_name": "Santa Barbara MTD (local)", "agency_id": "sbmtd", - "merchant_id": "sbmtd", "info_url": "https://sbmtd.gov/taptoride/", "phone": "805-963-3366", "active": true, diff --git a/tests/pytest/conftest.py b/tests/pytest/conftest.py index aaddb4ba3..d47cdb915 100644 --- a/tests/pytest/conftest.py +++ b/tests/pytest/conftest.py @@ -198,7 +198,6 @@ def model_TransitAgency(model_PemData, model_EligibilityType, model_EligibilityV short_name="TEST", long_name="Test Transit Agency", agency_id="test123", - merchant_id="test", info_url="https://example.com/test-agency", phone="800-555-5555", active=True,