🚀 [refactoring]: flatten structure of project `glQiwiApi/core/event_f…

…etching` -> `glQiwiApi/event_fetching`

.gitignore

@@ -145,3 +145,4 @@ docker_test/*
 docker_test
 
 .ruff_cache/*
+playground.py

glQiwiApi/core/__init__.py

@@ -1,37 +0,0 @@
-from glQiwiApi.utils.synchronous import async_as_sync, execute_async_as_sync
-
-from .abc.base_api_client import BaseAPIClient
-from .event_fetching.class_based import (
-    AbstractBillHandler,
-    AbstractTransactionHandler,
-    AbstractTransactionWebhookHandler,
-    ErrorHandler,
-    Handler,
-)
-from .event_fetching.filters import BaseFilter, LambdaBasedFilter
-from .event_fetching.webhooks import (
-    BaseWebhookView,
-    QiwiBillWebhookView,
-    QiwiTransactionWebhookView,
-    app,
-)
-from .request_service import RequestService
-
-__all__ = (
-    'RequestService',
-    'BaseFilter',
-    'LambdaBasedFilter',
-    # class-based handlers
-    'Handler',
-    'AbstractBillHandler',
-    'AbstractTransactionHandler',
-    'AbstractTransactionWebhookHandler',
-    'ErrorHandler',
-    # synchronous adapters and utils
-    'async_as_sync',
-    'execute_async_as_sync',
-    # webhooks
-    'QiwiBillWebhookView',
-    'QiwiTransactionWebhookView',
-    'BaseWebhookView',
-)

glQiwiApi/core/event_fetching/dispatcher.py → glQiwiApi/event_fetching/dispatcher.py

@@ -20,11 +20,11 @@
     cast,
 )
 
+from glQiwiApi.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
 
-from ...qiwi.clients.wallet.types.transaction import Transaction
-from ...qiwi.clients.wallet.types.webhooks import TransactionWebhook
-from .. import Handler
 from .filters import BaseFilter, LambdaBasedFilter
 
 logger = logging.getLogger('glQiwiApi.dispatcher')

glQiwiApi/core/event_fetching/executor.py → glQiwiApi/event_fetching/executor.py

@@ -20,9 +20,9 @@
 from aiohttp.web import _run_app  # noqa
 
 from glQiwiApi import QiwiWrapper
-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.event_fetching.dispatcher import BaseDispatcher
+from glQiwiApi.event_fetching.webhooks.app import configure_app
+from glQiwiApi.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

glQiwiApi/core/event_fetching/webhooks/app.py → glQiwiApi/event_fetching/webhooks/app.py

@@ -2,18 +2,16 @@
 
 from aiohttp import web
 
-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 (
+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 (
     HashBasedCollisionDetector,
 )
-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.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.qiwi.clients.p2p.types import BillWebhook
 from glQiwiApi.qiwi.clients.wallet.types.webhooks import TransactionWebhook
 

glQiwiApi/core/event_fetching/webhooks/middlewares/ip.py → glQiwiApi/event_fetching/webhooks/middlewares/ip.py

@@ -5,8 +5,8 @@
 from aiohttp.typedefs import Handler
 from aiohttp.web_middlewares import middleware
 
-from glQiwiApi.core.event_fetching.webhooks.services.security.ip import IPFilter
-from glQiwiApi.core.event_fetching.webhooks.utils import check_ip
+from glQiwiApi.event_fetching.webhooks.services.security.ip import IPFilter
+from glQiwiApi.event_fetching.webhooks.utils import check_ip
 
 logger = logging.getLogger('glQiwiApi.webhooks.middlewares')
 

glQiwiApi/core/event_fetching/webhooks/utils.py → glQiwiApi/event_fetching/webhooks/utils.py

@@ -8,7 +8,7 @@
 from aiohttp.abc import AbstractView
 from aiohttp.web_request import Request
 
-from glQiwiApi.core.event_fetching.webhooks.services.security.ip import IPFilter
+from glQiwiApi.event_fetching.webhooks.services.security.ip import IPFilter
 
 
 def check_ip(ip_filter: IPFilter, request: web.Request) -> Tuple[str, bool]:

glQiwiApi/core/event_fetching/webhooks/views/base.py → glQiwiApi/event_fetching/webhooks/views/base.py

@@ -6,9 +6,9 @@
 from aiohttp import web
 from aiohttp.web_request import Request
 
-from glQiwiApi.core.event_fetching.dispatcher import BaseDispatcher
-from glQiwiApi.core.event_fetching.webhooks.dto.errors import WebhookAPIError
-from glQiwiApi.core.event_fetching.webhooks.services.collision_detector import (
+from glQiwiApi.event_fetching.dispatcher import BaseDispatcher
+from glQiwiApi.event_fetching.webhooks.dto import WebhookAPIError
+from glQiwiApi.event_fetching.webhooks.services.collision_detector import (
     AbstractCollisionDetector,
     UnexpectedCollision,
 )

glQiwiApi/core/event_fetching/webhooks/views/bill_view.py → glQiwiApi/event_fetching/webhooks/views/bill_view.py

@@ -3,7 +3,7 @@
 
 from aiohttp import web
 
-from glQiwiApi.core.event_fetching.webhooks.views.base import BaseWebhookView
+from glQiwiApi.event_fetching.webhooks.views.base import BaseWebhookView
 from glQiwiApi.qiwi.clients.p2p.types import BillWebhook
 from glQiwiApi.types.exceptions import WebhookSignatureUnverifiedError
 

glQiwiApi/core/event_fetching/webhooks/views/transaction_view.py → glQiwiApi/event_fetching/webhooks/views/transaction_view.py

@@ -2,8 +2,8 @@
 
 from aiohttp import web
 
-from glQiwiApi.core.event_fetching.webhooks.dto.errors import WebhookAPIError
-from glQiwiApi.core.event_fetching.webhooks.views.base import BaseWebhookView
+from glQiwiApi.event_fetching.webhooks.dto import WebhookAPIError
+from glQiwiApi.event_fetching.webhooks.views.base import BaseWebhookView
 from glQiwiApi.qiwi.clients.wallet.types.webhooks import TransactionWebhook
 from glQiwiApi.types.exceptions import WebhookSignatureUnverifiedError
 

tests/unit/test_event_fetching/test_webhook/test_app.py

@@ -4,11 +4,11 @@
 from aiohttp.web_app import Application
 from aiohttp.web_request import Request
 
-from glQiwiApi.core.event_fetching.dispatcher import 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 glQiwiApi.core.event_fetching.webhooks.services.security.ip import IPFilter
+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 tests.unit.test_event_fetching.mocks import WebhookTestData
 
 

tests/unit/test_event_fetching/test_webhook/test_services/test_collision_detector.py

@@ -2,7 +2,7 @@
 
 import pytest
 
-from glQiwiApi.core.event_fetching.webhooks.services.collision_detector import (
+from glQiwiApi.event_fetching.webhooks.services.collision_detector import (
     HashBasedCollisionDetector,
     UnexpectedCollision,
     UnhashableObjectError,

tests/unit/test_event_fetching/test_webhook/test_views/test_p2p_view.py

@@ -7,11 +7,11 @@
 from aiohttp.web_app import Application
 
 from glQiwiApi.core import QiwiBillWebhookView
-from glQiwiApi.core.event_fetching.dispatcher import QiwiDispatcher
-from glQiwiApi.core.event_fetching.webhooks.services.collision_detector import (
+from glQiwiApi.event_fetching.dispatcher import QiwiDispatcher
+from glQiwiApi.event_fetching.webhooks.services.collision_detector import (
     HashBasedCollisionDetector,
 )
-from glQiwiApi.core.event_fetching.webhooks.utils import inject_dependencies
+from glQiwiApi.event_fetching.webhooks.utils import inject_dependencies
 from glQiwiApi.qiwi.clients.p2p.types import BillWebhook
 from tests.unit.test_event_fetching.mocks import WebhookTestData
 

tests/unit/test_event_fetching/test_webhook/test_views/test_txn_view.py

@@ -10,11 +10,11 @@
 
 from glQiwiApi.core import QiwiTransactionWebhookView
 from glQiwiApi.core.event_fetching.dispatcher import QiwiDispatcher
-from glQiwiApi.core.event_fetching.webhooks.dto.errors import WebhookAPIError
-from glQiwiApi.core.event_fetching.webhooks.services.collision_detector import (
+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.core.event_fetching.webhooks.utils import inject_dependencies
 from glQiwiApi.qiwi.clients.wallet.types import TransactionWebhook
 from tests.unit.test_event_fetching.mocks import WebhookTestData