pms_integration in process

hotels/admin.py

@@ -5,8 +5,6 @@ from .models import (
     UserHotel,
     APIConfiguration,
     APIRequestLog,
-    PMSConfiguration,
-    PMSIntegrationLog,
     Reservation,
     Guest
 )
@@ -58,22 +56,6 @@ class ApiRequestLogAdmin(admin.ModelAdmin):
     ordering = ('-request_time',)
 
 
-@admin.register(PMSConfiguration)
-class PMSConfigurationAdmin(admin.ModelAdmin):
-    list_display = ('name', 'parser_settings', 'description', 'created_at')
-    search_fields = ('name', 'description')
-    list_filter = ('created_at',)
-    ordering = ('-created_at',)
-
-
-@admin.register(PMSIntegrationLog)
-class PMSIntegrationLogAdmin(admin.ModelAdmin):
-    list_display = ('hotel', 'checked_at', 'status', 'message')
-    search_fields = ('hotel__name', 'status', 'message')
-    list_filter = ('status', 'checked_at')
-    ordering = ('-checked_at',)
-
-
 @admin.register(Reservation)
 class ReservationAdmin(admin.ModelAdmin):
     list_display = ('reservation_id', 'hotel', 'room_number', 'room_type', 'check_in', 'check_out', 'status', 'price', 'discount')

hotels/apps.py

@@ -4,3 +4,4 @@ from django.apps import AppConfig
 class HotelsConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'hotels'
+    verbose_name="Отели"

hotels/migrations/0021_alter_hotel_pms_remove_pmsintegrationlog_hotel_and_more.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.1.4 on 2024-12-08 23:48
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hotels', '0020_alter_userhotel_user'),
+        ('pms_integration', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='hotel',
+            name='pms',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='pms_integration.pmsconfiguration', verbose_name='PMS система'),
+        ),
+        migrations.RemoveField(
+            model_name='pmsintegrationlog',
+            name='hotel',
+        ),
+        migrations.DeleteModel(
+            name='PMSConfiguration',
+        ),
+        migrations.DeleteModel(
+            name='PMSIntegrationLog',
+        ),
+    ]

hotels/models.py

@@ -1,22 +1,7 @@
 from django.db import models
-from users.models import User
 from django.core.validators import MinValueValidator, MaxValueValidator
 
 
-class PMSConfiguration(models.Model):
-    name = models.CharField(max_length=255, verbose_name="Название PMS")
-    parser_settings = models.JSONField(default=dict, verbose_name="Настройки разбора данных")
-    description = models.TextField(blank=True, null=True, verbose_name="Описание")
-    created_at = models.DateTimeField(auto_now_add=True, verbose_name="Дата создания")
-
-    def __str__(self):
-        return self.name
-
-    class Meta:
-        verbose_name = "PMS система"
-        verbose_name_plural = "PMS системы"
-
-
 class APIConfiguration(models.Model):
     name = models.CharField(max_length=255, verbose_name="Название API")
     url = models.URLField(verbose_name="URL API")
@@ -44,7 +29,13 @@ class Hotel(models.Model):
         help_text="API, связанный с этим отелем."
     )
     created_at = models.DateTimeField(auto_now_add=True, verbose_name="Создан")
-    pms = models.ForeignKey(PMSConfiguration, on_delete=models.SET_NULL, null=True, blank=True, verbose_name="PMS система")
+    pms = models.ForeignKey(
+        'pms_integration.PMSConfiguration',  # Используем строковую ссылку
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        verbose_name="PMS система"
+    )
 
     def __str__(self):
         return self.name
@@ -54,32 +45,19 @@ class Hotel(models.Model):
         verbose_name_plural = "Отели"
 
 
-class PMSIntegrationLog(models.Model):
-    hotel = models.ForeignKey(Hotel, on_delete=models.CASCADE, verbose_name="Отель")
-    checked_at = models.DateTimeField(auto_now_add=True, verbose_name="Время проверки")
-    status = models.CharField(max_length=50, verbose_name="Статус", choices=[('success', 'Успех'), ('error', 'Ошибка')])
-    message = models.TextField(verbose_name="Сообщение", blank=True, null=True)
-
-    def __str__(self):
-        return f"{self.hotel.name} - {self.status} - {self.checked_at}"
-
-    class Meta:
-        verbose_name = "Журнал интеграции PMS"
-        verbose_name_plural = "Журналы интеграции PMS"
-        indexes = [
-            models.Index(fields=['hotel']),
-            models.Index(fields=['checked_at']),
-            models.Index(fields=['status']),
-        ]
-
-
 class UserHotel(models.Model):
     user = models.ForeignKey(
-        User, on_delete=models.CASCADE, related_name="user_hotels", verbose_name="Пользователь"
+        'users.User',  # Используем строковую ссылку
+        on_delete=models.CASCADE,
+        related_name="user_hotels",
+        verbose_name="Пользователь"
     )
     hotel = models.ForeignKey(
-        Hotel, on_delete=models.CASCADE, related_name="hotel_users", verbose_name="Отель"
-)
+        'hotels.Hotel',
+        on_delete=models.CASCADE,
+        related_name="hotel_users",
+        verbose_name="Отель"
+    )
 
     def __str__(self):
         return f"{self.user.username} - {self.hotel.name}"