pms_integration in process

bot/apps.py

@@ -4,3 +4,4 @@ from django.apps import AppConfig
 class BotConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
     name = 'bot'
+    verbose_name="Бот"

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,31 +45,18 @@ 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):

pms_integration/admin.py

@@ -1,3 +1,18 @@
 from django.contrib import admin
-
+from .models import PMSConfiguration, PMSIntegrationLog
 # Register your models here.
+
+@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',)

pms_integration/apps.py

@@ -2,5 +2,6 @@ from django.apps import AppConfig
 
 
 class PmsIntegrationConfig(AppConfig):
-    default_auto_field = 'django.db.models.BigAutoField'
+    default_auto_field = "django.db.models.BigAutoField"
-    name = 'pms_integration'
+    name = "pms_integration"
+    verbose_name = "Интеграция с PMS"

pms_integration/manager.py

@@ -1,53 +1,68 @@
-# pms_integration/manager.py
-
 import importlib
-from hotels.models import Hotel, PMSIntegrationLog, Reservation
+from django.core.exceptions import ObjectDoesNotExist
-from asgiref.sync import sync_to_async
+from hotels.models import Hotel
+from .models import PMSIntegrationLog
+import os
+from pathlib import Path
+from plugins.base_plugin import BasePMSPlugin
+
+
+class PluginLoader:
+    """
+    Класс для автоматической загрузки плагинов PMS.
+    """
+    PLUGIN_PATH = Path(__file__).parent / "plugins"
+
+    @staticmethod
+    def load_plugins():
+        plugins = {}
+        for file in os.listdir(PluginLoader.PLUGIN_PATH):
+            if file.endswith("_pms.py") and not file.startswith("__"):
+                module_name = f"pms_integration.plugins.{file[:-3]}"
+                try:
+                    module = importlib.import_module(module_name)
+                    # Ищем класс, наследующийся от BasePMSPlugin
+                    for attr in dir(module):
+                        cls = getattr(module, attr)
+                        if isinstance(cls, type) and issubclass(cls, BasePMSPlugin) and cls is not BasePMSPlugin:
+                            plugins[cls.__name__] = cls
+                except Exception as e:
+                    print(f"Ошибка загрузки плагина {module_name}: {e}")
+        return plugins
+
+
+
+
 
 class PMSIntegrationManager:
-    """Универсальный менеджер интеграции с PMS."""
-
     def __init__(self, hotel_id):
         self.hotel_id = hotel_id
         self.hotel = None
+        self.pms_config = None
         self.plugin = None
 
-    async def load_hotel_data(self):
+    def load_hotel(self):
-        """Загружает данные отеля и инициализирует соответствующий плагин."""
+        from hotels.models import Hotel  # Импорт здесь, чтобы избежать кругового импорта
-        self.hotel = await sync_to_async(Hotel.objects.get)(id=self.hotel_id)
+        self.hotel = Hotel.objects.get(id=self.hotel_id)
-        pms_system = self.hotel.pms
+        self.pms_config = self.hotel.pms
+        if not self.pms_config:
+            raise ValueError(f"Отель {self.hotel.name} не связан с PMS системой.")
 
-        if not pms_system:
+    def load_plugin(self):
-            raise ValueError("PMS система не настроена для отеля.")
+        plugins = PluginLoader.load_plugins()
+        if self.pms_config.name not in plugins:
+            raise ValueError(f"Плагин для PMS {self.pms_config.name} не найден.")
+        self.plugin = plugins[self.pms_config.name](self.pms_config)
 
-        plugin_module = f"pms_integration.plugins.{pms_system.name.lower()}_pms"
+    def fetch_data(self):
-        try:
+        if not self.plugin:
-            plugin_class = getattr(importlib.import_module(plugin_module), f"{pms_system.name.capitalize()}PMSPlugin")
+            raise ValueError("Плагин не загружен.")
-            self.plugin = plugin_class(self.hotel.api)
+        return self.plugin.fetch_data()
-        except (ImportError, AttributeError) as e:
-            raise ValueError(f"Плагин для PMS '{pms_system.name}' не найден: {e}")
 
