Moved the logic for getting linked data into the relationship router and

added tests for authors.

library_service/routers/authors.py

@@ -1,6 +1,5 @@
 from fastapi import APIRouter, Depends, HTTPException
 from sqlmodel import Session, select
-from typing import List
 
 from library_service.settings import get_session
 from library_service.models.db import Author, AuthorBookLink, Book, AuthorWithBooks
@@ -79,18 +78,3 @@ def delete_author(author_id: int, session: Session = Depends(get_session)):
     session.delete(author)
     session.commit()
     return author_read
-
-# Get all books for an author
-@router.get("/{author_id}/books/", response_model=List[BookRead])
-def get_books_for_author(author_id: int, session: Session = Depends(get_session)):
-    author = session.get(Author, author_id)
-    if not author:
-        raise HTTPException(status_code=404, detail="Author not found")
-
-    books = session.exec(
-        select(Book)
-        .join(AuthorBookLink)
-        .where(AuthorBookLink.author_id == author_id)
-    ).all()
-
-    return [BookRead(**book.model_dump()) for book in books]

library_service/routers/books.py

@@ -1,12 +1,11 @@
 from fastapi import APIRouter, Depends, HTTPException
 from sqlmodel import Session, select
-from typing import List
 
 from library_service.settings import get_session
-from library_service.models.db import Book, Author, AuthorBookLink, BookWithAuthors
+from library_service.models.db import Author, Book, BookWithAuthors, AuthorBookLink
 from library_service.models.dto import (
-    BookCreate, BookUpdate, BookRead,
-    BookList, AuthorRead
+    AuthorRead, BookList, BookRead,
+    BookCreate, BookUpdate
 )
 
 router = APIRouter(prefix="/books", tags=["books"])
@@ -29,13 +28,25 @@ def read_books(session: Session = Depends(get_session)):
         total=len(books)
     )
 
-# Read a book
+# Read a book with their authors
 @router.get("/{book_id}", response_model=BookWithAuthors)
 def get_book(book_id: int, session: Session = Depends(get_session)):
     book = session.get(Book, book_id)
     if not book:
         raise HTTPException(status_code=404, detail="Book not found")
-    return BookWithAuthors(**book.model_dump())
+
+    authors = session.exec(
+        select(Author)
+        .join(AuthorBookLink)
+        .where(AuthorBookLink.book_id == book_id)
+    ).all()
+
+    author_reads = [AuthorRead(**author.model_dump()) for author in authors]
+
+    book_data = book.model_dump()
+    book_data['authors'] = author_reads
+
+    return BookWithAuthors(**book_data)
 
 # Update a book
 @router.put("/{book_id}", response_model=Book)
@@ -60,18 +71,3 @@ def delete_book(book_id: int, session: Session = Depends(get_session)):
     session.delete(book)
     session.commit()
     return book_read
-
-# Get all authors for a book
-@router.get("/{book_id}/authors/", response_model=List[AuthorRead])
-def get_authors_for_book(book_id: int, session: Session = Depends(get_session)):
-    book = session.get(Book, book_id)
-    if not book:
-        raise HTTPException(status_code=404, detail="Book not found")
-
-    authors = session.exec(
-        select(Author)
-        .join(AuthorBookLink)
-        .where(AuthorBookLink.book_id == book_id)
-    ).all()
-
-    return [AuthorRead(**author.model_dump()) for author in authors]

library_service/routers/relationships.py

@@ -4,6 +4,7 @@ from typing import List, Dict
 
 from library_service.settings import get_session
 from library_service.models.db import Book, Author, AuthorBookLink
+from library_service.models.dto import AuthorRead, BookRead
 
 router = APIRouter(prefix="/relationships", tags=["relations"])
 
@@ -48,3 +49,33 @@ def remove_author_from_book(author_id: int, book_id: int, session: Session = Dep
     session.delete(link)
     session.commit()
     return {"message": "Relationship removed successfully"}
+
+# Get author's books
+@router.get("/authors/{author_id}/books/", response_model=List[BookRead])
+def get_books_for_author(author_id: int, session: Session = Depends(get_session)):
+    author = session.get(Author, author_id)
+    if not author:
+        raise HTTPException(status_code=404, detail="Author not found")
+
+    books = session.exec(
+        select(Book)
+        .join(AuthorBookLink)
+        .where(AuthorBookLink.author_id == author_id)
+    ).all()
+
+    return [BookRead(**book.model_dump()) for book in books]
+
+# Get book's authors
+@router.get("/books/{book_id}/authors/", response_model=List[AuthorRead])
+def get_authors_for_book(book_id: int, session: Session = Depends(get_session)):
+    book = session.get(Book, book_id)
+    if not book:
+        raise HTTPException(status_code=404, detail="Book not found")
+
+    authors = session.exec(
+        select(Author)
+        .join(AuthorBookLink)
+        .where(AuthorBookLink.book_id == book_id)
+    ).all()
+
+    return [AuthorRead(**author.model_dump()) for author in authors]