Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solution #44

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added src/crud/__init__.py
Empty file.
94 changes: 94 additions & 0 deletions src/crud/movies.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
from typing import List

from fastapi import HTTPException
from sqlalchemy.exc import SQLAlchemyError
from sqlalchemy.orm import Session

from database.models import MovieModel, CountryModel, GenreModel, ActorModel, LanguageModel

from schemas.movies import MovieCreateSchema, MovieUpdateSchema


def get_movies(db: Session, offset, per_page):
return db.query(MovieModel).order_by(MovieModel.id.desc()).offset(offset).limit(per_page).all()


def get_movie(db: Session, movie_id):
return db.query(MovieModel).filter(MovieModel.id == movie_id).first()


def create_objects(data: List[str], model, db: Session):
objects = [model(name=element) for element in data]
db.add_all(objects)
db.commit()

for obj in objects:
db.refresh(obj)

return objects


def create_movie(db: Session, movie: MovieCreateSchema):
try:

country_data = db.query(CountryModel).filter(CountryModel.code == movie.country).first()
if not country_data:
country_data = CountryModel(code=movie.country)
db.add(country_data)
db.commit()
db.refresh(country_data)

genres_data = db.query(GenreModel).filter(GenreModel.name.in_(movie.genres)).all()
if not genres_data:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The check for genres_data being empty might not be sufficient if some genres exist and some don't. Consider handling partial matches by creating only the missing genres.

genres_data = create_objects(movie.genres, GenreModel, db)
Comment on lines +58 to +59

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The current logic for handling genres, actors, and languages may lead to data integrity issues. If any of these entities partially exist, the create_objects function will create duplicates for the non-existing ones. Consider modifying the logic to only create missing entities.


actors_data = db.query(ActorModel).filter(ActorModel.name.in_(movie.actors)).all()
if not actors_data:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to genres, the check for actors_data might not account for partial matches. Ensure that only missing actors are created.

actors_data = create_objects(movie.actors, ActorModel, db)
Comment on lines +64 to +65

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar to the genres handling, the logic for actors may lead to duplicates if some actors already exist. Ensure that only missing actors are created.


languages_data = db.query(LanguageModel).filter(LanguageModel.name.in_(movie.languages)).all()
if not languages_data:

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same issue applies here for languages_data. Handle cases where some languages exist and others need to be created.

languages_data = create_objects(movie.languages, LanguageModel, db)
Comment on lines +72 to +73

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The logic for handling languages can also lead to duplicates if some languages already exist. Modify the logic to create only the missing languages.


db_movie = MovieModel(
name=movie.name,
date=movie.date,
score=movie.score,
overview=movie.overview,
status=movie.status,
budget=movie.budget,
revenue=movie.revenue,
country=country_data,
genres=genres_data,
actors=actors_data,
languages=languages_data
)

db.add(db_movie)
db.commit()
db.refresh(db_movie)
return db_movie

except SQLAlchemyError:
db.rollback()
raise HTTPException(status_code=400, detail="Invalid input data.")
Comment on lines +94 to +96

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider logging the exception details for better debugging and error tracking, rather than just raising a generic HTTPException.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider adding logging for the SQLAlchemyError to improve error tracking and debugging.



def delete_movie(db: Session, movie_id: int):
db_movie = db.query(MovieModel).filter(MovieModel.id == movie_id).first()
if not db_movie:
raise HTTPException(status_code=404, detail="Movie with the given ID was not found.")
db.delete(db_movie)
db.commit()


def update_movie(db: Session, movie_id: int, movie: MovieUpdateSchema):
db_movie = db.query(MovieModel).filter(MovieModel.id == movie_id).first()
if not db_movie:
raise HTTPException(status_code=404, detail="Movie with the given ID was not found.")

for key, value in movie.dict(exclude_unset=True).items():
setattr(db_movie, key, value)

db.commit()
db.refresh(db_movie)
14 changes: 12 additions & 2 deletions src/database/populate.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,19 @@
from tqdm import tqdm

