fix all the imports, get it all working

Author: hjwp

docker-compose.yml

@@ -11,7 +11,7 @@ services:
       - DB_HOST=postgres
       - DB_PASSWORD=abc123
     volumes:
-      - ./:/code
+      - ./src:/src
     ports:
       - "5005:80"
 

mypy.ini

@@ -1,9 +1,6 @@
 [mypy]
 ignore_missing_imports = False
+mypy_path = ./src
 
-[mypy-pytest.*]
+[mypy-pytest.*,sqlalchemy.*]
 ignore_missing_imports = True
-
-[mypy-sqlalchemy.*]
-ignore_missing_imports = True
-

src/allocation/adapters/orm.py

@@ -1,7 +1,7 @@
 from sqlalchemy import Table, MetaData, Column, Integer, String, Date, ForeignKey
 from sqlalchemy.orm import mapper, relationship
 
-from domain import model
+from allocation.domain import model
 
 
 metadata = MetaData()

src/allocation/adapters/repository.py

@@ -1,5 +1,5 @@
 import abc
-from domain import model
+from allocation.domain import model
 
 
 class AbstractRepository(abc.ABC):

src/allocation/entrypoints/flask_app.py

@@ -3,10 +3,10 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
 
-import config
-from domain import model
-from adapters import orm, repository
-from service_layer import services
+from allocation import config
+from allocation.domain import model
+from allocation.adapters import orm, repository
+from allocation.service_layer import services
 
 orm.start_mappers()
 get_session = sessionmaker(bind=create_engine(config.get_postgres_uri()))

src/allocation/service_layer/services.py

@@ -2,9 +2,9 @@
 from typing import Optional
 from datetime import date
 
-from domain import model
-from domain.model import OrderLine
-from adapters.repository import AbstractRepository
+from allocation.domain import model
+from allocation.domain.model import OrderLine
+from allocation.adapters.repository import AbstractRepository
 
 
 class InvalidSku(Exception):

tests/conftest.py

@@ -9,8 +9,8 @@
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker, clear_mappers
 
-from adapters.orm import metadata, start_mappers
-import config
+from allocation.adapters.orm import metadata, start_mappers
+from allocation import config
 
 
 @pytest.fixture
@@ -65,6 +65,6 @@ def postgres_session(postgres_db):
 
 @pytest.fixture
 def restart_api():
-    (Path(__file__).parent / "../entrypoints/flask_app.py").touch()
+    (Path(__file__).parent / "../src/allocation/entrypoints/flask_app.py").touch()
     time.sleep(0.5)
     wait_for_webapp_to_come_up()

tests/e2e/test_api.py

@@ -2,7 +2,7 @@
 import pytest
 import requests
 
-import config
+from allocation import config
 
 
 def random_suffix():

tests/integration/test_orm.py

@@ -1,4 +1,4 @@
-from domain import model
+from allocation.domain import model
 from datetime import date
 
 

tests/integration/test_repository.py

@@ -1,6 +1,6 @@
 # pylint: disable=protected-access
-from domain import model
-from adapters import repository
+from allocation.domain import model
+from allocation.adapters import repository
 
 
 def test_repository_can_save_a_batch(session):