CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-10 16:04:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

unify logging adding/removing ops via API

Browse Source
This commit is contained in:
Richard Schreiber
2026-04-29 10:01:11 +02:00
parent 3a61bb20ee
commit 62fb5fcfd3
2 changed files with 46 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/pretix/api/views/media.py
View File

@@ -119,14 +119,38 @@ class ReusableMediaViewSet(viewsets.ModelViewSet):
@transaction.atomic() @transaction.atomic()
def perform_update(self, serializer): def perform_update(self, serializer):
ReusableMedium.objects.select_for_update(of=OF_SELF).get(pk=self.get_object().pk) rm = ReusableMedium.objects.select_for_update(of=OF_SELF).get(pk=self.get_object().pk)
prev_linked_ops_pks = list(rm.linked_orderpositions.values_list("pk", flat=True))
inst = serializer.save(identifier=serializer.instance.identifier, type=serializer.instance.type) inst = serializer.save(identifier=serializer.instance.identifier, type=serializer.instance.type)
inst.log_action( linked_ops_pks = inst.linked_orderpositions.values_list("pk", flat=True)
'pretix.reusable_medium.changed', for op_pk in prev_linked_ops_pks:
user=self.request.user, if op_pk not in linked_ops_pks:
auth=self.request.auth, inst.log_action(
data=self.request.data, 'pretix.reusable_medium.linked_orderposition.removed',
) user=self.request.user,
auth=self.request.auth,
data={
'linked_orderposition': op_pk,
}
)
for op_pk in linked_ops_pks:
if op_pk not in prev_linked_ops_pks:
inst.log_action(
'pretix.reusable_medium.linked_orderposition.added',
user=self.request.user,
auth=self.request.auth,
data={
'linked_orderposition': op_pk,
}
)
data = {k: v for k, v in self.request.data.items() if k not in ('linked_orderposition', 'linked_orderpositions')}
if data:
inst.log_action(
'pretix.reusable_medium.changed',
user=self.request.user,
auth=self.request.auth,
data=data,
)
return inst return inst
def perform_destroy(self, instance): def perform_destroy(self, instance):

15
src/tests/api/test_reusable_media.py
View File

@@ -529,6 +529,7 @@ def test_medium_patch(token_client, organizer, event, medium, giftcard, customer
medium.refresh_from_db() medium.refresh_from_db()
with scopes_disabled(): with scopes_disabled():
assert list(medium.linked_orderpositions.values_list('pk', flat=True)) == [op.pk] assert list(medium.linked_orderpositions.values_list('pk', flat=True)) == [op.pk]
assert medium.all_logentries().count() == 2
resp = token_client.patch( resp = token_client.patch(
'/api/v1/organizers/{}/reusablemedia/{}/'.format(organizer.slug, medium.pk), '/api/v1/organizers/{}/reusablemedia/{}/'.format(organizer.slug, medium.pk),
@@ -541,6 +542,20 @@ def test_medium_patch(token_client, organizer, event, medium, giftcard, customer
medium.refresh_from_db() medium.refresh_from_db()
with scopes_disabled(): with scopes_disabled():
assert list(medium.linked_orderpositions.values_list('pk', flat=True)) == [op.pk, op2.pk] assert list(medium.linked_orderpositions.values_list('pk', flat=True)) == [op.pk, op2.pk]
assert medium.all_logentries().count() == 3
resp = token_client.patch(
'/api/v1/organizers/{}/reusablemedia/{}/'.format(organizer.slug, medium.pk),
{
'linked_orderpositions': [op2.pk],
},
format='json'
)
assert resp.status_code == 200
medium.refresh_from_db()
with scopes_disabled():
assert list(medium.linked_orderpositions.values_list('pk', flat=True)) == [op2.pk]
assert medium.all_logentries().count() == 4
resp = token_client.patch( resp = token_client.patch(
'/api/v1/organizers/{}/reusablemedia/{}/'.format(organizer.slug, medium.pk), '/api/v1/organizers/{}/reusablemedia/{}/'.format(organizer.slug, medium.pk),