From 808805808353102774efd4cce08b3d26fc30fd28 Mon Sep 17 00:00:00 2001
From: grucshetskyaleksei <grucshetsky.aleksei@yandex.ru>
Date: Tue, 3 Oct 2023 16:09:23 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D1=91=D1=81=20?=
 =?UTF-8?q?=D1=81=D1=85=D0=B5=D0=BC=D1=8B=20=D0=B2=20=D0=BC=D0=BE=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/fastapi_app/lib/api/schemas/__init__.py                | 6 ------
 src/fastapi_app/lib/db/brokers/base_broker.py              | 5 ++---
 src/fastapi_app/lib/db/brokers/broker.py                   | 5 ++---
 src/fastapi_app/lib/db/brokers/rabbitmq.py                 | 5 +++--
 src/fastapi_app/lib/models/__init__.py                     | 7 ++++++-
 .../lib/{api/schemas => models}/broker_message.py          | 0
 6 files changed, 13 insertions(+), 15 deletions(-)
 rename src/fastapi_app/lib/{api/schemas => models}/broker_message.py (100%)

diff --git a/src/fastapi_app/lib/api/schemas/__init__.py b/src/fastapi_app/lib/api/schemas/__init__.py
index 11afe47..e69de29 100644
--- a/src/fastapi_app/lib/api/schemas/__init__.py
+++ b/src/fastapi_app/lib/api/schemas/__init__.py
@@ -1,6 +0,0 @@
-from .broker_message import *
-
-__all__ = [
-    "BrokerMessagePayload",
-    "BrokerMessage",
-]
diff --git a/src/fastapi_app/lib/db/brokers/base_broker.py b/src/fastapi_app/lib/db/brokers/base_broker.py
index bf1a503..eefac02 100644
--- a/src/fastapi_app/lib/db/brokers/base_broker.py
+++ b/src/fastapi_app/lib/db/brokers/base_broker.py
@@ -1,8 +1,7 @@
 import abc
-import contextlib
 import typing
 
-import lib.api.schemas as api_schemas
+import lib.models.broker_message as lib_models_broker_message
 
 T = typing.TypeVar("T", bound="BasePublisher")
 
@@ -17,5 +16,5 @@ class BasePublisher(abc.ABC):
         pass
 
     @abc.abstractmethod
-    async def publish_message(self, message_body: api_schemas.broker_message.BrokerMessage, routing_key: str) -> None:
+    async def publish_message(self, message_body: lib_models_broker_message.BrokerMessage, routing_key: str) -> None:
         pass
diff --git a/src/fastapi_app/lib/db/brokers/broker.py b/src/fastapi_app/lib/db/brokers/broker.py
index 68f8d39..2fc7b94 100644
--- a/src/fastapi_app/lib/db/brokers/broker.py
+++ b/src/fastapi_app/lib/db/brokers/broker.py
@@ -1,7 +1,6 @@
-import contextlib
 import typing
 
-import lib.api.schemas as api_schemas
+import lib.models.broker_message as lib_models_broker_message
 
 
 class BrokerPublisher:
@@ -14,5 +13,5 @@ class BrokerPublisher:
     async def dispose(self):
         await self.broker.dispose()
 
-    async def publish_message(self, message_body: api_schemas.BrokerMessage, routing_key: str):
+    async def publish_message(self, message_body: lib_models_broker_message.BrokerMessage, routing_key: str):
         await self.broker.publish_message(message_body, routing_key)
diff --git a/src/fastapi_app/lib/db/brokers/rabbitmq.py b/src/fastapi_app/lib/db/brokers/rabbitmq.py
index 251b476..ef3b39a 100644
--- a/src/fastapi_app/lib/db/brokers/rabbitmq.py
+++ b/src/fastapi_app/lib/db/brokers/rabbitmq.py
@@ -5,9 +5,9 @@ import logging
 
 import aio_pika
 
-import lib.api.schemas as api_schemas
 import lib.app.split_settings as app_split_settings
 import lib.db.brokers as db_brokers
+import lib.models.broker_message as models_broker_message
 
 
 class RabbitMQPublisher(db_brokers.base_broker.BasePublisher):
@@ -33,6 +33,7 @@ class RabbitMQPublisher(db_brokers.base_broker.BasePublisher):
     async def dispose(self):
         try:
             while not self.pool.empty():
+                print("Closing channel")
                 channel = await self.pool.get()
                 await channel.close()
 
@@ -57,7 +58,7 @@ class RabbitMQPublisher(db_brokers.base_broker.BasePublisher):
         finally:
             await self.pool.put(channel)
 
-    async def publish_message(self, message_body: api_schemas.BrokerMessage, routing_key: str):
+    async def publish_message(self, message_body: models_broker_message.BrokerMessage, routing_key: str):
         try:
             async with self.__get_channel() as channel:
                 message = aio_pika.Message(content_type="application/json", body=json.dumps(message_body).encode())
diff --git a/src/fastapi_app/lib/models/__init__.py b/src/fastapi_app/lib/models/__init__.py
index 130e2e2..1e53d0e 100644
--- a/src/fastapi_app/lib/models/__init__.py
+++ b/src/fastapi_app/lib/models/__init__.py
@@ -1,3 +1,8 @@
 from .base_sqlalchemy import Base
+from .broker_message import *
 
-__all__ = ["Base"]
+__all__ = [
+    "Base",
+    "BrokerMessagePayload",
+    "BrokerMessage",
+]
diff --git a/src/fastapi_app/lib/api/schemas/broker_message.py b/src/fastapi_app/lib/models/broker_message.py
similarity index 100%
rename from src/fastapi_app/lib/api/schemas/broker_message.py
rename to src/fastapi_app/lib/models/broker_message.py