From 3332d135b44d8a09dd933e6d1373fd0293d45ddb Mon Sep 17 00:00:00 2001
From: trevor <a.choi@smartsoltech.kr>
Date: Sat, 28 Dec 2024 09:52:47 +0900
Subject: [PATCH] Scheduler models Fix

---
 .../0003_remove_pmsconfiguration_hotels.py    | 17 ++++++++++
 .../0002_alter_scheduledtask_options.py       | 17 ++++++++++
 scheduler/models.py                           | 33 ++++++-------------
 3 files changed, 44 insertions(+), 23 deletions(-)
 create mode 100644 pms_integration/migrations/0003_remove_pmsconfiguration_hotels.py
 create mode 100644 scheduler/migrations/0002_alter_scheduledtask_options.py

diff --git a/pms_integration/migrations/0003_remove_pmsconfiguration_hotels.py b/pms_integration/migrations/0003_remove_pmsconfiguration_hotels.py
new file mode 100644
index 00000000..39457bda
--- /dev/null
+++ b/pms_integration/migrations/0003_remove_pmsconfiguration_hotels.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.1.4 on 2024-12-28 00:49
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pms_integration', '0002_pmsconfiguration_hotels'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='pmsconfiguration',
+            name='hotels',
+        ),
+    ]
diff --git a/scheduler/migrations/0002_alter_scheduledtask_options.py b/scheduler/migrations/0002_alter_scheduledtask_options.py
new file mode 100644
index 00000000..f9002bec
--- /dev/null
+++ b/scheduler/migrations/0002_alter_scheduledtask_options.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.1.4 on 2024-12-28 00:49
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('scheduler', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='scheduledtask',
+            options={'verbose_name': 'Запланированная задача', 'verbose_name_plural': 'Запланированные задачи'},
+        ),
+    ]
diff --git a/scheduler/models.py b/scheduler/models.py
index 241ce945..9bb99d21 100644
--- a/scheduler/models.py
+++ b/scheduler/models.py
@@ -5,28 +5,6 @@ import logging
 logger = logging.getLogger(__name__)
 logger.info("Загрузка модели ScheduledTask")
 
-class ScheduledTask(models.Model):
-    task_name = models.CharField(max_length=255)
-    function_path = models.CharField(max_length=255)
-    minutes = models.CharField(max_length=255)
-    hours = models.CharField(max_length=255)
-    months = models.CharField(max_length=255)
-    weekdays = models.CharField(max_length=100, blank=True, default="")
-    active = models.BooleanField(default=True)
-    last_run = models.DateTimeField(null=True, blank=True)
-
-    def __str__(self):
-        return self.name
-
-    def clean_weekdays(self):
-        """Приводим список в строку при сохранении."""
-        if isinstance(self.weekdays, list):
-            self.weekdays = ",".join(map(str, self.weekdays))
-            
-    class Meta:
-        verbose_name = "Запланированная задача"
-        verbose_name_plural = "Запланированные задачи"
-
 def get_available_functions():
     from scheduler.utils import get_project_functions
     return [(path, name) for path, name in get_project_functions()]
@@ -47,4 +25,13 @@ class ScheduledTask(models.Model):
     last_run = models.DateTimeField(blank=True, null=True, verbose_name="Последний запуск")
 
     def __str__(self):
-        return self.task_name
\ No newline at end of file
+        return self.task_name
+
+    def clean_weekdays(self):
+        """Приводим список в строку при сохранении."""
+        if isinstance(self.weekdays, list):
+            self.weekdays = ",".join(map(str, self.weekdays))
+            
+    class Meta:
+        verbose_name = "Запланированная задача"
+        verbose_name_plural = "Запланированные задачи"
\ No newline at end of file