From c3a0cbf5e291e00722f0107c8d01504fc9f89000 Mon Sep 17 00:00:00 2001 From: Livio Bieri Date: Tue, 14 Nov 2023 20:16:55 +0100 Subject: [PATCH] fix: billing address naming snafu --- server/config/urls.py | 5 +-- .../migrations/0002_auto_20231114_1926.py | 33 +++++++++++++++++++ server/vbv_lernwelt/shop/models.py | 8 ++--- server/vbv_lernwelt/shop/serializers.py | 8 ++--- .../shop/tests/test_billing_address_api.py | 32 +++++++++--------- 5 files changed, 60 insertions(+), 26 deletions(-) create mode 100644 server/vbv_lernwelt/shop/migrations/0002_auto_20231114_1926.py diff --git a/server/config/urls.py b/server/config/urls.py index b4d338e6..5bdace7c 100644 --- a/server/config/urls.py +++ b/server/config/urls.py @@ -12,6 +12,7 @@ from django_ratelimit.exceptions import Ratelimited from graphene_django.views import GraphQLView from wagtail import urls as wagtail_urls from wagtail.admin import urls as wagtailadmin_urls +from wagtail.documents import urls as wagtaildocs_urls from vbv_lernwelt.api.user import list_organisations, me_user_view from vbv_lernwelt.assignment.views import request_assignment_completion_status @@ -171,8 +172,8 @@ urlpatterns = [ name='edoniq_export_students_and_trainers'), # shop - path('api/shop/billing-address/', get_billing_address, name='get-billing-address'), - path('api/shop/billing-address/update', update_billing_address, name='update-billing-address'), + path(r'api/shop/billing-address/', get_billing_address, name='get-billing-address'), + path(r'api/shop/billing-address/update', update_billing_address, name='update-billing-address'), # importer path( diff --git a/server/vbv_lernwelt/shop/migrations/0002_auto_20231114_1926.py b/server/vbv_lernwelt/shop/migrations/0002_auto_20231114_1926.py new file mode 100644 index 00000000..2660f3b0 --- /dev/null +++ b/server/vbv_lernwelt/shop/migrations/0002_auto_20231114_1926.py @@ -0,0 +1,33 @@ +# Generated by Django 3.2.20 on 2023-11-14 18:26 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('shop', '0001_initial'), + ] + + operations = [ + migrations.RenameField( + model_name='billingaddress', + old_name='company_street_address', + new_name='company_street', + ), + migrations.RenameField( + model_name='billingaddress', + old_name='company_street_number_address', + new_name='company_street_number', + ), + migrations.RenameField( + model_name='billingaddress', + old_name='street_address', + new_name='street', + ), + migrations.RenameField( + model_name='billingaddress', + old_name='street_number_address', + new_name='street_number', + ), + ] diff --git a/server/vbv_lernwelt/shop/models.py b/server/vbv_lernwelt/shop/models.py index 2691fdb4..43ed9cfa 100644 --- a/server/vbv_lernwelt/shop/models.py +++ b/server/vbv_lernwelt/shop/models.py @@ -11,16 +11,16 @@ class BillingAddress(models.Model): # user first_name = models.CharField(max_length=255, blank=True) last_name = models.CharField(max_length=255, blank=True) - street_address = models.CharField(max_length=255, blank=True) - street_number_address = models.CharField(max_length=255, blank=True) + street = models.CharField(max_length=255, blank=True) + street_number = models.CharField(max_length=255, blank=True) postal_code = models.CharField(max_length=255, blank=True) city = models.CharField(max_length=255, blank=True) country = models.CharField(max_length=255, blank=True) # company (optional) company_name = models.CharField(max_length=255, blank=True) - company_street_address = models.CharField(max_length=255, blank=True) - company_street_number_address = models.CharField(max_length=255, blank=True) + company_street = models.CharField(max_length=255, blank=True) + company_street_number = models.CharField(max_length=255, blank=True) company_postal_code = models.CharField(max_length=255, blank=True) company_city = models.CharField(max_length=255, blank=True) company_country = models.CharField(max_length=255, blank=True) diff --git a/server/vbv_lernwelt/shop/serializers.py b/server/vbv_lernwelt/shop/serializers.py index da861fce..c29b8b3e 100644 --- a/server/vbv_lernwelt/shop/serializers.py +++ b/server/vbv_lernwelt/shop/serializers.py @@ -9,14 +9,14 @@ class BillingAddressSerializer(serializers.ModelSerializer): fields = [ "first_name", "last_name", - "street_address", - "street_number_address", + "street", + "street_number", "postal_code", "city", "country", "company_name", - "company_street_address", - "company_street_number_address", + "company_street", + "company_street_number", "company_postal_code", "company_city", "company_country", diff --git a/server/vbv_lernwelt/shop/tests/test_billing_address_api.py b/server/vbv_lernwelt/shop/tests/test_billing_address_api.py index 3ea1a760..c9e2f0cb 100644 --- a/server/vbv_lernwelt/shop/tests/test_billing_address_api.py +++ b/server/vbv_lernwelt/shop/tests/test_billing_address_api.py @@ -17,14 +17,14 @@ class BillingAddressViewTest(APITestCase): user=self.user, first_name="John", last_name="Doe", - street_address="123 Main St", - street_number_address="45A", + street="123 Main St", + street_number="45A", postal_code="12345", city="Test City", country="Test Country", company_name="Test Company", - company_street_address="456 Company St", - company_street_number_address="67B", + company_street="456 Company St", + company_street_number="67B", company_postal_code="67890", company_city="Company City", company_country="Company Country", @@ -42,14 +42,14 @@ class BillingAddressViewTest(APITestCase): self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.data["first_name"], "John") self.assertEqual(response.data["last_name"], "Doe") - self.assertEqual(response.data["street_address"], "123 Main St") - self.assertEqual(response.data["street_number_address"], "45A") + self.assertEqual(response.data["street"], "123 Main St") + self.assertEqual(response.data["street_number"], "45A") self.assertEqual(response.data["postal_code"], "12345") self.assertEqual(response.data["city"], "Test City") self.assertEqual(response.data["country"], "Test Country") self.assertEqual(response.data["company_name"], "Test Company") - self.assertEqual(response.data["company_street_address"], "456 Company St") - self.assertEqual(response.data["company_street_number_address"], "67B") + self.assertEqual(response.data["company_street"], "456 Company St") + self.assertEqual(response.data["company_street_number"], "67B") self.assertEqual(response.data["company_postal_code"], "67890") self.assertEqual(response.data["company_city"], "Company City") self.assertEqual(response.data["company_country"], "Company Country") @@ -59,14 +59,14 @@ class BillingAddressViewTest(APITestCase): new_data = { "first_name": "Jane", "last_name": "Smith", - "street_address": "789 New St", - "street_number_address": "101C", + "street": "789 New St", + "street_number": "101C", "postal_code": "54321", "city": "New City", "country": "New Country", "company_name": "New Company", - "company_street_address": "789 Company St", - "company_street_number_address": "102D", + "company_street": "789 Company St", + "company_street_number": "102D", "company_postal_code": "98765", "company_city": "New Company City", "company_country": "New Company Country", @@ -81,14 +81,14 @@ class BillingAddressViewTest(APITestCase): updated_address = BillingAddress.objects.get(user=self.user) self.assertEqual(updated_address.first_name, "Jane") self.assertEqual(updated_address.last_name, "Smith") - self.assertEqual(updated_address.street_address, "789 New St") - self.assertEqual(updated_address.street_number_address, "101C") + self.assertEqual(updated_address.street, "789 New St") + self.assertEqual(updated_address.street_number, "101C") self.assertEqual(updated_address.postal_code, "54321") self.assertEqual(updated_address.city, "New City") self.assertEqual(updated_address.country, "New Country") self.assertEqual(updated_address.company_name, "New Company") - self.assertEqual(updated_address.company_street_address, "789 Company St") - self.assertEqual(updated_address.company_street_number_address, "102D") + self.assertEqual(updated_address.company_street, "789 Company St") + self.assertEqual(updated_address.company_street_number, "102D") self.assertEqual(updated_address.company_postal_code, "98765") self.assertEqual(updated_address.company_city, "New Company City") self.assertEqual(updated_address.company_country, "New Company Country")