add service_layer

hjwp · hjwp · commit 26b0dd173513 · 2019-11-26T22:13:34.000Z
diff --git a/src/allocation/entrypoints/flask_app.py b/src/allocation/entrypoints/flask_app.py
@@ -1,7 +1,7 @@
 from datetime import datetime
 from flask import Flask, jsonify, request
 from allocation.domain import commands
-from allocation import exceptions, messagebus, unit_of_work
+from allocation.service_layer import exceptions, messagebus, unit_of_work
 from allocation.adapters import orm
 
 app = Flask(__name__)
diff --git a/src/allocation/entrypoints/redis_eventconsumer.py b/src/allocation/entrypoints/redis_eventconsumer.py
@@ -1,8 +1,8 @@
 import json
 import logging
-from allocation.domain import commands
-from allocation import messagebus, unit_of_work
 from allocation.adapters import orm, redis_pubsub
+from allocation.domain import commands
+from allocation.service_layer import messagebus, unit_of_work
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/allocation/service_layer/__init__.py b/src/allocation/service_layer/__init__.py
diff --git a/src/allocation/service_layer/exceptions.py b/src/allocation/service_layer/exceptions.py
diff --git a/src/allocation/service_layer/handlers.py b/src/allocation/service_layer/handlers.py
@@ -1,11 +1,11 @@
 from __future__ import annotations
 from typing import TYPE_CHECKING
-from allocation import exceptions
 from allocation.domain import commands, events, model
 from allocation.adapters import email, redis_pubsub
+from allocation.service_layer import exceptions
 
 if TYPE_CHECKING:
-    from allocation import unit_of_work
+    from allocation.service_layer import unit_of_work
 
 
 def add_batch(
diff --git a/src/allocation/service_layer/messagebus.py b/src/allocation/service_layer/messagebus.py
@@ -2,7 +2,7 @@
 import traceback
 from typing import List, Dict, Callable, Type, Union, TYPE_CHECKING
 from allocation.domain import commands, events
-from allocation import handlers
+from . import handlers
 
 if TYPE_CHECKING:
     from allocation import unit_of_work
diff --git a/src/allocation/service_layer/unit_of_work.py b/src/allocation/service_layer/unit_of_work.py
@@ -5,8 +5,9 @@
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm.session import Session
 
-from allocation import config, messagebus
+from allocation import config
 from allocation.adapters import repository
+from . import messagebus
 
 
 
diff --git a/tests/integration/test_uow.py b/tests/integration/test_uow.py
@@ -5,7 +5,7 @@
 from typing import List
 import pytest
 from allocation.domain import model
-from allocation import unit_of_work
+from allocation.service_layer import unit_of_work
 from ..random_refs import random_sku, random_batchref, random_orderid
 
 def insert_batch(session, ref, sku, qty, eta, product_version=1):
diff --git a/tests/unit/test_handlers.py b/tests/unit/test_handlers.py
@@ -1,9 +1,9 @@
 from datetime import date
 from unittest import mock
 import pytest
-from allocation import exceptions, messagebus, unit_of_work
-from allocation.domain import commands
 from allocation.adapters import repository
+from allocation.domain import commands
+from allocation.service_layer import exceptions, messagebus, unit_of_work
 
 
 class FakeRepository(repository.AbstractRepository):
