Skip to content

Commit 23621d9

Browse files
committed
get all tests passing
1 parent 7ecaf17 commit 23621d9

16 files changed

Lines changed: 18 additions & 19 deletions

adapters/__init__.py

Whitespace-only changes.

adapters/orm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
)
55
from sqlalchemy.orm import mapper, relationship
66

7-
import model
7+
from domain import model
88

99

1010
metadata = MetaData()

adapters/repository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import abc
2-
import model
2+
from domain import model
33

44

55
class AbstractRepository(abc.ABC):

domain/__init__.py

Whitespace-only changes.

entrypoints/__init__.py

Whitespace-only changes.

entrypoints/flask_app.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
from sqlalchemy.orm import sessionmaker
55

66
import config
7-
import model
8-
import orm
9-
import repository
10-
import services
7+
from domain import model
8+
from adapters import orm, repository
9+
from service_layer import services
1110

1211
orm.start_mappers()
1312
get_session = sessionmaker(bind=create_engine(config.get_postgres_uri()))

service_layer/__init__.py

Whitespace-only changes.

service_layer/services.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
from typing import Optional
33
from datetime import date
44

5-
import model
6-
from model import OrderLine
7-
from repository import AbstractRepository
5+
from domain import model
6+
from domain.model import OrderLine
7+
from adapters.repository import AbstractRepository
88

99
class InvalidSku(Exception):
1010
pass

tests/__init__.py

Whitespace-only changes.

conftest.py renamed to tests/conftest.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from sqlalchemy import create_engine
1010
from sqlalchemy.orm import sessionmaker, clear_mappers
1111

12-
from orm import metadata, start_mappers
12+
from adapters.orm import metadata, start_mappers
1313
import config
1414

1515

@@ -66,7 +66,7 @@ def postgres_session(postgres_db):
6666

6767
@pytest.fixture
6868
def restart_api():
69-
(Path(__file__).parent / 'flask_app.py').touch()
69+
(Path(__file__).parent / '../entrypoints/flask_app.py').touch()
7070
time.sleep(0.5)
7171
wait_for_webapp_to_come_up()
7272

0 commit comments

Comments
 (0)