-    async def fetch_and_save_data(self):
+    def save_log(self, status, message):
-        """Получение данных от PMS и их сохранение."""
+        from .models import PMSIntegrationLog  # Избегаем кругового импорта
-        raw_data = self.plugin.fetch_data()
+        PMSIntegrationLog.objects.create(
-        parsed_data = self.plugin.parse_data(raw_data)
+            hotel=self.hotel,
-
+            status=status,
-        # Сохраняем данные в БД
+            message=message,
-        for res in parsed_data:
-            await sync_to_async(Reservation.objects.update_or_create)(
-                reservation_id=res["id"],
-                defaults={
-                    "hotel": self.hotel,
-                    "room_number": res["room_number"],
-                    "room_type": res["room_type"],
-                    "check_in": res["check_in"],
-                    "check_out": res["check_out"],
-                    "status": res["status"],
-                    "price": res.get("price"),
-                },
-            )
-
-        # Логируем успех
-        await sync_to_async(PMSIntegrationLog.objects.create)(
-            hotel=self.hotel, status="success", message="Данные успешно обновлены."
         )

pms_integration/migrations/0001_initial.py

@@ -0,0 +1,45 @@
+# 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):
+
+    initial = True
+
+    dependencies = [
+        ('hotels', '0020_alter_userhotel_user'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='PMSConfiguration',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('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='Дата создания')),
+            ],
+            options={
+                'verbose_name': 'PMS система',
+                'verbose_name_plural': 'PMS системы',
+            },
+        ),
+        migrations.CreateModel(
+            name='PMSIntegrationLog',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('checked_at', models.DateTimeField(auto_now_add=True, verbose_name='Время проверки')),
+                ('status', models.CharField(choices=[('success', 'Успех'), ('error', 'Ошибка')], max_length=50, verbose_name='Статус')),
+                ('message', models.TextField(blank=True, null=True, verbose_name='Сообщение')),
+                ('hotel', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='hotels.hotel', verbose_name='Отель')),
+            ],
+            options={
+                'verbose_name': 'Журнал интеграции PMS',
+                'verbose_name_plural': 'Журналы интеграции PMS',
+                'indexes': [models.Index(fields=['hotel'], name='pms_integra_hotel_i_ade4da_idx'), models.Index(fields=['checked_at'], name='pms_integra_checked_938acc_idx'), models.Index(fields=['status'], name='pms_integra_status_358b64_idx')],
+            },
+        ),
+    ]

pms_integration/models.py

@@ -1,3 +1,38 @@
 from django.db import models
 
-# Create your models here.
+
+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 PMSIntegrationLog(models.Model):
+    hotel = models.ForeignKey(
+        'hotels.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']),
+        ]

pms_integration/plugins/base_plugin.py

@@ -1,27 +1,15 @@
-# pms_integration/plugins/base_plugin.py
-
 from abc import ABC, abstractmethod
 
+
 class BasePMSPlugin(ABC):
-    """Базовый класс для всех плагинов PMS интеграции."""
+    def __init__(self, hotel, pms_config):
-
+        self.hotel = hotel
-    def __init__(self, api_config):
+        self.pms_config = pms_config
-        """
-        Конструктор плагина.
-        :param api_config: Конфигурация API (объект модели APIConfiguration).
-        """
-        self.api_config = api_config
 
     @abstractmethod
-    def fetch_data(self):
+    def fetch_and_parse(self):
         """
-        Метод для получения данных от PMS.
+        Этот метод должен быть реализован в каждом плагине.
-        """
+        Он должен получать данные из API и возвращать их в нужном формате.
-        pass
-
-    @abstractmethod
-    def parse_data(self, raw_data):
-        """
-        Метод для обработки сырых данных от PMS.
         """
         pass

pms_integration/plugins/bnovo_pms.py

@@ -1,31 +1,30 @@
-# pms_integration/plugins/example_pms.py
-
 import requests
 from .base_plugin import BasePMSPlugin
 
-class ExamplePMSPlugin(BasePMSPlugin):
-    """Плагин для интеграции с Example PMS."""
 
-    def fetch_data(self):
+class BnovoPMS(BasePMSPlugin):
-        """Получение данных от Example PMS."""
+    def fetch_and_parse(self):
-        url = self.api_config.url
+        response = requests.get(
-        headers = {"Authorization": f"Bearer {self.api_config.token}"}
+            self.pms_config.url,
-        response = requests.get(url, headers=headers, timeout=10)
+            headers={"Authorization": f"Bearer {self.pms_config.token}"}
-        response.raise_for_status()
+        )
-        return response.json()
+        if response.status_code != 200:
+            raise ValueError(f"Ошибка запроса к PMS Bnovo: {response.text}")
 
-    def parse_data(self, raw_data):
+        data = response.json()
-        """Обработка данных от Example PMS."""
+        parsed_data = self.parse_data(data)
-        reservations = raw_data.get("reservations", [])
+        return parsed_data
-        return [
+
-            {
+    def parse_data(self, data):
-                "id": res["id"],
+        # Пример разбора данных на основе JSON-маски
-                "room_number": res["room_number"],
+        reservations = []
-                "room_type": res["room_type"],
+        for item in data["reservations"]:
-                "check_in": res["check_in"],
+            reservation = {
-                "check_out": res["check_out"],
+                "id": item["id"],
-                "status": res["status"],
+                "room_number": item["roomNumber"],
-                "price": res.get("price"),
+                "check_in": item["checkIn"],
+                "check_out": item["checkOut"],
+                "status": item["status"],
             }
-            for res in reservations
+            reservations.append(reservation)
-        ]
+        return reservations

pms_integration/plugins/ecvi_pms.py

@@ -0,0 +1,7 @@
+from .base_plugin import BasePMSPlugin
+
+
+class EcviPMS(BasePMSPlugin):
+    def fetch_and_parse(self):
+        # Реализация логики для ECVI
+        pass