[refactoring]: event_fetching -> core/event_fetching

GLEF1X · Sep 9, 2023 · 3414f3b · 3414f3b
1 parent f30db4c
commit 3414f3b
Show file tree

Hide file tree

Showing 30 changed files with 32 additions and 36 deletions.
diff --git a/glQiwiApi/event_fetching/__init__.py → glQiwiApi/core/event_fetching/__init__.py b/glQiwiApi/event_fetching/__init__.py → glQiwiApi/core/event_fetching/__init__.py
diff --git a/...pi/event_fetching/class_based/__init__.py → ...re/event_fetching/class_based/__init__.py b/...pi/event_fetching/class_based/__init__.py → ...re/event_fetching/class_based/__init__.py
diff --git a/glQiwiApi/event_fetching/class_based/base.py → ...i/core/event_fetching/class_based/base.py b/glQiwiApi/event_fetching/class_based/base.py → ...i/core/event_fetching/class_based/base.py
diff --git a/glQiwiApi/event_fetching/class_based/bill.py → ...i/core/event_fetching/class_based/bill.py b/glQiwiApi/event_fetching/class_based/bill.py → ...i/core/event_fetching/class_based/bill.py
diff --git a/...wiApi/event_fetching/class_based/error.py → .../core/event_fetching/class_based/error.py b/...wiApi/event_fetching/class_based/error.py → .../core/event_fetching/class_based/error.py
diff --git a/...event_fetching/class_based/transaction.py → ...event_fetching/class_based/transaction.py b/...event_fetching/class_based/transaction.py → ...event_fetching/class_based/transaction.py
diff --git a/...tching/class_based/webhook_transaction.py → ...tching/class_based/webhook_transaction.py b/...tching/class_based/webhook_transaction.py → ...tching/class_based/webhook_transaction.py
diff --git a/glQiwiApi/event_fetching/dispatcher.py → glQiwiApi/core/event_fetching/dispatcher.py b/glQiwiApi/event_fetching/dispatcher.py → glQiwiApi/core/event_fetching/dispatcher.py
@@ -20,7 +20,7 @@
     cast,
 )
 
-from glQiwiApi.event_fetching.class_based.base import Handler
+from glQiwiApi.core.event_fetching.class_based.base import Handler
 from glQiwiApi.qiwi.clients.p2p.types import BillWebhook
 from glQiwiApi.qiwi.clients.wallet.types.transaction import Transaction
 from glQiwiApi.qiwi.clients.wallet.types.webhooks import TransactionWebhook

diff --git a/glQiwiApi/event_fetching/executor.py → glQiwiApi/core/event_fetching/executor.py b/glQiwiApi/event_fetching/executor.py → glQiwiApi/core/event_fetching/executor.py
@@ -20,9 +20,9 @@
 from aiohttp.web import _run_app  # noqa
 
 from glQiwiApi import QiwiWrapper
-from glQiwiApi.event_fetching.dispatcher import BaseDispatcher
-from glQiwiApi.event_fetching.webhooks.app import configure_app
-from glQiwiApi.event_fetching.webhooks.config import WebhookConfig
+from glQiwiApi.core.event_fetching.dispatcher import BaseDispatcher
+from glQiwiApi.core.event_fetching.webhooks.app import configure_app
+from glQiwiApi.core.event_fetching.webhooks.config import WebhookConfig
 from glQiwiApi.ext.webhook_url import WebhookURL
 from glQiwiApi.qiwi.clients.wallet.client import QiwiWallet
 from glQiwiApi.qiwi.clients.wallet.methods.history import MAX_HISTORY_LIMIT

