Reorganize app

maldoinc · Aug 24, 2024 · d806b50 · d806b50
1 parent 08c9731
commit d806b50
Show file tree

Hide file tree

Showing 21 changed files with 38 additions and 37 deletions.
diff --git a/config/parameters.yaml b/config/parameters.yaml
@@ -1,5 +1,5 @@
 app:
-  notification_mailer: !!python/object:demoapp.model.config.NotificationMailerConfig
+  notification_mailer: !!python/object:demoapp.models.config.NotificationMailerConfig
     from_name: "Example Blog Postmaster"
     from_address: "[email protected]"
     admin_name: "John Doe"

diff --git a/demoapp/app.py b/demoapp/app.py
@@ -3,7 +3,8 @@
 from pyaml_env import parse_config
 from wireup import container, initialize_container
 
-from demoapp.blueprint.post import bp as post_blueprint
+from demoapp import services
+from demoapp.blueprints.post import bp as post_blueprint
 
 
 def create_app() -> Flask:
@@ -17,7 +18,7 @@ def create_app() -> Flask:
     # notification_mailer is a dataclass that will get injected as a parameter.
     all_config = parse_config("config/parameters.yaml", loader=yaml.Loader)
     container.params.update(all_config["app"])
-    initialize_container(container, service_modules=[])
+    initialize_container(container, service_modules=[services])
 
     return flask_app
 

diff --git a/demoapp/blueprint/__init__.py → demoapp/blueprints/__init__.py b/demoapp/blueprint/__init__.py → demoapp/blueprints/__init__.py
diff --git a/demoapp/blueprint/post.py → demoapp/blueprints/post.py b/demoapp/blueprint/post.py → demoapp/blueprints/post.py
@@ -1,12 +1,12 @@
 from typing import Annotated
 
 import flask
-from flask import Blueprint, Response, abort
+from flask import Blueprint, Response, abort, jsonify
 from wireup import Inject, container
 
-from demoapp.model.api import PostCreateModel
-from demoapp.service.post_repository import PostRepository
-from demoapp.service.post_service import PostService
+from demoapp.models.api import PostCreateModel
+from demoapp.services.post_repository import PostRepository
+from demoapp.services.post_service import PostService
 from demoapp.util import ApiEndpoint, ApiResponse
 
 bp = Blueprint("post", __name__, url_prefix="/posts")
@@ -18,7 +18,7 @@
 # to the method than the flask one so that it is executed before it.
 @container.autowire
 def get_posts(post_repository: PostRepository) -> Response:
-    return ApiResponse.ok(post_repository.find_all())
+    return jsonify(post_repository.find_all())
 
 
 @bp.post("/")

diff --git a/demoapp/model/__init__.py → demoapp/models/__init__.py b/demoapp/model/__init__.py → demoapp/models/__init__.py
diff --git a/demoapp/model/api.py → demoapp/models/api.py b/demoapp/model/api.py → demoapp/models/api.py
diff --git a/demoapp/model/app.py → demoapp/models/app.py b/demoapp/model/app.py → demoapp/models/app.py
diff --git a/demoapp/model/config.py → demoapp/models/config.py b/demoapp/model/config.py → demoapp/models/config.py
diff --git a/demoapp/model/db.py → demoapp/models/db.py b/demoapp/model/db.py → demoapp/models/db.py
diff --git a/demoapp/service/__init__.py → demoapp/services/__init__.py b/demoapp/service/__init__.py → demoapp/services/__init__.py
diff --git a/demoapp/service/database_connection.py → demoapp/services/database_connection.py b/demoapp/service/database_connection.py → demoapp/services/database_connection.py
diff --git a/demoapp/service/mailer_service.py → demoapp/services/mailer_service.py b/demoapp/service/mailer_service.py → demoapp/services/mailer_service.py
@@ -4,9 +4,9 @@
 
 from wireup import Inject, abstract, service
 
-from demoapp.model.app import EmailAddress, EmailMessage
-from demoapp.model.config import NotificationMailerConfig
-from demoapp.model.db import Post
+from demoapp.models.app import EmailAddress, EmailMessage
+from demoapp.models.config import NotificationMailerConfig
+from demoapp.models.db import Post
 
 
 # Declare an abstract type as an "interface".

diff --git a/demoapp/service/post_repository.py → demoapp/services/post_repository.py b/demoapp/service/post_repository.py → demoapp/services/post_repository.py
@@ -2,9 +2,9 @@
 
 from wireup import service
 
