Skip to content

Commit 3729a2c

Browse files
patrick91patrick91
committed
Use family/given name vs first/last name
1 parent 9ab5920 commit 3729a2c

File tree

11 files changed

+94
-94
lines changed

11 files changed

+94
-94
lines changed

‎backend/api/orders/mutations.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ def create_order(
4343
is_business=input.invoice_information.is_business,
4444
defaults={
4545
"company_name": input.invoice_information.company,
46-
"user_first_name": input.invoice_information.first_name,
47-
"user_last_name": input.invoice_information.last_name,
46+
"user_given_name": input.invoice_information.given_name,
47+
"user_family_name": input.invoice_information.family_name,
4848
"zip_code": input.invoice_information.zipcode,
4949
"city": input.invoice_information.city,
5050
"address": input.invoice_information.street,

‎backend/api/tests/schema/test_create_order.py‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ def _create_order(graphql_client, code, input):
2222
errors {
2323
nonFieldErrors
2424
invoiceInformation {
25-
firstName
26-
lastName
25+
givenName
26+
familyName
2727
street
2828
zipcode
2929
fiscalCode
@@ -80,8 +80,8 @@ def test_cannot_create_order_unlogged(graphql_client):
8080
"invoiceInformation": {
8181
"isBusiness": False,
8282
"company": "",
83-
"firstName": "Patrick",
84-
"lastName": "Arminio",
83+
"givenName": "Patrick",
84+
"familyName": "Arminio",
8585
"street": "street",
8686
"zipcode": "92100",
8787
"city": "Avellino",
@@ -135,8 +135,8 @@ def test_calls_create_order(graphql_client, user, mocker, requests_mock, pretix_
135135
"invoiceInformation": {
136136
"isBusiness": False,
137137
"company": "",
138-
"firstName": "Patrick",
139-
"lastName": "Arminio",
138+
"givenName": "Patrick",
139+
"familyName": "Arminio",
140140
"street": "street",
141141
"zipcode": "92100",
142142
"city": "Avellino",
@@ -157,8 +157,8 @@ def test_calls_create_order(graphql_client, user, mocker, requests_mock, pretix_
157157

158158
billing_address = BillingAddress.objects.get(user=user)
159159

160-
assert billing_address.user_first_name == "Patrick"
161-
assert billing_address.user_last_name == "Arminio"
160+
assert billing_address.user_given_name == "Patrick"
161+
assert billing_address.user_family_name == "Arminio"
162162
assert billing_address.company_name == ""
163163
assert not billing_address.is_business
164164
assert billing_address.address == "street"
@@ -213,8 +213,8 @@ def test_calls_create_order_doesnt_require_attendee_data_for_non_admission_produ
213213
"invoiceInformation": {
214214
"isBusiness": False,
215215
"company": "",
216-
"firstName": "Patrick",
217-
"lastName": "Arminio",
216+
"givenName": "Patrick",
217+
"familyName": "Arminio",
218218
"street": "street",
219219
"zipcode": "92100",
220220
"city": "Avellino",
@@ -235,8 +235,8 @@ def test_calls_create_order_doesnt_require_attendee_data_for_non_admission_produ
235235

236236
billing_address = BillingAddress.objects.get(user=user)
237237

238-
assert billing_address.user_first_name == "Patrick"
239-
assert billing_address.user_last_name == "Arminio"
238+
assert billing_address.user_given_name == "Patrick"
239+
assert billing_address.user_family_name == "Arminio"
240240
assert billing_address.company_name == ""
241241
assert not billing_address.is_business
242242
assert billing_address.address == "street"
@@ -293,8 +293,8 @@ def test_handles_payment_url_set_to_none(
293293
"invoiceInformation": {
294294
"isBusiness": False,
295295
"company": "",
296-
"firstName": "Patrick",
297-
"lastName": "Arminio",
296+
"givenName": "Patrick",
297+
"familyName": "Arminio",
298298
"street": "street",
299299
"zipcode": "92100",
300300
"city": "Avellino",
@@ -350,8 +350,8 @@ def test_handles_errors(graphql_client, user, mocker, requests_mock, pretix_item
350350
"invoiceInformation": {
351351
"isBusiness": False,
352352
"company": "",
353-
"firstName": "Patrick",
354-
"lastName": "Arminio",
353+
"givenName": "Patrick",
354+
"familyName": "Arminio",
355355
"street": "street",
356356
"zipcode": "92100",
357357
"city": "Avellino",
@@ -391,8 +391,8 @@ def test_invoice_validation_fails_without_required_field_in_country_italy(
391391
data = {
392392
"isBusiness": False,
393393
"company": "",
394-
"firstName": "Patrick",
395-
"lastName": "Arminio",
394+
"givenName": "Patrick",
395+
"familyName": "Arminio",
396396
"street": "street",
397397
"zipcode": "92100",
398398
"city": "Avellino",
@@ -440,7 +440,7 @@ def test_invoice_validation_fails_without_required_field_in_country_italy(
440440
@override_settings(FRONTEND_URL="http://test.it")
441441
@pytest.mark.parametrize(
442442
"field_to_delete",
443-
["firstName", "lastName", "street", "zipcode", "city", "country"],
443+
["givenName", "familyName", "street", "zipcode", "city", "country"],
444444
)
445445
def test_invoice_validation_fails_with_missing_required_fields(
446446
graphql_client, user, mocker, field_to_delete, requests_mock, pretix_items
@@ -459,8 +459,8 @@ def test_invoice_validation_fails_with_missing_required_fields(
459459
data = {
460460
"isBusiness": False,
461461
"company": "",
462-
"firstName": "Patrick",
463-
"lastName": "Arminio",
462+
"givenName": "Patrick",
463+
"familyName": "Arminio",
464464
"street": "street",
465465
"zipcode": "92100",
466466
"city": "Avellino",
@@ -544,8 +544,8 @@ def test_fiscal_code_not_required_for_non_it_orders(
544544
"invoiceInformation": {
545545
"isBusiness": False,
546546
"company": "",
547-
"firstName": "Patrick",
548-
"lastName": "Arminio",
547+
"givenName": "Patrick",
548+
"familyName": "Arminio",
549549
"street": "street",
550550
"zipcode": "92100",
551551
"city": "Avellino",
@@ -602,8 +602,8 @@ def test_invoice_validation_fails_with_invalid_fiscal_code_in_country_italy(
602602
"invoiceInformation": {
603603
"isBusiness": False,
604604
"company": "",
605-
"firstName": "Patrick",
606-
"lastName": "Arminio",
605+
"givenName": "Patrick",
606+
"familyName": "Arminio",
607607
"street": "street",
608608
"zipcode": "92100",
609609
"city": "Avellino",
@@ -663,8 +663,8 @@ def test_invoice_validation_checks_pec_email_if_provided(
663663
"invoiceInformation": {
664664
"isBusiness": False,
665665
"company": "",
666-
"firstName": "Patrick",
667-
"lastName": "Arminio",
666+
"givenName": "Patrick",
667+
"familyName": "Arminio",
668668
"street": "street",
669669
"zipcode": "92100",
670670
"city": "Avellino",
@@ -725,8 +725,8 @@ def test_invoice_validation_fails_with_empty_vat_for_businesses(
725725
"invoiceInformation": {
726726
"isBusiness": True,
727727
"company": "business",
728-
"firstName": "Patrick",
729-
"lastName": "Arminio",
728+
"givenName": "Patrick",
729+
"familyName": "Arminio",
730730
"street": "street",
731731
"zipcode": "92100",
732732
"city": "Avellino",
@@ -786,8 +786,8 @@ def test_invoice_validation_fails_with_empty_business_name_for_businesses(
786786
"invoiceInformation": {
787787
"isBusiness": True,
788788
"company": "",
789-
"firstName": "Patrick",
790-
"lastName": "Arminio",
789+
"givenName": "Patrick",
790+
"familyName": "Arminio",
791791
"street": "street",
792792
"zipcode": "92100",
793793
"city": "Avellino",
@@ -847,8 +847,8 @@ def test_invoice_validation_fails_with_invalid_country_code(
847847
"invoiceInformation": {
848848
"isBusiness": True,
849849
"company": "name",
850-
"firstName": "Patrick",
851-
"lastName": "Arminio",
850+
"givenName": "Patrick",
851+
"familyName": "Arminio",
852852
"street": "street",
853853
"zipcode": "92100",
854854
"city": "Avellino",
@@ -908,8 +908,8 @@ def test_invoice_validation_fails_when_italian_business_and_no_sdi(
908908
"invoiceInformation": {
909909
"isBusiness": True,
910910
"company": "LTD",
911-
"firstName": "Patrick",
912-
"lastName": "Arminio",
911+
"givenName": "Patrick",
912+
"familyName": "Arminio",
913913
"street": "street",
914914
"zipcode": "92100",
915915
"city": "Avellino",
@@ -970,8 +970,8 @@ def test_invoice_validation_fails_when_italian_business_with_invalid_sdi(
970970
"invoiceInformation": {
971971
"isBusiness": True,
972972
"company": "LTD",
973-
"firstName": "Patrick",
974-
"lastName": "Arminio",
973+
"givenName": "Patrick",
974+
"familyName": "Arminio",
975975
"street": "street",
976976
"zipcode": "92100",
977977
"city": "Avellino",
@@ -1032,8 +1032,8 @@ def test_invoice_validation_fails_when_italian_zipcode_is_invalid(
10321032
"invoiceInformation": {
10331033
"isBusiness": True,
10341034
"company": "LTD",
1035-
"firstName": "Patrick",
1036-
"lastName": "Arminio",
1035+
"givenName": "Patrick",
1036+
"familyName": "Arminio",
10371037
"street": "street",
10381038
"zipcode": "921",
10391039
"city": "Avellino",
@@ -1094,8 +1094,8 @@ def test_order_creation_fails_if_attendee_name_is_empty(
10941094
"invoiceInformation": {
10951095
"isBusiness": False,
10961096
"company": "LTD",
1097-
"firstName": "Patrick",
1098-
"lastName": "Arminio",
1097+
"givenName": "Patrick",
1098+
"familyName": "Arminio",
10991099
"street": "street",
11001100
"zipcode": "921",
11011101
"city": "Avellino",
@@ -1156,8 +1156,8 @@ def test_order_creation_fails_if_attendee_email_is_empty(
11561156
"invoiceInformation": {
11571157
"isBusiness": False,
11581158
"company": "LTD",
1159-
"firstName": "Patrick",
1160-
"lastName": "Arminio",
1159+
"givenName": "Patrick",
1160+
"familyName": "Arminio",
11611161
"street": "street",
11621162
"zipcode": "921",
11631163
"city": "Avellino",
@@ -1218,8 +1218,8 @@ def test_order_creation_fails_if_attendee_email_is_invalid(
12181218
"invoiceInformation": {
12191219
"isBusiness": False,
12201220
"company": "LTD",
1221-
"firstName": "Patrick",
1222-
"lastName": "Arminio",
1221+
"givenName": "Patrick",
1222+
"familyName": "Arminio",
12231223
"street": "street",
12241224
"zipcode": "921",
12251225
"city": "Avellino",
@@ -1280,8 +1280,8 @@ def test_invoice_validation_works_when_not_italian_and_no_sdi(
12801280
"invoiceInformation": {
12811281
"isBusiness": True,
12821282
"company": "LTD",
1283-
"firstName": "Patrick",
1284-
"lastName": "Arminio",
1283+
"givenName": "Patrick",
1284+
"familyName": "Arminio",
12851285
"street": "street",
12861286
"zipcode": "92100",
12871287
"city": "Avellino",
@@ -1303,8 +1303,8 @@ def test_invoice_validation_works_when_not_italian_and_no_sdi(
13031303

13041304
billing_address = BillingAddress.objects.get(user=user)
13051305

1306-
assert billing_address.user_first_name == "Patrick"
1307-
assert billing_address.user_last_name == "Arminio"
1306+
assert billing_address.user_given_name == "Patrick"
1307+
assert billing_address.user_family_name == "Arminio"
13081308
assert billing_address.company_name == "LTD"
13091309
assert billing_address.is_business
13101310

@@ -1354,8 +1354,8 @@ def test_create_order_billing_address_stores_both_non_and_business(
13541354
"invoiceInformation": {
13551355
"isBusiness": True,
13561356
"company": "LTD",
1357-
"firstName": "Patrick",
1358-
"lastName": "Arminio",
1357+
"givenName": "Patrick",
1358+
"familyName": "Arminio",
13591359
"street": "street",
13601360
"zipcode": "92100",
13611361
"city": "Avellino",
@@ -1383,8 +1383,8 @@ def test_create_order_billing_address_stores_both_non_and_business(
13831383

13841384
billing_address = billing_addresses.get(is_business=True)
13851385

1386-
assert billing_address.user_first_name == "Patrick"
1387-
assert billing_address.user_last_name == "Arminio"
1386+
assert billing_address.user_given_name == "Patrick"
1387+
assert billing_address.user_family_name == "Arminio"
13881388
assert billing_address.company_name == "LTD"
13891389
assert billing_address.is_business
13901390

@@ -1434,8 +1434,8 @@ def test_create_order_updates_billing_address(
14341434
"invoiceInformation": {
14351435
"isBusiness": True,
14361436
"company": "LTD",
1437-
"firstName": "Patrick",
1438-
"lastName": "Arminio",
1437+
"givenName": "Patrick",
1438+
"familyName": "Arminio",
14391439
"street": "street",
14401440
"zipcode": "92100",
14411441
"city": "Avellino",
@@ -1458,7 +1458,7 @@ def test_create_order_updates_billing_address(
14581458
billing_address = BillingAddress.objects.get(user=user)
14591459

14601460
assert billing_address.id == existing_billing_address.id
1461-
assert billing_address.user_first_name == "Patrick"
1462-
assert billing_address.user_last_name == "Arminio"
1461+
assert billing_address.user_given_name == "Patrick"
1462+
assert billing_address.user_family_name == "Arminio"
14631463
assert billing_address.company_name == "LTD"
14641464
assert billing_address.is_business

‎backend/billing/migrations/0002_billingaddress_user_first_name_and_more.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ class Migration(migrations.Migration):
1212
operations = [
1313
migrations.AddField(
1414
model_name='billingaddress',
15-
name='user_first_name',
16-
field=models.TextField(default='', verbose_name='user first name'),
15+
name='user_given_name',
16+
field=models.TextField(default='', verbose_name='user given name'),
1717
preserve_default=False,
1818
),
1919
migrations.AddField(
2020
model_name='billingaddress',
21-
name='user_last_name',
22-
field=models.TextField(default='', verbose_name='user last name'),
21+
name='user_family_name',
22+
field=models.TextField(default='', verbose_name='user family name'),
2323
preserve_default=False,
2424
),
2525
migrations.AlterField(

‎backend/billing/models.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ class BillingAddress(TimeStampedModel):
2525
company_name = models.TextField(_("company name"), blank=True)
2626
# TODO: delete this in future
2727
user_name = models.TextField(_("user name"), default="", blank=True)
28-
user_first_name = models.TextField(_("user first name"))
29-
user_last_name = models.TextField(_("user last name"))
28+
user_given_name = models.TextField(_("user given name"))
29+
user_family_name = models.TextField(_("user family name"))
3030
zip_code = models.TextField(_("zip code"))
3131
city = models.TextField(_("city"))
3232
address = models.TextField(_("address"))

0 commit comments

Comments
 (0)