Rename OrderSyncLink to OrderSyncResult

This commit is contained in:
Mira Weller
2025-05-06 15:53:45 +02:00
parent b88d2c7783
commit 7ee0f24af5
5 changed files with 15 additions and 15 deletions

View File

@@ -38,7 +38,7 @@ from pretix.base.datasync.sourcefields import (
EVENT, EVENT_OR_SUBEVENT, ORDER, ORDER_POSITION, get_data_fields, EVENT, EVENT_OR_SUBEVENT, ORDER, ORDER_POSITION, get_data_fields,
) )
from pretix.base.logentrytype_registry import make_link from pretix.base.logentrytype_registry import make_link
from pretix.base.models.datasync import OrderSyncLink, OrderSyncQueue from pretix.base.models.datasync import OrderSyncResult, OrderSyncQueue
from pretix.base.signals import EventPluginRegistry, periodic_task from pretix.base.signals import EventPluginRegistry, periodic_task
from pretix.celery_app import app from pretix.celery_app import app
@@ -309,7 +309,7 @@ class OutboundSyncProvider:
mapping=mapping, mapping=mapping,
mapped_objects=mapped_objects, mapped_objects=mapped_objects,
) )
OrderSyncLink.objects.create( OrderSyncResult.objects.create(
order=inputs.get(ORDER), order_position=inputs.get(ORDER_POSITION), sync_provider=self.identifier, order=inputs.get(ORDER), order_position=inputs.get(ORDER_POSITION), sync_provider=self.identifier,
external_object_type=info.get('object_type'), external_object_type=info.get('object_type'),
external_id_field=info.get('external_id_field'), external_id_field=info.get('external_id_field'),
@@ -332,7 +332,7 @@ class OutboundSyncProvider:
"voucher", "voucher",
) )
) )
order.synced_objects.filter(sync_provider=self.identifier).delete() order.sync_results.filter(sync_provider=self.identifier).delete()
order_inputs = {ORDER: order, EVENT: self.event} order_inputs = {ORDER: order, EVENT: self.event}
mapped_objects = {} mapped_objects = {}
for mapping in self.mappings: for mapping in self.mappings:

View File

@@ -39,7 +39,7 @@ class Migration(migrations.Migration):
}, },
), ),
migrations.CreateModel( migrations.CreateModel(
name="OrderSyncLink", name="OrderSyncResult",
fields=[ fields=[
( (
"id", "id",
@@ -49,19 +49,19 @@ class Migration(migrations.Migration):
), ),
("sync_provider", models.CharField(max_length=128)), ("sync_provider", models.CharField(max_length=128)),
("external_object_type", models.CharField(max_length=128)), ("external_object_type", models.CharField(max_length=128)),
("external_pk_name", models.CharField(max_length=128)), ("external_id_field", models.CharField(max_length=128)),
("external_pk_value", models.CharField(max_length=128)), ("id_value", models.CharField(max_length=128)),
("external_link_href", models.CharField(max_length=255, null=True)), ("external_link_href", models.CharField(max_length=255, null=True)),
( (
"external_link_display_name", "external_link_display_name",
models.CharField(max_length=255, null=True), models.CharField(max_length=255, null=True),
), ),
("timestamp", models.DateTimeField(auto_now_add=True)), ("transmitted", models.DateTimeField(auto_now_add=True)),
( (
"order", "order",
models.ForeignKey( models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE, on_delete=django.db.models.deletion.CASCADE,
related_name="synced_objects", related_name="sync_results",
to="pretixbase.order", to="pretixbase.order",
), ),
), ),
@@ -70,7 +70,7 @@ class Migration(migrations.Migration):
models.ForeignKey( models.ForeignKey(
null=True, null=True,
on_delete=django.db.models.deletion.CASCADE, on_delete=django.db.models.deletion.CASCADE,
related_name="synced_objects", related_name="sync_results",
to="pretixbase.orderposition", to="pretixbase.orderposition",
), ),
), ),

View File

@@ -68,20 +68,20 @@ class OrderSyncQueue(models.Model):
return self.provider_class.max_attempts return self.provider_class.max_attempts
class OrderSyncLink(models.Model): class OrderSyncResult(models.Model):
order = models.ForeignKey( order = models.ForeignKey(
Order, on_delete=models.CASCADE, related_name="synced_objects" Order, on_delete=models.CASCADE, related_name="sync_results"
) )
sync_provider = models.CharField(blank=False, null=False, max_length=128) sync_provider = models.CharField(blank=False, null=False, max_length=128)
order_position = models.ForeignKey( order_position = models.ForeignKey(
OrderPosition, on_delete=models.CASCADE, related_name="synced_objects", blank=True, null=True, OrderPosition, on_delete=models.CASCADE, related_name="sync_results", blank=True, null=True,
) )
external_object_type = models.CharField(blank=False, null=False, max_length=128) external_object_type = models.CharField(blank=False, null=False, max_length=128)
external_id_field = models.CharField(blank=False, null=False, max_length=128) external_id_field = models.CharField(blank=False, null=False, max_length=128)
id_value = models.CharField(blank=False, null=False, max_length=128) id_value = models.CharField(blank=False, null=False, max_length=128)
external_link_href = models.CharField(blank=True, null=True, max_length=255) external_link_href = models.CharField(blank=True, null=True, max_length=255)
external_link_display_name = models.CharField(blank=True, null=True, max_length=255) external_link_display_name = models.CharField(blank=True, null=True, max_length=255)
timestamp = models.DateTimeField(blank=False, null=False, auto_now_add=True) transmitted = models.DateTimeField(blank=False, null=False, auto_now_add=True)
class Meta: class Meta:
indexes = [ indexes = [

View File

@@ -45,7 +45,7 @@ def on_control_order_info(sender: Event, request, order: Order, **kwargs):
objects = { objects = {
provider: list(objects) provider: list(objects)
for (provider, objects) for (provider, objects)
in groupby(order.synced_objects.order_by('sync_provider').all(), key=lambda o: o.sync_provider) in groupby(order.sync_results.order_by('sync_provider').all(), key=lambda o: o.sync_provider)
} }
providers = [(provider.identifier, provider.display_name, queued.get(provider.identifier), objects.get(provider.identifier)) for provider in providers] providers = [(provider.identifier, provider.display_name, queued.get(provider.identifier), objects.get(provider.identifier)) for provider in providers]

View File

@@ -56,7 +56,7 @@
{% trans "identified by" %} {{ obj.external_pk_name }} {% trans "identified by" %} {{ obj.external_pk_name }}
<em>{{ obj.external_pk_value }}</em> <em>{{ obj.external_pk_value }}</em>
{% endif %} {% endif %}
&nbsp; <time class="text-muted" datetime="{{ obj.timestamp.isoformat }}">{{ obj.timestamp }}</time> &nbsp; <time class="text-muted" datetime="{{ obj.transmitted.isoformat }}">{{ obj.transmitted }}</time>
</li> </li>
{% empty %} {% empty %}
<li>{% trans "No data transmitted." %}</li> <li>{% trans "No data transmitted." %}</li>