diff --git a/glQiwiApi/event_fetching/filters.py → glQiwiApi/core/event_fetching/filters.py b/glQiwiApi/event_fetching/filters.py → glQiwiApi/core/event_fetching/filters.py
diff --git a/...wiApi/event_fetching/webhooks/__init__.py → .../core/event_fetching/webhooks/__init__.py b/...wiApi/event_fetching/webhooks/__init__.py → .../core/event_fetching/webhooks/__init__.py
diff --git a/glQiwiApi/event_fetching/webhooks/app.py → ...wiApi/core/event_fetching/webhooks/app.py b/glQiwiApi/event_fetching/webhooks/app.py → ...wiApi/core/event_fetching/webhooks/app.py
@@ -2,16 +2,18 @@
 
 from aiohttp import web
 
-from glQiwiApi.event_fetching.dispatcher import BaseDispatcher
-from glQiwiApi.event_fetching.webhooks.config import WebhookConfig
-from glQiwiApi.event_fetching.webhooks.middlewares.ip import ip_filter_middleware
-from glQiwiApi.event_fetching.webhooks.services.collision_detector import (
+from glQiwiApi.core.event_fetching.dispatcher import BaseDispatcher
+from glQiwiApi.core.event_fetching.webhooks.config import WebhookConfig
+from glQiwiApi.core.event_fetching.webhooks.middlewares.ip import ip_filter_middleware
+from glQiwiApi.core.event_fetching.webhooks.services.collision_detector import (
     HashBasedCollisionDetector,
 )
-from glQiwiApi.event_fetching.webhooks.services.security.ip import IPFilter
-from glQiwiApi.event_fetching.webhooks.utils import inject_dependencies
-from glQiwiApi.event_fetching.webhooks.views.bill_view import QiwiBillWebhookView
-from glQiwiApi.event_fetching.webhooks.views.transaction_view import QiwiTransactionWebhookView
+from glQiwiApi.core.event_fetching.webhooks.services.security.ip import IPFilter
+from glQiwiApi.core.event_fetching.webhooks.utils import inject_dependencies
+from glQiwiApi.core.event_fetching.webhooks.views.bill_view import QiwiBillWebhookView
+from glQiwiApi.core.event_fetching.webhooks.views.transaction_view import (
+    QiwiTransactionWebhookView,
+)
 from glQiwiApi.qiwi.clients.p2p.types import BillWebhook
 from glQiwiApi.qiwi.clients.wallet.types.webhooks import TransactionWebhook
 

diff --git a/glQiwiApi/event_fetching/webhooks/config.py → ...pi/core/event_fetching/webhooks/config.py b/glQiwiApi/event_fetching/webhooks/config.py → ...pi/core/event_fetching/webhooks/config.py
diff --git a/...i/event_fetching/webhooks/dto/__init__.py → ...e/event_fetching/webhooks/dto/__init__.py b/...i/event_fetching/webhooks/dto/__init__.py → ...e/event_fetching/webhooks/dto/__init__.py
diff --git a/...Api/event_fetching/webhooks/dto/errors.py → ...ore/event_fetching/webhooks/dto/errors.py b/...Api/event_fetching/webhooks/dto/errors.py → ...ore/event_fetching/webhooks/dto/errors.py
diff --git a/...fetching/webhooks/middlewares/__init__.py → ...fetching/webhooks/middlewares/__init__.py b/...fetching/webhooks/middlewares/__init__.py → ...fetching/webhooks/middlewares/__init__.py
diff --git a/...event_fetching/webhooks/middlewares/ip.py → ...event_fetching/webhooks/middlewares/ip.py b/...event_fetching/webhooks/middlewares/ip.py → ...event_fetching/webhooks/middlewares/ip.py
@@ -5,8 +5,8 @@
 from aiohttp.typedefs import Handler
 from aiohttp.web_middlewares import middleware
 
-from glQiwiApi.event_fetching.webhooks.services.security.ip import IPFilter
-from glQiwiApi.event_fetching.webhooks.utils import check_ip
+from glQiwiApi.core.event_fetching.webhooks.services.security.ip import IPFilter
+from glQiwiApi.core.event_fetching.webhooks.utils import check_ip
 
 logger = logging.getLogger('glQiwiApi.webhooks.middlewares')
 

diff --git a/...nt_fetching/webhooks/services/__init__.py → ...nt_fetching/webhooks/services/__init__.py b/...nt_fetching/webhooks/services/__init__.py → ...nt_fetching/webhooks/services/__init__.py
diff --git a/...g/webhooks/services/collision_detector.py → ...g/webhooks/services/collision_detector.py b/...g/webhooks/services/collision_detector.py → ...g/webhooks/services/collision_detector.py
diff --git a/...ng/webhooks/services/security/__init__.py → ...ng/webhooks/services/security/__init__.py b/...ng/webhooks/services/security/__init__.py → ...ng/webhooks/services/security/__init__.py
diff --git a/...fetching/webhooks/services/security/ip.py → ...fetching/webhooks/services/security/ip.py b/...fetching/webhooks/services/security/ip.py → ...fetching/webhooks/services/security/ip.py
diff --git a/glQiwiApi/event_fetching/webhooks/utils.py → ...Api/core/event_fetching/webhooks/utils.py b/glQiwiApi/event_fetching/webhooks/utils.py → ...Api/core/event_fetching/webhooks/utils.py
@@ -8,7 +8,7 @@
 from aiohttp.abc import AbstractView
 from aiohttp.web_request import Request
 
-from glQiwiApi.event_fetching.webhooks.services.security.ip import IPFilter
+from glQiwiApi.core.event_fetching.webhooks.services.security.ip import IPFilter
 
 
 def check_ip(ip_filter: IPFilter, request: web.Request) -> Tuple[str, bool]:

diff --git a/...event_fetching/webhooks/views/__init__.py → ...event_fetching/webhooks/views/__init__.py b/...event_fetching/webhooks/views/__init__.py → ...event_fetching/webhooks/views/__init__.py
diff --git a/...Api/event_fetching/webhooks/views/base.py → ...ore/event_fetching/webhooks/views/base.py b/...Api/event_fetching/webhooks/views/base.py → ...ore/event_fetching/webhooks/views/base.py
@@ -6,9 +6,9 @@
 from aiohttp import web
 from aiohttp.web_request import Request
 
-from glQiwiApi.event_fetching.dispatcher import BaseDispatcher
-from glQiwiApi.event_fetching.webhooks.dto import WebhookAPIError
-from glQiwiApi.event_fetching.webhooks.services.collision_detector import (
+from glQiwiApi.core.event_fetching.dispatcher import BaseDispatcher
+from glQiwiApi.core.event_fetching.webhooks.dto import WebhookAPIError
+from glQiwiApi.core.event_fetching.webhooks.services.collision_detector import (
     AbstractCollisionDetector,
     UnexpectedCollision,
 )

diff --git a/...vent_fetching/webhooks/views/bill_view.py → ...vent_fetching/webhooks/views/bill_view.py b/...vent_fetching/webhooks/views/bill_view.py → ...vent_fetching/webhooks/views/bill_view.py
@@ -3,7 +3,7 @@
 
 from aiohttp import web
 
-from glQiwiApi.event_fetching.webhooks.views.base import BaseWebhookView
+from glQiwiApi.core.event_fetching.webhooks.views.base import BaseWebhookView
 from glQiwiApi.qiwi.clients.p2p.types import BillWebhook
 from glQiwiApi.types.exceptions import WebhookSignatureUnverifiedError
 

diff --git a/...tching/webhooks/views/transaction_view.py → ...tching/webhooks/views/transaction_view.py b/...tching/webhooks/views/transaction_view.py → ...tching/webhooks/views/transaction_view.py
@@ -2,8 +2,8 @@
 
 from aiohttp import web
 
-from glQiwiApi.event_fetching.webhooks.dto import WebhookAPIError
-from glQiwiApi.event_fetching.webhooks.views.base import BaseWebhookView
+from glQiwiApi.core.event_fetching.webhooks.dto import WebhookAPIError
+from glQiwiApi.core.event_fetching.webhooks.views.base import BaseWebhookView
 from glQiwiApi.qiwi.clients.wallet.types.webhooks import TransactionWebhook
 from glQiwiApi.types.exceptions import WebhookSignatureUnverifiedError
 

diff --git a/tests/unit/test_event_fetching/test_webhook/test_app.py b/tests/unit/test_event_fetching/test_webhook/test_app.py
@@ -4,11 +4,10 @@
 from aiohttp.web_app import Application
 from aiohttp.web_request import Request
 
-from glQiwiApi.event_fetching.dispatcher import QiwiDispatcher
-from glQiwiApi.event_fetching.webhooks.app import configure_app
-from glQiwiApi.event_fetching.webhooks.config import EncryptionConfig, WebhookConfig
-from glQiwiApi.event_fetching.webhooks.middlewares.ip import ip_filter_middleware
-from glQiwiApi.event_fetching.webhooks.services.security.ip import IPFilter
+from glQiwiApi.core.event_fetching import IPFilter, QiwiDispatcher
+from glQiwiApi.core.event_fetching.webhooks.app import configure_app
+from glQiwiApi.core.event_fetching.webhooks.config import EncryptionConfig, WebhookConfig
+from glQiwiApi.core.event_fetching.webhooks.middlewares.ip import ip_filter_middleware
 from tests.unit.test_event_fetching.mocks import WebhookTestData
 
 

diff --git a/tests/unit/test_event_fetching/test_webhook/test_services/test_collision_detector.py b/tests/unit/test_event_fetching/test_webhook/test_services/test_collision_detector.py
@@ -2,7 +2,7 @@
 
 import pytest
 
-from glQiwiApi.event_fetching.webhooks.services.collision_detector import (
+from glQiwiApi.core.event_fetching import (
     HashBasedCollisionDetector,
     UnexpectedCollision,
     UnhashableObjectError,

diff --git a/tests/unit/test_event_fetching/test_webhook/test_views/test_p2p_view.py b/tests/unit/test_event_fetching/test_webhook/test_views/test_p2p_view.py
@@ -7,11 +7,8 @@
 from aiohttp.web_app import Application
 
 from glQiwiApi.core import QiwiBillWebhookView
-from glQiwiApi.event_fetching.dispatcher import QiwiDispatcher
-from glQiwiApi.event_fetching.webhooks.services.collision_detector import (
-    HashBasedCollisionDetector,
-)
-from glQiwiApi.event_fetching.webhooks.utils import inject_dependencies
+from glQiwiApi.core.event_fetching import HashBasedCollisionDetector, QiwiDispatcher
+from glQiwiApi.core.event_fetching.webhooks.utils import inject_dependencies
 from glQiwiApi.qiwi.clients.p2p.types import BillWebhook
 from tests.unit.test_event_fetching.mocks import WebhookTestData
 

diff --git a/tests/unit/test_event_fetching/test_webhook/test_views/test_txn_view.py b/tests/unit/test_event_fetching/test_webhook/test_views/test_txn_view.py
@@ -9,12 +9,10 @@
 from aiohttp.web_app import Application
 
 from glQiwiApi.core import QiwiTransactionWebhookView
+from glQiwiApi.core.event_fetching import HashBasedCollisionDetector
 from glQiwiApi.core.event_fetching.dispatcher import QiwiDispatcher
+from glQiwiApi.core.event_fetching.webhooks.dto import WebhookAPIError
 from glQiwiApi.core.event_fetching.webhooks.utils import inject_dependencies
-from glQiwiApi.event_fetching.webhooks.dto import WebhookAPIError
-from glQiwiApi.event_fetching.webhooks.services.collision_detector import (
-    HashBasedCollisionDetector,
-)
 from glQiwiApi.qiwi.clients.wallet.types import TransactionWebhook
 from tests.unit.test_event_fetching.mocks import WebhookTestData