Skip to content

Commit ebd8f0e

Browse files
marcoaciernomarcoacierno
committed
Revert "Send given and family name for invoice info (#4396)"
This reverts commit 8c3ca32.
1 parent 8c3ca32 commit ebd8f0e

File tree

11 files changed

+57
-144
lines changed

11 files changed

+57
-144
lines changed

‎backend/api/orders/mutations.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ def create_order(
4343
is_business=input.invoice_information.is_business,
4444
defaults={
4545
"company_name": input.invoice_information.company,
46-
"user_given_name": input.invoice_information.given_name,
47-
"user_family_name": input.invoice_information.family_name,
46+
"user_name": input.invoice_information.name,
4847
"zip_code": input.invoice_information.zipcode,
4948
"city": input.invoice_information.city,
5049
"address": input.invoice_information.street,

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

Lines changed: 29 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ def _create_order(graphql_client, code, input):
2222
errors {
2323
nonFieldErrors
2424
invoiceInformation {
25-
givenName
26-
familyName
25+
name
2726
street
2827
zipcode
2928
fiscalCode
@@ -80,8 +79,7 @@ def test_cannot_create_order_unlogged(graphql_client):
8079
"invoiceInformation": {
8180
"isBusiness": False,
8281
"company": "",
83-
"givenName": "Patrick",
84-
"familyName": "Arminio",
82+
"name": "Patrick",
8583
"street": "street",
8684
"zipcode": "92100",
8785
"city": "Avellino",
@@ -135,8 +133,7 @@ def test_calls_create_order(graphql_client, user, mocker, requests_mock, pretix_
135133
"invoiceInformation": {
136134
"isBusiness": False,
137135
"company": "",
138-
"givenName": "Patrick",
139-
"familyName": "Arminio",
136+
"name": "Patrick",
140137
"street": "street",
141138
"zipcode": "92100",
142139
"city": "Avellino",
@@ -157,8 +154,7 @@ def test_calls_create_order(graphql_client, user, mocker, requests_mock, pretix_
157154

158155
billing_address = BillingAddress.objects.get(user=user)
159156

160-
assert billing_address.user_given_name == "Patrick"
161-
assert billing_address.user_family_name == "Arminio"
157+
assert billing_address.user_name == "Patrick"
162158
assert billing_address.company_name == ""
163159
assert not billing_address.is_business
164160
assert billing_address.address == "street"
@@ -213,8 +209,7 @@ def test_calls_create_order_doesnt_require_attendee_data_for_non_admission_produ
213209
"invoiceInformation": {
214210
"isBusiness": False,
215211
"company": "",
216-
"givenName": "Patrick",
217-
"familyName": "Arminio",
212+
"name": "Patrick",
218213
"street": "street",
219214
"zipcode": "92100",
220215
"city": "Avellino",
@@ -235,8 +230,7 @@ def test_calls_create_order_doesnt_require_attendee_data_for_non_admission_produ
235230

236231
billing_address = BillingAddress.objects.get(user=user)
237232

238-
assert billing_address.user_given_name == "Patrick"
239-
assert billing_address.user_family_name == "Arminio"
233+
assert billing_address.user_name == "Patrick"
240234
assert billing_address.company_name == ""
241235
assert not billing_address.is_business
242236
assert billing_address.address == "street"
@@ -293,8 +287,7 @@ def test_handles_payment_url_set_to_none(
293287
"invoiceInformation": {
294288
"isBusiness": False,
295289
"company": "",
296-
"givenName": "Patrick",
297-
"familyName": "Arminio",
290+
"name": "Patrick",
298291
"street": "street",
299292
"zipcode": "92100",
300293
"city": "Avellino",
@@ -350,8 +343,7 @@ def test_handles_errors(graphql_client, user, mocker, requests_mock, pretix_item
350343
"invoiceInformation": {
351344
"isBusiness": False,
352345
"company": "",
353-
"givenName": "Patrick",
354-
"familyName": "Arminio",
346+
"name": "Patrick",
355347
"street": "street",
356348
"zipcode": "92100",
357349
"city": "Avellino",
@@ -391,8 +383,7 @@ def test_invoice_validation_fails_without_required_field_in_country_italy(
391383
data = {
392384
"isBusiness": False,
393385
"company": "",
394-
"givenName": "Patrick",
395-
"familyName": "Arminio",
386+
"name": "Patrick",
396387
"street": "street",
397388
"zipcode": "92100",
398389
"city": "Avellino",
@@ -439,8 +430,7 @@ def test_invoice_validation_fails_without_required_field_in_country_italy(
439430

440431
@override_settings(FRONTEND_URL="http://test.it")
441432
@pytest.mark.parametrize(
442-
"field_to_delete",
443-
["givenName", "familyName", "street", "zipcode", "city", "country"],
433+
"field_to_delete", ["name", "street", "zipcode", "city", "country"]
444434
)
445435
def test_invoice_validation_fails_with_missing_required_fields(
446436
graphql_client, user, mocker, field_to_delete, requests_mock, pretix_items
@@ -459,8 +449,7 @@ def test_invoice_validation_fails_with_missing_required_fields(
459449
data = {
460450
"isBusiness": False,
461451
"company": "",
462-
"givenName": "Patrick",
463-
"familyName": "Arminio",
452+
"name": "Patrick",
464453
"street": "street",
465454
"zipcode": "92100",
466455
"city": "Avellino",
@@ -544,8 +533,7 @@ def test_fiscal_code_not_required_for_non_it_orders(
544533
"invoiceInformation": {
545534
"isBusiness": False,
546535
"company": "",
547-
"givenName": "Patrick",
548-
"familyName": "Arminio",
536+
"name": "Patrick",
549537
"street": "street",
550538
"zipcode": "92100",
551539
"city": "Avellino",
@@ -602,8 +590,7 @@ def test_invoice_validation_fails_with_invalid_fiscal_code_in_country_italy(
602590
"invoiceInformation": {
603591
"isBusiness": False,
604592
"company": "",
605-
"givenName": "Patrick",
606-
"familyName": "Arminio",
593+
"name": "Patrick",
607594
"street": "street",
608595
"zipcode": "92100",
609596
"city": "Avellino",
@@ -663,8 +650,7 @@ def test_invoice_validation_checks_pec_email_if_provided(
663650
"invoiceInformation": {
664651
"isBusiness": False,
665652
"company": "",
666-
"givenName": "Patrick",
667-
"familyName": "Arminio",
653+
"name": "Patrick",
668654
"street": "street",
669655
"zipcode": "92100",
670656
"city": "Avellino",
@@ -725,8 +711,7 @@ def test_invoice_validation_fails_with_empty_vat_for_businesses(
725711
"invoiceInformation": {
726712
"isBusiness": True,
727713
"company": "business",
728-
"givenName": "Patrick",
729-
"familyName": "Arminio",
714+
"name": "Patrick",
730715
"street": "street",
731716
"zipcode": "92100",
732717
"city": "Avellino",
@@ -786,8 +771,7 @@ def test_invoice_validation_fails_with_empty_business_name_for_businesses(
786771
"invoiceInformation": {
787772
"isBusiness": True,
788773
"company": "",
789-
"givenName": "Patrick",
790-
"familyName": "Arminio",
774+
"name": "Patrick",
791775
"street": "street",
792776
"zipcode": "92100",
793777
"city": "Avellino",
@@ -847,8 +831,7 @@ def test_invoice_validation_fails_with_invalid_country_code(
847831
"invoiceInformation": {
848832
"isBusiness": True,
849833
"company": "name",
850-
"givenName": "Patrick",
851-
"familyName": "Arminio",
834+
"name": "Patrick",
852835
"street": "street",
853836
"zipcode": "92100",
854837
"city": "Avellino",
@@ -908,8 +891,7 @@ def test_invoice_validation_fails_when_italian_business_and_no_sdi(
908891
"invoiceInformation": {
909892
"isBusiness": True,
910893
"company": "LTD",
911-
"givenName": "Patrick",
912-
"familyName": "Arminio",
894+
"name": "Patrick",
913895
"street": "street",
914896
"zipcode": "92100",
915897
"city": "Avellino",
@@ -970,8 +952,7 @@ def test_invoice_validation_fails_when_italian_business_with_invalid_sdi(
970952
"invoiceInformation": {
971953
"isBusiness": True,
972954
"company": "LTD",
973-
"givenName": "Patrick",
974-
"familyName": "Arminio",
955+
"name": "Patrick",
975956
"street": "street",
976957
"zipcode": "92100",
977958
"city": "Avellino",
@@ -1032,8 +1013,7 @@ def test_invoice_validation_fails_when_italian_zipcode_is_invalid(
10321013
"invoiceInformation": {
10331014
"isBusiness": True,
10341015
"company": "LTD",
1035-
"givenName": "Patrick",
1036-
"familyName": "Arminio",
1016+
"name": "Patrick",
10371017
"street": "street",
10381018
"zipcode": "921",
10391019
"city": "Avellino",
@@ -1094,8 +1074,7 @@ def test_order_creation_fails_if_attendee_name_is_empty(
10941074
"invoiceInformation": {
10951075
"isBusiness": False,
10961076
"company": "LTD",
1097-
"givenName": "Patrick",
1098-
"familyName": "Arminio",
1077+
"name": "Patrick",
10991078
"street": "street",
11001079
"zipcode": "921",
11011080
"city": "Avellino",
@@ -1156,8 +1135,7 @@ def test_order_creation_fails_if_attendee_email_is_empty(
11561135
"invoiceInformation": {
11571136
"isBusiness": False,
11581137
"company": "LTD",
1159-
"givenName": "Patrick",
1160-
"familyName": "Arminio",
1138+
"name": "Patrick",
11611139
"street": "street",
11621140
"zipcode": "921",
11631141
"city": "Avellino",
@@ -1218,8 +1196,7 @@ def test_order_creation_fails_if_attendee_email_is_invalid(
12181196
"invoiceInformation": {
12191197
"isBusiness": False,
12201198
"company": "LTD",
1221-
"givenName": "Patrick",
1222-
"familyName": "Arminio",
1199+
"name": "Patrick",
12231200
"street": "street",
12241201
"zipcode": "921",
12251202
"city": "Avellino",
@@ -1280,8 +1257,7 @@ def test_invoice_validation_works_when_not_italian_and_no_sdi(
12801257
"invoiceInformation": {
12811258
"isBusiness": True,
12821259
"company": "LTD",
1283-
"givenName": "Patrick",
1284-
"familyName": "Arminio",
1260+
"name": "Patrick",
12851261
"street": "street",
12861262
"zipcode": "92100",
12871263
"city": "Avellino",
@@ -1303,8 +1279,7 @@ def test_invoice_validation_works_when_not_italian_and_no_sdi(
13031279

13041280
billing_address = BillingAddress.objects.get(user=user)
13051281

1306-
assert billing_address.user_given_name == "Patrick"
1307-
assert billing_address.user_family_name == "Arminio"
1282+
assert billing_address.user_name == "Patrick"
13081283
assert billing_address.company_name == "LTD"
13091284
assert billing_address.is_business
13101285

@@ -1354,8 +1329,7 @@ def test_create_order_billing_address_stores_both_non_and_business(
13541329
"invoiceInformation": {
13551330
"isBusiness": True,
13561331
"company": "LTD",
1357-
"givenName": "Patrick",
1358-
"familyName": "Arminio",
1332+
"name": "Patrick",
13591333
"street": "street",
13601334
"zipcode": "92100",
13611335
"city": "Avellino",
@@ -1383,8 +1357,7 @@ def test_create_order_billing_address_stores_both_non_and_business(
13831357

13841358
billing_address = billing_addresses.get(is_business=True)
13851359

1386-
assert billing_address.user_given_name == "Patrick"
1387-
assert billing_address.user_family_name == "Arminio"
1360+
assert billing_address.user_name == "Patrick"
13881361
assert billing_address.company_name == "LTD"
13891362
assert billing_address.is_business
13901363

@@ -1434,8 +1407,7 @@ def test_create_order_updates_billing_address(
14341407
"invoiceInformation": {
14351408
"isBusiness": True,
14361409
"company": "LTD",
1437-
"givenName": "Patrick",
1438-
"familyName": "Arminio",
1410+
"name": "Patrick",
14391411
"street": "street",
14401412
"zipcode": "92100",
14411413
"city": "Avellino",
@@ -1458,7 +1430,6 @@ def test_create_order_updates_billing_address(
14581430
billing_address = BillingAddress.objects.get(user=user)
14591431

14601432
assert billing_address.id == existing_billing_address.id
1461-
assert billing_address.user_given_name == "Patrick"
1462-
assert billing_address.user_family_name == "Arminio"
1433+
assert billing_address.user_name == "Patrick"
14631434
assert billing_address.company_name == "LTD"
14641435
assert billing_address.is_business

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

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎backend/billing/models.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ class BillingAddress(TimeStampedModel):
2323
)
2424
is_business = models.BooleanField(_("is business"))
2525
company_name = models.TextField(_("company name"), blank=True)
26-
# TODO: delete this in future
27-
user_name = models.TextField(_("user name"), default="", blank=True)
28-
user_given_name = models.TextField(_("user given name"))
29-
user_family_name = models.TextField(_("user family name"))
26+
user_name = models.TextField(_("user name"))
3027
zip_code = models.TextField(_("zip code"))
3128
city = models.TextField(_("city"))
3229
address = models.TextField(_("address"))

‎backend/pretix/__init__.py‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,7 @@ def get_quotas(conference: Conference) -> Dict[str, Quota]:
248248
@strawberry.type
249249
class InvoiceInformationErrors:
250250
company: list[str] = strawberry.field(default_factory=list)
251-
given_name: list[str] = strawberry.field(default_factory=list)
252-
family_name: list[str] = strawberry.field(default_factory=list)
251+
name: list[str] = strawberry.field(default_factory=list)
253252
street: list[str] = strawberry.field(default_factory=list)
254253
zipcode: list[str] = strawberry.field(default_factory=list)
255254
city: list[str] = strawberry.field(default_factory=list)
@@ -317,8 +316,7 @@ def validate(
317316
class InvoiceInformation:
318317
is_business: bool
319318
company: Optional[str]
320-
given_name: str
321-
family_name: str
319+
name: str
322320
street: str
323321
zipcode: str
324322
city: str
@@ -330,8 +328,7 @@ class InvoiceInformation:
330328

331329
def validate(self, errors: CreateOrderErrors) -> CreateOrderErrors:
332330
required_fields = [
333-
"given_name",
334-
"family_name",
331+
"name",
335332
"street",
336333
"zipcode",
337334
"city",
@@ -527,10 +524,7 @@ def create_order(conference: Conference, order_data: CreateOrderInput) -> Order:
527524
"invoice_address": {
528525
"is_business": order_data.invoice_information.is_business,
529526
"company": order_data.invoice_information.company,
530-
"name_parts": {
531-
"given_name": order_data.invoice_information.given_name,
532-
"family_name": order_data.invoice_information.family_name,
533-
},
527+
"name_parts": {"full_name": order_data.invoice_information.name},
534528
"street": order_data.invoice_information.street,
535529
"zipcode": order_data.invoice_information.zipcode,
536530
"city": order_data.invoice_information.city,

0 commit comments

Comments
 (0)