Run migrations

bookbrary/routes/api/books.py

@@ -1,10 +1,10 @@
 from flask import Blueprint, request, current_app as app
 from marshmallow import ValidationError
-from bookbrary.deps import db
 from flask_jwt_extended import jwt_required
 
 from bookbrary.models.books import Book
 from bookbrary.schemas import books_schema, BookSchema, book_schema
+from bookbrary.services import book_service
 
 
 books = Blueprint(name="books", import_name=__name__, url_prefix="/api/books")
@@ -18,20 +18,20 @@ def index() -> list[BookSchema]:
 @books.post(rule="/")
 @jwt_required()
 def create():
-    if not request.json:
+    if request.json is None:
         return {"message": "Request must be in JSON format"}, 400
 
     # Validate the data with Marshmallow and save the book to the database
     try:
-        check_book_exists = Book.query.filter_by(title=request.json["title"]).one()
+        check_book_exists = book_service.get_book_by_title(
+            title=request.json.get("title")
+        )
+
         if check_book_exists:
             return {"message": "Book already exists"}, 409
 
         validated_book = BookSchema().load(data=request.json)
-        book = Book(**validated_book)
-
-        db.session.add(instance=book)
-        db.session.commit()
+        book = book_service.create_book(**validated_book)
 
         return book_schema.dump(obj=book), 201
     except ValidationError as e:

bookbrary/services/__init__.py

@@ -1,5 +1,7 @@
 from .user_service import UserService
+from .book_service import BookService
 
 user_service = UserService()
+book_service = BookService()
 
-__all__ = ["user_service"]
+__all__ = ["user_service", "book_service"]

bookbrary/services/book_service.py

@@ -0,0 +1,32 @@
+from bookbrary.models import Book
+from bookbrary.deps import db
+
+
+class BookService:
+    def create_book(
+        self,
+        title: str,
+        author: str,
+        year: int,
+        genre: str,
+        created_at: str,
+        updated_at: str,
+    ) -> Book:
+        book = Book()
+        book.title = title
+        book.author = author
+        book.year = year
+        book.genre = genre
+        book.created_at = created_at
+        book.updated_at = updated_at
+
+        db.session.add(instance=book)
+        db.session.commit()
+
+        return book
+
+    def get_all_books(self) -> list[Book]:
+        return Book.query.all()
+
+    def get_book_by_title(self, title: str) -> Book | None:
+        return Book.query.filter_by(title=title).first()

bookbrary/tests/conftest.py

@@ -1,9 +1,12 @@
 from typing import Any, Generator
 from flask import Flask
+from flask.testing import FlaskClient
 import pytest
+
 from bookbrary.app import create_app
-from bookbrary.services import user_service
+from bookbrary.services import user_service, book_service
 from bookbrary.deps import db
+from bookbrary.models import Book, User
 
 
 @pytest.fixture
@@ -22,11 +25,26 @@ def app() -> Generator[Flask, Any, None]:
 
 
 @pytest.fixture()
-def client(app):
+def client(app: Flask) -> FlaskClient:
     return app.test_client()
 
 
 @pytest.fixture()
-def user(app) -> Any:
+def user(app: Flask) -> User:
     with app.app_context():
         return user_service.create_user("testuser", "validpassword")
+
+
+@pytest.fixture()
+def book(app: Flask) -> Book:
+    with app.app_context():
+        book = book_service.create_book(
+            title="Test Book",
+            author="Test Author",
+            year=2021,
+            genre="Test Genre",
+            created_at="2021-01-01",
+            updated_at="2021-01-01",
+        )
+
+        return book

bookbrary/tests/test_auth.py

@@ -19,3 +19,11 @@ def test_login_valid_credentials(client, user) -> None:
     )
     assert response.status_code == 200
     assert "access_token" in response.json
+
+
+def test_login_no_data(client) -> None:
+    response = client.post(
+        "/api/auth/login", headers={"Content-Type": "application/json"}
+    )
+    assert response.status_code == 400
+    print(response.json)

bookbrary/tests/test_books.py

@@ -1,3 +1,58 @@
+import pytest
+
+
 def test_get_all_books(client) -> None:
     response = client.get("/api/books/")
     assert response.status_code == 200
+
+
+@pytest.mark.parametrize(
+    "test_title,test_created_at, expected",
+    [
+        ("Test Book 1", "2021-01-01", 201),
+        ("Test Book 2", True, 400),
+        ("Test Book", "2021-01-01", 409),
+    ],
+)
+def test_create_book(client, user, book, test_title, test_created_at, expected) -> None:
+    auth_response = client.post(
+        "/api/auth/login",
+        json={
+            "username": "testuser",
+            "password": "validpassword",
+        },
+    )
+    assert auth_response.status_code == 200
+    assert "access_token" in auth_response.json
+
+    response = client.post(
+        "/api/books/",
+        headers={"Authorization": f"Bearer {auth_response.json['access_token']}"},
+        json={
+            "title": test_title,
+            "author": "Test Author",
+            "year": "2021",
+            "genre": "Test Genre",
+            "created_at": test_created_at,
+            "updated_at": "2021-01-01",
+        },
+    )
+    assert response.status_code == expected
+
+
+def test_no_data(client, user) -> None:
+    auth_response = client.post(
+        "/api/auth/login",
+        json={
+            "username": "testuser",
+            "password": "validpassword",
+        },
+    )
+    response = client.post(
+        "/api/books/",
+        headers={
+            "Content-Type": "application/json",
+            "Authorization": f"Bearer {auth_response.json['access_token']}",
+        },
+    )
+    assert response.status_code == 400

nixpacks.toml

@@ -1,4 +1,4 @@
 providers = ["python"]
 
 [start]
-cmd = "gunicorn wsgi:application"
+cmd = "flask db upgrade && gunicorn wsgi:application"

tox.ini

@@ -7,12 +7,14 @@ python =
     3.12: py12, lint
 
 [testenv]
-deps = pytest
+deps = 
+    pytest 
+    pytest-cov 
 setenv = 
     FLASK_SQLALCHEMY_DATABASE_URI=sqlite:///:memory:
     FLASK_JWT_SECRET_KEY=secret
     FLASK_SECRET_KEY=secret   
-commands = pytest {posargs}
+commands = pytest --cov=bookbrary --cov-report=xml {posargs}
 
 [testenv:lint]
 deps = ruff