ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: billing address naming snafu

This commit is contained in:
Livio Bieri 2023-11-14 20:16:55 +01:00 committed by Christian Cueni
parent ad47fd329b
commit c3a0cbf5e2
5 changed files with 60 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/config/urls.py
View File

@ -12,6 +12,7 @@ from django_ratelimit.exceptions import Ratelimited
from graphene_django.views import GraphQLView from graphene_django.views import GraphQLView
from wagtail import urls as wagtail_urls from wagtail import urls as wagtail_urls
from wagtail.admin import urls as wagtailadmin_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.api.user import list_organisations, me_user_view
from vbv_lernwelt.assignment.views import request_assignment_completion_status from vbv_lernwelt.assignment.views import request_assignment_completion_status
@ -171,8 +172,8 @@ urlpatterns = [
name='edoniq_export_students_and_trainers'), name='edoniq_export_students_and_trainers'),
# shop # shop
path('api/shop/billing-address/', get_billing_address, name='get-billing-address'), path(r'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/update', update_billing_address, name='update-billing-address'),
# importer # importer
path( path(

33
server/vbv_lernwelt/shop/migrations/0002_auto_20231114_1926.py Normal file
View File

@ -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',
),
]

8
server/vbv_lernwelt/shop/models.py
View File

@ -11,16 +11,16 @@ class BillingAddress(models.Model):
# user # user
first_name = models.CharField(max_length=255, blank=True) first_name = models.CharField(max_length=255, blank=True)
last_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 = models.CharField(max_length=255, blank=True)
street_number_address = 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) postal_code = models.CharField(max_length=255, blank=True)
city = models.CharField(max_length=255, blank=True) city = models.CharField(max_length=255, blank=True)
country = models.CharField(max_length=255, blank=True) country = models.CharField(max_length=255, blank=True)
# company (optional) # company (optional)
company_name = models.CharField(max_length=255, blank=True) company_name = models.CharField(max_length=255, blank=True)
company_street_address = models.CharField(max_length=255, blank=True) company_street = models.CharField(max_length=255, blank=True)
company_street_number_address = 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_postal_code = models.CharField(max_length=255, blank=True)
company_city = 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) company_country = models.CharField(max_length=255, blank=True)

8
server/vbv_lernwelt/shop/serializers.py
View File

@ -9,14 +9,14 @@ class BillingAddressSerializer(serializers.ModelSerializer):
fields = [ fields = [
"first_name", "first_name",
"last_name", "last_name",
"street_address", "street",
"street_number_address", "street_number",
"postal_code", "postal_code",
"city", "city",
"country", "country",
"company_name", "company_name",
"company_street_address", "company_street",
"company_street_number_address", "company_street_number",
"company_postal_code", "company_postal_code",
"company_city", "company_city",
"company_country", "company_country",

32
server/vbv_lernwelt/shop/tests/test_billing_address_api.py
View File

@ -17,14 +17,14 @@ class BillingAddressViewTest(APITestCase):
user=self.user, user=self.user,
first_name="John", first_name="John",
last_name="Doe", last_name="Doe",
street_address="123 Main St", street="123 Main St",
street_number_address="45A", street_number="45A",
postal_code="12345", postal_code="12345",
city="Test City", city="Test City",
country="Test Country", country="Test Country",
company_name="Test Company", company_name="Test Company",
company_street_address="456 Company St", company_street="456 Company St",
company_street_number_address="67B", company_street_number="67B",
company_postal_code="67890", company_postal_code="67890",
company_city="Company City", company_city="Company City",
company_country="Company Country", company_country="Company Country",
@ -42,14 +42,14 @@ class BillingAddressViewTest(APITestCase):
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
self.assertEqual(response.data["first_name"], "John") self.assertEqual(response.data["first_name"], "John")
self.assertEqual(response.data["last_name"], "Doe") self.assertEqual(response.data["last_name"], "Doe")
self.assertEqual(response.data["street_address"], "123 Main St") self.assertEqual(response.data["street"], "123 Main St")
self.assertEqual(response.data["street_number_address"], "45A") self.assertEqual(response.data["street_number"], "45A")
self.assertEqual(response.data["postal_code"], "12345") self.assertEqual(response.data["postal_code"], "12345")
self.assertEqual(response.data["city"], "Test City") self.assertEqual(response.data["city"], "Test City")
self.assertEqual(response.data["country"], "Test Country") self.assertEqual(response.data["country"], "Test Country")
self.assertEqual(response.data["company_name"], "Test Company") self.assertEqual(response.data["company_name"], "Test Company")
self.assertEqual(response.data["company_street_address"], "456 Company St") self.assertEqual(response.data["company_street"], "456 Company St")
self.assertEqual(response.data["company_street_number_address"], "67B") self.assertEqual(response.data["company_street_number"], "67B")
self.assertEqual(response.data["company_postal_code"], "67890") self.assertEqual(response.data["company_postal_code"], "67890")
self.assertEqual(response.data["company_city"], "Company City") self.assertEqual(response.data["company_city"], "Company City")
self.assertEqual(response.data["company_country"], "Company Country") self.assertEqual(response.data["company_country"], "Company Country")
@ -59,14 +59,14 @@ class BillingAddressViewTest(APITestCase):
new_data = { new_data = {
"first_name": "Jane", "first_name": "Jane",
"last_name": "Smith", "last_name": "Smith",
"street_address": "789 New St", "street": "789 New St",
"street_number_address": "101C", "street_number": "101C",
"postal_code": "54321", "postal_code": "54321",
"city": "New City", "city": "New City",
"country": "New Country", "country": "New Country",
"company_name": "New Company", "company_name": "New Company",
"company_street_address": "789 Company St", "company_street": "789 Company St",
"company_street_number_address": "102D", "company_street_number": "102D",
"company_postal_code": "98765", "company_postal_code": "98765",
"company_city": "New Company City", "company_city": "New Company City",
"company_country": "New Company Country", "company_country": "New Company Country",
@ -81,14 +81,14 @@ class BillingAddressViewTest(APITestCase):
updated_address = BillingAddress.objects.get(user=self.user) updated_address = BillingAddress.objects.get(user=self.user)
self.assertEqual(updated_address.first_name, "Jane") self.assertEqual(updated_address.first_name, "Jane")
self.assertEqual(updated_address.last_name, "Smith") self.assertEqual(updated_address.last_name, "Smith")
self.assertEqual(updated_address.street_address, "789 New St") self.assertEqual(updated_address.street, "789 New St")
self.assertEqual(updated_address.street_number_address, "101C") self.assertEqual(updated_address.street_number, "101C")
self.assertEqual(updated_address.postal_code, "54321") self.assertEqual(updated_address.postal_code, "54321")
self.assertEqual(updated_address.city, "New City") self.assertEqual(updated_address.city, "New City")
self.assertEqual(updated_address.country, "New Country") self.assertEqual(updated_address.country, "New Country")
self.assertEqual(updated_address.company_name, "New Company") self.assertEqual(updated_address.company_name, "New Company")
self.assertEqual(updated_address.company_street_address, "789 Company St") self.assertEqual(updated_address.company_street, "789 Company St")
self.assertEqual(updated_address.company_street_number_address, "102D") self.assertEqual(updated_address.company_street_number, "102D")
self.assertEqual(updated_address.company_postal_code, "98765") self.assertEqual(updated_address.company_postal_code, "98765")
self.assertEqual(updated_address.company_city, "New Company City") self.assertEqual(updated_address.company_city, "New Company City")
self.assertEqual(updated_address.company_country, "New Company Country") self.assertEqual(updated_address.company_country, "New Company Country")