From 7e7ce97d1021df29da004efd1340bdeb5dd42ad8 Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sun, 16 Feb 2025 17:13:45 -0800
Subject: [PATCH] merge migrations

---
 .../1063_alter_workflowactionwebhook_url.py   | 22 -------------------
 ...alter_paperlesstask_task_name_and_more.py} | 18 +++++++--------
 2 files changed, 9 insertions(+), 31 deletions(-)
 delete mode 100644 src/documents/migrations/1063_alter_workflowactionwebhook_url.py
 rename src/documents/migrations/{1063_paperlesstask_type_alter_paperlesstask_task_name.py => 1063_paperlesstask_type_alter_paperlesstask_task_name_and_more.py} (77%)

diff --git a/src/documents/migrations/1063_alter_workflowactionwebhook_url.py b/src/documents/migrations/1063_alter_workflowactionwebhook_url.py
deleted file mode 100644
index e24928717..000000000
--- a/src/documents/migrations/1063_alter_workflowactionwebhook_url.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# Generated by Django 5.1.6 on 2025-02-16 16:31
-
-from django.db import migrations
-from django.db import models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("documents", "1062_alter_savedviewfilterrule_rule_type"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="workflowactionwebhook",
-            name="url",
-            field=models.CharField(
-                help_text="The destination URL for the notification.",
-                max_length=256,
-                verbose_name="webhook url",
-            ),
-        ),
-    ]
diff --git a/src/documents/migrations/1063_paperlesstask_type_alter_paperlesstask_task_name.py b/src/documents/migrations/1063_paperlesstask_type_alter_paperlesstask_task_name_and_more.py
similarity index 77%
rename from src/documents/migrations/1063_paperlesstask_type_alter_paperlesstask_task_name.py
rename to src/documents/migrations/1063_paperlesstask_type_alter_paperlesstask_task_name_and_more.py
index e3878c665..ae4ae0061 100644
--- a/src/documents/migrations/1063_paperlesstask_type_alter_paperlesstask_task_name.py
+++ b/src/documents/migrations/1063_paperlesstask_type_alter_paperlesstask_task_name_and_more.py
@@ -1,14 +1,9 @@
-# Generated by Django 5.1.6 on 2025-02-14 23:10
+# Generated by Django 5.1.6 on 2025-02-17 01:13
 
 from django.db import migrations
 from django.db import models
 
 
-def make_existing_tasks_consume_auto(apps, schema_editor):
-    PaperlessTask = apps.get_model("documents", "PaperlessTask")
-    PaperlessTask.objects.all().update(type="auto_task", task_name="consume_file")
-
-
 class Migration(migrations.Migration):
     dependencies = [
         ("documents", "1062_alter_savedviewfilterrule_rule_type"),
@@ -45,8 +40,13 @@ class Migration(migrations.Migration):
                 verbose_name="Task Name",
             ),
         ),
-        migrations.RunPython(
-            make_existing_tasks_consume_auto,
-            migrations.RunPython.noop,
+        migrations.AlterField(
+            model_name="workflowactionwebhook",
+            name="url",
+            field=models.CharField(
+                help_text="The destination URL for the notification.",
+                max_length=256,
+                verbose_name="webhook url",
+            ),
         ),
     ]