get all tests passing

hjwp · hjwp · commit db8921818a5a · 2021-02-24T10:04:07.000Z
diff --git a/Dockerfile b/Dockerfile
@@ -6,5 +6,5 @@ RUN pip install -r /tmp/requirements.txt
 RUN mkdir -p /code
 COPY *.py /code/
 WORKDIR /code
-ENV FLASK_APP=flask_app.py FLASK_DEBUG=1 PYTHONUNBUFFERED=1
+ENV FLASK_APP=entrypoints/flask_app.py FLASK_DEBUG=1 PYTHONUNBUFFERED=1
 CMD flask run --host=0.0.0.0 --port=80
diff --git a/adapters/__init__.py b/adapters/__init__.py
diff --git a/adapters/orm.py b/adapters/orm.py
@@ -1,7 +1,7 @@
 from sqlalchemy import Table, MetaData, Column, Integer, String, Date, ForeignKey
 from sqlalchemy.orm import mapper, relationship
 
-import model
+from domain import model
 
 
 metadata = MetaData()
diff --git a/adapters/repository.py b/adapters/repository.py
@@ -1,5 +1,5 @@
 import abc
-import model
+from domain import model
 
 
 class AbstractRepository(abc.ABC):
diff --git a/domain/__init__.py b/domain/__init__.py
diff --git a/entrypoints/__init__.py b/entrypoints/__init__.py
diff --git a/entrypoints/flask_app.py b/entrypoints/flask_app.py
@@ -3,10 +3,9 @@
 from sqlalchemy.orm import sessionmaker
 
 import config
-import model
-import orm
-import repository
-import services
+from domain import model
+from adapters import orm, repository
+from service_layer import services
 
 
 orm.start_mappers()
diff --git a/service_layer/__init__.py b/service_layer/__init__.py
diff --git a/service_layer/services.py b/service_layer/services.py
@@ -1,8 +1,8 @@
 from __future__ import annotations
 
-import model
-from model import OrderLine
-from repository import AbstractRepository
+from domain import model
+from domain.model import OrderLine
+from adapters.repository import AbstractRepository
 
 
 class InvalidSku(Exception):
diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -9,7 +9,7 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker, clear_mappers
 
-from orm import metadata, start_mappers
+from adapters.orm import metadata, start_mappers
 import config
 
 
@@ -102,6 +102,6 @@ def _add_stock(lines):
 
 @pytest.fixture
 def restart_api():
-    (Path(__file__).parent / "flask_app.py").touch()
+    (Path(__file__).parent / "../entrypoints/flask_app.py").touch()
     time.sleep(0.5)
     wait_for_webapp_to_come_up()
diff --git a/tests/integration/test_orm.py b/tests/integration/test_orm.py
@@ -1,4 +1,4 @@
-import model
+from domain import model
 from datetime import date
 
 
diff --git a/tests/integration/test_repository.py b/tests/integration/test_repository.py
@@ -1,6 +1,6 @@
 # pylint: disable=protected-access
-import model
-import repository
+from domain import model
+from adapters import repository
 
 
 def test_repository_can_save_a_batch(session):
diff --git a/tests/unit/test_allocate.py b/tests/unit/test_allocate.py
@@ -1,6 +1,6 @@
 from datetime import date, timedelta
 import pytest
-from model import allocate, OrderLine, Batch, OutOfStock
+from domain.model import allocate, OrderLine, Batch, OutOfStock
 
 today = date.today()
 tomorrow = today + timedelta(days=1)
diff --git a/tests/unit/test_batches.py b/tests/unit/test_batches.py
@@ -1,5 +1,5 @@
 from datetime import date
-from model import Batch, OrderLine
+from domain.model import Batch, OrderLine
 
 
 def test_allocating_to_a_batch_reduces_the_available_quantity():
diff --git a/tests/unit/test_services.py b/tests/unit/test_services.py
@@ -1,7 +1,7 @@
 import pytest
-import model
-import repository
-import services
+from domain import model
+from adapters import repository
+from service_layer import services
 
 
 class FakeRepository(repository.AbstractRepository):