-from demoapp.model.api import PostGetModel
-from demoapp.model.db import Post
-from demoapp.service.database_connection import DatabaseConnection
+from demoapp.models.api import PostGetModel
+from demoapp.models.db import Post
+from demoapp.services.database_connection import DatabaseConnection
 
 
 @service

diff --git a/demoapp/service/post_service.py → demoapp/services/post_service.py b/demoapp/service/post_service.py → demoapp/services/post_service.py
@@ -2,10 +2,10 @@
 
 from wireup import service
 
-from demoapp.model.api import PostCreateModel
-from demoapp.model.db import Post
-from demoapp.service.mailer_service import MailerService
-from demoapp.service.post_repository import PostRepository
+from demoapp.models.api import PostCreateModel
+from demoapp.models.db import Post
+from demoapp.services.mailer_service import MailerService
+from demoapp.services.post_repository import PostRepository
 
 
 # Register a Post service. Registration can be done on dataclasses as well,

diff --git a/demoapp/util/api_response.py b/demoapp/util/api_response.py
@@ -4,7 +4,7 @@
 from pydantic import BaseModel
 from sqlalchemy import inspect
 
-from demoapp.model.db import DbBaseModel
+from demoapp.models.db import DbBaseModel
 
 Model = BaseModel | DbBaseModel
 ResponseObject = list[Model] | Model

diff --git a/test/__init__.py → tests/__init__.py b/test/__init__.py → tests/__init__.py
diff --git a/test/fixtures.py → tests/fixtures.py b/test/fixtures.py → tests/fixtures.py
@@ -1,8 +1,8 @@
 from datetime import datetime
 
-from demoapp.model.api import PostGetModel
-from demoapp.model.db import Post
-from demoapp.service.mailer_service import MailerService
+from demoapp.models.api import PostGetModel
+from demoapp.models.db import Post
+from demoapp.services.mailer_service import MailerService
 
 
 def make_db_post(i: int) -> Post:

diff --git a/test/test_database_connection.py → tests/test_database_connection.py b/test/test_database_connection.py → tests/test_database_connection.py
@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from demoapp.service.database_connection import DatabaseConnection
+from demoapp.services.database_connection import DatabaseConnection
 
 
 class DatabaseConnectionTest(TestCase):

diff --git a/test/test_mailer.py → tests/test_mailer.py b/test/test_mailer.py → tests/test_mailer.py
@@ -1,9 +1,9 @@
-from test.fixtures import make_db_post
 from unittest import TestCase
 
-from demoapp.model.app import EmailAddress, EmailMessage
-from demoapp.model.config import NotificationMailerConfig
-from demoapp.service.mailer_service import MailerServiceImpl
+from demoapp.models.app import EmailAddress, EmailMessage
+from demoapp.models.config import NotificationMailerConfig
+from demoapp.services.mailer_service import MailerServiceImpl
+from tests.fixtures import make_db_post
 
 
 class TestMailerImpl(TestCase):

diff --git a/test/test_post_repository.py → tests/test_post_repository.py b/test/test_post_repository.py → tests/test_post_repository.py
@@ -1,10 +1,10 @@
 import datetime
-from test.fixtures import make_api_post, make_db_post
 from unittest import TestCase
 
-from demoapp.model.db import DbBaseModel, Post
-from demoapp.service.database_connection import DatabaseConnection
-from demoapp.service.post_repository import PostRepository
+from demoapp.models.db import DbBaseModel, Post
+from demoapp.services.database_connection import DatabaseConnection
+from demoapp.services.post_repository import PostRepository
+from tests.fixtures import make_api_post, make_db_post
 
 
 class DatabaseConnectionTest(TestCase):

diff --git a/test/test_post_service.py → tests/test_post_service.py b/test/test_post_service.py → tests/test_post_service.py
@@ -1,12 +1,12 @@
 import unittest
 from datetime import datetime
-from test.fixtures import TestMailer
 
-from demoapp.model.api import PostCreateModel
-from demoapp.model.db import DbBaseModel
-from demoapp.service.database_connection import DatabaseConnection
-from demoapp.service.post_repository import PostRepository
-from demoapp.service.post_service import PostService
+from demoapp.models.api import PostCreateModel
+from demoapp.models.db import DbBaseModel
+from demoapp.services.database_connection import DatabaseConnection
+from demoapp.services.post_repository import PostRepository
+from demoapp.services.post_service import PostService
+from tests.fixtures import TestMailer
 
 
 class TestPostService(unittest.TestCase):