fix tests

This commit is contained in:
Richard Schreiber
2025-11-28 16:07:27 +01:00
parent 3257f87a95
commit d8051e3aa0
4 changed files with 13 additions and 13 deletions

View File

@@ -159,7 +159,6 @@ class ReusableMediaViewSet(viewsets.ModelViewSet):
type=s.validated_data["type"], type=s.validated_data["type"],
identifier=s.validated_data["identifier"], identifier=s.validated_data["identifier"],
) )
m.linked_orderpositions = None # not relevant for cross-organizer
m.customer = None # not relevant for cross-organizer m.customer = None # not relevant for cross-organizer
s = self.get_serializer(m) s = self.get_serializer(m)
return Response({"result": s.data}) return Response({"result": s.data})

View File

@@ -286,12 +286,12 @@ def test_by_secret_special_chars(token_client, organizer, clist, event, order):
@pytest.mark.django_db @pytest.mark.django_db
def test_by_medium(token_client, organizer, clist, event, order): def test_by_medium(token_client, organizer, clist, event, order):
with scopes_disabled(): with scopes_disabled():
ReusableMedium.objects.create( rm = ReusableMedium.objects.create(
type="barcode", type="barcode",
identifier="abcdef", identifier="abcdef",
organizer=organizer, organizer=organizer,
linked_orderposition=order.positions.first(),
) )
rm.linked_orderpositions.add(order.positions.first())
resp = _redeem(token_client, organizer, clist, "abcdef", {"source_type": "barcode"}) resp = _redeem(token_client, organizer, clist, "abcdef", {"source_type": "barcode"})
assert resp.status_code == 201 assert resp.status_code == 201
assert resp.data['status'] == 'ok' assert resp.data['status'] == 'ok'
@@ -318,12 +318,13 @@ def test_by_medium_not_connected(token_client, organizer, clist, event, order):
@pytest.mark.django_db @pytest.mark.django_db
def test_by_medium_wrong_event(token_client, organizer, clist, event, order2): def test_by_medium_wrong_event(token_client, organizer, clist, event, order2):
with scopes_disabled(): with scopes_disabled():
ReusableMedium.objects.create( rm = ReusableMedium.objects.create(
type="barcode", type="barcode",
identifier="abcdef", identifier="abcdef",
organizer=organizer, organizer=organizer,
linked_orderposition=order2.positions.first(), linked_orderposition=order2.positions.first(),
) )
rm.linked_orderpositions.add(order2.positions.first())
resp = _redeem(token_client, organizer, clist, "abcdef", {"source_type": "barcode"}) resp = _redeem(token_client, organizer, clist, "abcdef", {"source_type": "barcode"})
assert resp.status_code == 404 assert resp.status_code == 404
assert resp.data['status'] == 'error' assert resp.data['status'] == 'error'
@@ -337,12 +338,12 @@ def test_by_medium_wrong_event(token_client, organizer, clist, event, order2):
@pytest.mark.django_db @pytest.mark.django_db
def test_by_medium_wrong_type(token_client, organizer, clist, event, order): def test_by_medium_wrong_type(token_client, organizer, clist, event, order):
with scopes_disabled(): with scopes_disabled():
ReusableMedium.objects.create( rm = ReusableMedium.objects.create(
type="nfc_uid", type="nfc_uid",
identifier="abcdef", identifier="abcdef",
organizer=organizer, organizer=organizer,
linked_orderposition=order.positions.first(),
) )
rm.linked_orderpositions.add(order.positions.first())
resp = _redeem(token_client, organizer, clist, "abcdef", {"source_type": "barcode"}) resp = _redeem(token_client, organizer, clist, "abcdef", {"source_type": "barcode"})
assert resp.status_code == 404 assert resp.status_code == 404
assert resp.data['status'] == 'error' assert resp.data['status'] == 'error'
@@ -355,13 +356,13 @@ def test_by_medium_wrong_type(token_client, organizer, clist, event, order):
@pytest.mark.django_db @pytest.mark.django_db
def test_by_medium_inactive(token_client, organizer, clist, event, order): def test_by_medium_inactive(token_client, organizer, clist, event, order):
with scopes_disabled(): with scopes_disabled():
ReusableMedium.objects.create( rm = ReusableMedium.objects.create(
type="barcode", type="barcode",
identifier="abcdef", identifier="abcdef",
organizer=organizer, organizer=organizer,
active=False, active=False,
linked_orderposition=order.positions.first(),
) )
rm.linked_orderpositions.add(order.positions.first())
resp = _redeem(token_client, organizer, clist, "abcdef", {"source_type": "barcode"}) resp = _redeem(token_client, organizer, clist, "abcdef", {"source_type": "barcode"})
assert resp.status_code == 404 assert resp.status_code == 404
assert resp.data['status'] == 'error' assert resp.data['status'] == 'error'

View File

@@ -3121,7 +3121,7 @@ def test_order_create_use_medium(token_client, organizer, event, item, quota, qu
with scopes_disabled(): with scopes_disabled():
o = Order.objects.get(code=resp.data['code']) o = Order.objects.get(code=resp.data['code'])
medium.refresh_from_db() medium.refresh_from_db()
assert o.positions.first() == medium.linked_orderposition assert o.positions.first() == medium.linked_orderpositions.first()
assert resp.data['positions'][0]['pdf_data']['medium_identifier'] == medium.identifier assert resp.data['positions'][0]['pdf_data']['medium_identifier'] == medium.identifier
@@ -3168,7 +3168,7 @@ def test_order_create_create_medium(token_client, organizer, event, item, quota,
i = resp.data['positions'][0]['pdf_data']['medium_identifier'] i = resp.data['positions'][0]['pdf_data']['medium_identifier']
assert i assert i
m = organizer.reusable_media.get(identifier=i) m = organizer.reusable_media.get(identifier=i)
assert m.linked_orderposition == o.positions.first() assert m.linked_orderpositions.first() == o.positions.first()
assert m.type == "barcode" assert m.type == "barcode"

View File

@@ -92,7 +92,7 @@ TEST_MEDIUM_RES = {
"active": True, "active": True,
"expires": None, "expires": None,
"customer": None, "customer": None,
"linked_orderposition": None, "linked_orderpositions": None,
"linked_giftcard": None, "linked_giftcard": None,
"notes": None, "notes": None,
"info": {}, "info": {},
@@ -170,7 +170,7 @@ def test_medium_detail(token_client, organizer, event, medium, giftcard, custome
ticket = event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True, ticket = event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True,
personalized=True) personalized=True)
op = o.positions.create(item=ticket, price=Decimal("14")) op = o.positions.create(item=ticket, price=Decimal("14"))
medium.linked_orderposition = op medium.linked_orderpositions.add(op)
medium.linked_giftcard = giftcard medium.linked_giftcard = giftcard
medium.customer = customer medium.customer = customer
medium.save() medium.save()
@@ -538,7 +538,7 @@ def test_medium_lookup_cross_organizer(token_client, organizer, organizer2, org2
ticket = org2_event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True, ticket = org2_event.items.create(name='Early-bird ticket', category=None, default_price=23, admission=True,
personalized=True) personalized=True)
op = o.positions.create(item=ticket, price=Decimal("14")) op = o.positions.create(item=ticket, price=Decimal("14"))
medium2.linked_orderposition = op medium2.linked_orderpositions.add(op)
medium2.linked_giftcard = giftcard2 medium2.linked_giftcard = giftcard2
medium2.save() medium2.save()