Refactor modules

Author: febus982

di_container.py

@@ -8,7 +8,7 @@
     BookEventGatewayInterface,
     BookRepositoryInterface,
 )
-from domains.books.entities.models import BookModel
+from domains.books.models import BookModel
 from gateways.event import NullEventGateway
 
 

domains/books/_data_access_interfaces.py

@@ -3,8 +3,8 @@
 
 from sqlalchemy_bind_manager.repository import SortDirection
 
-from .entities.cloudevent_base import BaseEvent
-from .entities.models import BookModel
+from domains.books.models import BookModel
+from domains.cloudevent_base import BaseEvent
 
 
 class BookRepositoryInterface(Protocol):

domains/books/entities/__init__.py

@@ -3,7 +3,7 @@
 import pydantic
 from pydantic import ConfigDict
 
-from domains.books.entities.cloudevent_base import (
+from domains.cloudevent_base import (
     BaseEvent,
     dataschema_field,
     type_field,

domains/books/entities/events.py renamed to domains/books/events.py

@@ -3,11 +3,11 @@
 from anyio import to_thread
 from dependency_injector.wiring import Provide, inject
 
-from domains.books.entities.events import BookCreatedV1, BookCreatedV1Data
+from domains.books.events import BookCreatedV1, BookCreatedV1Data
+from domains.books.models import BookModel
 
 from ._data_access_interfaces import BookEventGatewayInterface, BookRepositoryInterface
 from .dto import Book, BookData
-from .entities.models import BookModel
 
 
 class BookService:

domains/books/entities/models.py renamed to domains/books/models.py

@@ -1,6 +1,6 @@
 from structlog import get_logger
 
-from domains.books.entities.cloudevent_base import BaseEvent
+from domains.cloudevent_base import BaseEvent
 
 
 class NullEventGateway:

domains/books/service.py

@@ -1,7 +1,7 @@
 from sqlalchemy import Column, Integer, String, Table
 from sqlalchemy.orm import registry
 
-from domains.books.entities.models import BookModel
+from domains.books.models import BookModel
 
 
 def init_tables(registry_mapper: registry):

domains/books/entities/cloudevent_base.py renamed to domains/cloudevent_base.py

@@ -4,7 +4,7 @@
 from fastapi import APIRouter, Body, Header, HTTPException
 from pydantic import BaseModel
 
-from domains.books.entities.events import BookCreatedV1
+from domains.books.events import BookCreatedV1
 
 router = APIRouter(prefix="/events")