From 00847b621d6185f323cad789610316d48ea36c88 Mon Sep 17 00:00:00 2001
From: Mira Weller <weller@rami.io>
Date: Tue, 1 Apr 2025 16:52:30 +0200
Subject: [PATCH] rebase migration

---
 .../base/migrations/0277_ordersyncqueue.py    | 41 -------------------
 .../0279_ordersynclink_timestamp.py           | 22 ----------
 ...278_ordersynclink.py => 0280_ordersync.py} | 34 +++++++++++++--
 3 files changed, 31 insertions(+), 66 deletions(-)
 delete mode 100644 src/pretix/base/migrations/0277_ordersyncqueue.py
 delete mode 100644 src/pretix/base/migrations/0279_ordersynclink_timestamp.py
 rename src/pretix/base/migrations/{0278_ordersynclink.py => 0280_ordersync.py} (59%)

diff --git a/src/pretix/base/migrations/0277_ordersyncqueue.py b/src/pretix/base/migrations/0277_ordersyncqueue.py
deleted file mode 100644
index a7458836ac..0000000000
--- a/src/pretix/base/migrations/0277_ordersyncqueue.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# Generated by Django 4.2.16 on 2025-02-28 12:06
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("pretixbase", "0276_item_hidden_if_item_available_mode"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="OrderSyncQueue",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True, primary_key=True, serialize=False
-                    ),
-                ),
-                ("sync_provider", models.CharField(max_length=128)),
-                ("triggered_by", models.CharField(max_length=128)),
-                ("triggered", models.DateTimeField(auto_now_add=True)),
-                ("failed_attempts", models.PositiveIntegerField(default=0)),
-                ("not_before", models.DateTimeField(blank=True, null=True)),
-                (
-                    "order",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="queued_sync_jobs",
-                        to="pretixbase.order",
-                    ),
-                ),
-            ],
-            options={
-                "unique_together": {("order", "sync_provider")},
-            },
-        ),
-    ]
diff --git a/src/pretix/base/migrations/0279_ordersynclink_timestamp.py b/src/pretix/base/migrations/0279_ordersynclink_timestamp.py
deleted file mode 100644
index e2e9095eda..0000000000
--- a/src/pretix/base/migrations/0279_ordersynclink_timestamp.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 4.2.16 on 2025-03-04 14:37
-
-import django.utils.timezone
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("pretixbase", "0278_ordersynclink"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="ordersynclink",
-            name="timestamp",
-            field=models.DateTimeField(
-                auto_now_add=True, default=django.utils.timezone.now
-            ),
-            preserve_default=False,
-        ),
-    ]
diff --git a/src/pretix/base/migrations/0278_ordersynclink.py b/src/pretix/base/migrations/0280_ordersync.py
similarity index 59%
rename from src/pretix/base/migrations/0278_ordersynclink.py
rename to src/pretix/base/migrations/0280_ordersync.py
index 3125758aa6..e0aa483f67 100644
--- a/src/pretix/base/migrations/0278_ordersynclink.py
+++ b/src/pretix/base/migrations/0280_ordersync.py
@@ -1,16 +1,43 @@
-# Generated by Django 4.2.16 on 2025-03-04 14:12
+# Generated by Django 4.2.16 on 2025-04-01 14:52
 
-import django.db.models.deletion
 from django.db import migrations, models
+import django.db.models.deletion
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("pretixbase", "0277_ordersyncqueue"),
+        ("pretixbase", "0279_discount_event_date_from_discount_event_date_until"),
     ]
 
     operations = [
+        migrations.CreateModel(
+            name="OrderSyncQueue",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True, primary_key=True, serialize=False
+                    ),
+                ),
+                ("sync_provider", models.CharField(max_length=128)),
+                ("triggered_by", models.CharField(max_length=128)),
+                ("triggered", models.DateTimeField(auto_now_add=True)),
+                ("failed_attempts", models.PositiveIntegerField(default=0)),
+                ("not_before", models.DateTimeField(blank=True, null=True)),
+                (
+                    "order",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="queued_sync_jobs",
+                        to="pretixbase.order",
+                    ),
+                ),
+            ],
+            options={
+                "unique_together": {("order", "sync_provider")},
+            },
+        ),
         migrations.CreateModel(
             name="OrderSyncLink",
             fields=[
@@ -29,6 +56,7 @@ class Migration(migrations.Migration):
                     "external_link_display_name",
                     models.CharField(max_length=255, null=True),
                 ),
+                ("timestamp", models.DateTimeField(auto_now_add=True)),
                 (
                     "order",
                     models.ForeignKey(