from config import get_settings
from database import MovieModel, get_db_contextmanager
from database.models import CountryModel, GenreModel, ActorModel, MoviesGenresModel, ActorsMoviesModel, LanguageModel, \
from database import (
MovieModel,
get_db_contextmanager
)
from database.models import (
CountryModel,
GenreModel,
ActorModel,
MoviesGenresModel,
ActorsMoviesModel,
LanguageModel,
MoviesLanguagesModel
)


class CSVDatabaseSeeder:
Expand Down
92 changes: 85 additions & 7 deletions src/main.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,90 @@
from fastapi import FastAPI
import math

from routes import movie_router

app = FastAPI(
title="Movies homework",
description="Description of project"
from fastapi import APIRouter, Depends, HTTPException, Query, Path

from sqlalchemy.orm import Session

from crud.movies import get_movies, create_movie, get_movie, delete_movie, update_movie
from database import get_db
from database.models import (
MovieModel,
CountryModel,
GenreModel,
ActorModel,
LanguageModel
)

api_version_prefix = "/api/v1"
from schemas.movies import (
MovieListSchema,
MovieCreateSchema,
MovieDetailSchema,
MovieUpdateSchema,
MoviePageSchema
)


router = APIRouter()


@router.get("/movies/", response_model=MoviePageSchema)
async def list_movies(
page: int = Query(1, ge=1),
per_page: int = Query(10, ge=1, le=20),
db: Session = Depends(get_db)
):
offset = (page - 1) * per_page
movies_data = get_movies(db, offset, per_page)

if movies_data:

total_items = db.query(MovieModel).count()
total_pages = math.ceil(total_items / per_page)

prev_page = f"/theater/movies/?page={page - 1}&per_page={per_page}" if page > 1 else None
next_page = f"/theater/movies/?page={page + 1}&per_page={per_page}" if page < total_pages else None

return {
"movies": movies_data,
"prev_page": prev_page,
"next_page": next_page,
"total_pages": total_pages,
"total_items": total_items
}
raise HTTPException(status_code=404, detail="No movies found.")


@router.get("/movies/{movie_id}/", response_model=MovieDetailSchema)
async def get_movie_detail(
movie_id: int = Path(..., gt=0),
db: Session = Depends(get_db)
):
movie = get_movie(db, movie_id)
if movie:
return movie
raise HTTPException(status_code=404, detail="Movie with the given ID was not found.")


@router.post("/movies/", response_model=MovieDetailSchema, status_code=201)
def add_movie(movie: MovieCreateSchema, db: Session = Depends(get_db)):
movies = db.query(MovieModel).filter(
MovieModel.name == movie.name,
MovieModel.date == movie.date
).all()
if not movies:
return create_movie(db, movie)
raise HTTPException(
status_code=409,
detail=f"A movie with the name '{movie.name}' and release date '{movie.date}' already exists."
)


@router.delete("/movies/{movie_id}/", status_code=204)
def remove_movie(movie_id: int, db: Session = Depends(get_db)):
delete_movie(db, movie_id)


app.include_router(movie_router, prefix=f"{api_version_prefix}/theater", tags=["theater"])
@router.patch("/movies/{movie_id}/")
def patch_movie(movie_id: int, movie: MovieUpdateSchema, db: Session = Depends(get_db)):
update_movie(db, movie_id, movie)
return HTTPException(status_code=200, detail="Movie updated successfully.")
73 changes: 69 additions & 4 deletions src/routes/movies.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,77 @@
from fastapi import APIRouter, Depends, HTTPException, Query
from sqlalchemy.exc import IntegrityError
from sqlalchemy.orm import Session, joinedload
import math

from fastapi import APIRouter, Depends, HTTPException, Query, Path

from sqlalchemy.orm import Session

from crud.movies import get_movies, create_movie, get_movie, delete_movie, update_movie
from database import get_db
from database.models import MovieModel, CountryModel, GenreModel, ActorModel, LanguageModel

from schemas.movies import MovieListSchema, MovieCreateSchema, MovieDetailSchema, MovieUpdateSchema, MoviePageSchema


router = APIRouter()


# Write your code here
@router.get("/movies/", response_model=MoviePageSchema)
async def list_movies(
page: int = Query(1, ge=1),
per_page: int = Query(10, ge=1, le=20),
db: Session = Depends(get_db)
):
offset = (page - 1) * per_page
movies_data = get_movies(db, offset, per_page)

if movies_data:

total_items = db.query(MovieModel).count()
total_pages = math.ceil(total_items / per_page)

prev_page = f"/theater/movies/?page={page - 1}&per_page={per_page}" if page > 1 else None
next_page = f"/theater/movies/?page={page + 1}&per_page={per_page}" if page < total_pages else None

return {
"movies": movies_data,
"prev_page": prev_page,
"next_page": next_page,
"total_pages": total_pages,
"total_items": total_items
}
raise HTTPException(status_code=404, detail="No movies found.")


@router.get("/movies/{movie_id}/", response_model=MovieDetailSchema)
async def get_movie_detail(
movie_id: int = Path(..., gt=0),
db: Session = Depends(get_db)
):
movie = get_movie(db, movie_id)
if movie:
return movie
raise HTTPException(status_code=404, detail="Movie with the given ID was not found.")


@router.post("/movies/", response_model=MovieDetailSchema, status_code=201)
def add_movie(movie: MovieCreateSchema, db: Session = Depends(get_db)):
movies = db.query(MovieModel).filter(
MovieModel.name == movie.name,
MovieModel.date == movie.date
).all()
if not movies:
return create_movie(db, movie)
raise HTTPException(
status_code=409,
detail=f"A movie with the name '{movie.name}' and release date '{movie.date}' already exists."
)


@router.delete("/movies/{movie_id}/", status_code=204)
def remove_movie(movie_id: int, db: Session = Depends(get_db)):
delete_movie(db, movie_id)


@router.patch("/movies/{movie_id}/")
def patch_movie(movie_id: int, movie: MovieUpdateSchema, db: Session = Depends(get_db)):
update_movie(db, movie_id, movie)
return HTTPException(status_code=200, detail="Movie updated successfully.")
92 changes: 91 additions & 1 deletion src/schemas/movies.py
Original file line number Diff line number Diff line change
@@ -1 +1,91 @@
# Write your code here
from datetime import date as date_module, timedelta
from enum import Enum
from typing import Optional, List

from pydantic import BaseModel, Field


class CountrySchema(BaseModel):
id: int
code: str
name: str | None

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider using Optional[str] instead of str | None for consistency with other optional fields in the schemas.


class GenresSchema(BaseModel):
id: int
name: str


class ActorsSchema(BaseModel):
id: int
name: str


class LanguagesSchema(BaseModel):
id: int
name: str


class MovieStatus(str, Enum):
released = "Released"
post_production = "Post Production"
in_production = "In Production"


class MovieListSchema(BaseModel):
id: int
name: str
date: date_module
score: float
overview: str


class MoviePageSchema(BaseModel):
movies: List[MovieListSchema]
prev_page: Optional[str] = None
next_page: Optional[str] = None
total_pages: int
total_items: int


class MovieDetailSchema(BaseModel):
id: int
name: str
date: date_module
score: float = Field(ge=0, le=100)
overview: str
status: MovieStatus
budget: float = Field(ge=0)
revenue: float = Field(ge=0)
country: CountrySchema
genres: List[GenresSchema]
actors: List[ActorsSchema]
languages: List[LanguagesSchema]


class MovieCreateSchema(BaseModel):
name: str = Field(..., max_length=255)
date: date_module = Field(..., le=(date_module.today() + timedelta(days=365)))
score: float = Field(ge=0, le=100)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The date field in MovieCreateSchema allows dates up to one year in the future. Ensure this aligns with your application's requirements for movie release dates.

overview: str
status: MovieStatus
budget: float = Field(ge=0)
revenue: float = Field(ge=0)
country: str
genres: List[str]
actors: List[str]
languages: List[str]


class MovieUpdateSchema(BaseModel):
name: Optional[str] = Field(None, max_length=255)
date: Optional[date_module] = Field(None, le=(date_module.today() + timedelta(days=365)))
score: Optional[float] = Field(None, ge=0, le=100)
overview: Optional[str] = None
status: Optional[MovieStatus] = None
budget: Optional[float] = Field(None, ge=0)
revenue: Optional[float] = Field(None, ge=0)
country: Optional[str] = None
genres: Optional[List[str]] = None
actors: Optional[List[str]] = None
languages: Optional[List[str]] = None
Loading