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 #39

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
env_file:
- .env
ports:
- "5432:5432"
- "5433:5432"

Choose a reason for hiding this comment

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

The port mapping for the db service is set to 5433:5432. Ensure that port 5433 is the intended external port for PostgreSQL, as the default PostgreSQL port is 5432. If you don't have a specific reason to change it, consider using 5432:5432.

volumes:
- ./init.sql:/docker-entrypoint-initdb.d/init.sql
- postgres_theater_data:/var/lib/postgresql/data/
Expand Down Expand Up @@ -45,7 +45,7 @@ services:
- PYTHONPATH=/usr/src/fastapi
- WATCHFILES_FORCE_POLLING=true
ports:
- "8000:8000"
- "8001:8000"
depends_on:
db:
condition: service_healthy
Expand Down
Empty file added src/crud/__init__.py
Empty file.
96 changes: 96 additions & 0 deletions src/crud/movies.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
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()

Choose a reason for hiding this comment

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

Consider adding validation for the offset and per_page parameters to ensure they are non-negative integers. This will prevent potential errors when querying the database.



def get_movie(db: Session, movie_id):

Choose a reason for hiding this comment

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

The movie_id parameter should be validated to ensure it is a positive integer. This will help avoid unnecessary database queries for invalid IDs.

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:
genres_data = create_objects(movie.genres, GenreModel, db)

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

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

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:

Choose a reason for hiding this comment

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

Catching SQLAlchemyError is good for handling database errors, but consider logging the exception details for easier debugging and monitoring.

db.rollback()
raise HTTPException(status_code=400, detail="Invalid input data.")


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)
2 changes: 1 addition & 1 deletion src/database/migrations/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

from alembic import context

from database import models # noqa: F401
from database import models # noqa: F401
from database.models import Base
from database.session_postgresql import postgresql_engine

Expand Down
142 changes: 80 additions & 62 deletions src/database/migrations/versions/ea3a65568bd9_initial_migration.py
Original file line number Diff line number Diff line change
@@ -1,96 +1,114 @@
"""initial migration

Revision ID: ea3a65568bd9
Revises:
Revises:
Create Date: 2025-01-02 21:07:13.284837

"""

from typing import Sequence, Union

from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision: str = 'ea3a65568bd9'
revision: str = "ea3a65568bd9"
down_revision: Union[str, None] = None
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None


def upgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.create_table('actors',
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
sa.Column('name', sa.String(length=255), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('name')
op.create_table(
"actors",
sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
sa.Column("name", sa.String(length=255), nullable=False),
sa.PrimaryKeyConstraint("id"),
sa.UniqueConstraint("name"),
)
op.create_table('countries',
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
sa.Column('code', sa.String(length=3), nullable=False),
sa.Column('name', sa.String(length=255), nullable=True),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('code')
op.create_table(
"countries",
sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
sa.Column("code", sa.String(length=3), nullable=False),
sa.Column("name", sa.String(length=255), nullable=True),
sa.PrimaryKeyConstraint("id"),
sa.UniqueConstraint("code"),
)
op.create_table('genres',
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
sa.Column('name', sa.String(length=255), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('name')
op.create_table(
"genres",
sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
sa.Column("name", sa.String(length=255), nullable=False),
sa.PrimaryKeyConstraint("id"),
sa.UniqueConstraint("name"),
)
op.create_table('languages',
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
sa.Column('name', sa.String(length=255), nullable=False),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('name')
op.create_table(
"languages",
sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
sa.Column("name", sa.String(length=255), nullable=False),
sa.PrimaryKeyConstraint("id"),
sa.UniqueConstraint("name"),
)
op.create_table('movies',
sa.Column('id', sa.Integer(), autoincrement=True, nullable=False),
sa.Column('name', sa.String(length=255), nullable=False),
sa.Column('date', sa.Date(), nullable=False),
sa.Column('score', sa.Float(), nullable=False),
sa.Column('overview', sa.Text(), nullable=False),
sa.Column('status', sa.Enum('RELEASED', 'POST_PRODUCTION', 'IN_PRODUCTION', name='moviestatusenum'), nullable=False),
sa.Column('budget', sa.DECIMAL(precision=15, scale=2), nullable=False),
sa.Column('revenue', sa.Float(), nullable=False),
sa.Column('country_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['country_id'], ['countries.id'], ),
sa.PrimaryKeyConstraint('id'),
sa.UniqueConstraint('name', 'date', name='unique_movie_constraint')
op.create_table(
"movies",
sa.Column("id", sa.Integer(), autoincrement=True, nullable=False),
sa.Column("name", sa.String(length=255), nullable=False),
sa.Column("date", sa.Date(), nullable=False),
sa.Column("score", sa.Float(), nullable=False),
sa.Column("overview", sa.Text(), nullable=False),
sa.Column(
"status",
sa.Enum(
"RELEASED", "POST_PRODUCTION", "IN_PRODUCTION", name="moviestatusenum"
),
nullable=False,
),
sa.Column("budget", sa.DECIMAL(precision=15, scale=2), nullable=False),
sa.Column("revenue", sa.Float(), nullable=False),
sa.Column("country_id", sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(
["country_id"],
["countries.id"],
),
sa.PrimaryKeyConstraint("id"),
sa.UniqueConstraint("name", "date", name="unique_movie_constraint"),
)
op.create_table('actors_movies',
sa.Column('movie_id', sa.Integer(), nullable=False),
sa.Column('actor_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['actor_id'], ['actors.id'], ondelete='CASCADE'),
sa.ForeignKeyConstraint(['movie_id'], ['movies.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('movie_id', 'actor_id')
op.create_table(
"actors_movies",
sa.Column("movie_id", sa.Integer(), nullable=False),
sa.Column("actor_id", sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(["actor_id"], ["actors.id"], ondelete="CASCADE"),
sa.ForeignKeyConstraint(["movie_id"], ["movies.id"], ondelete="CASCADE"),
sa.PrimaryKeyConstraint("movie_id", "actor_id"),
)
op.create_table('movies_genres',
sa.Column('movie_id', sa.Integer(), nullable=False),
sa.Column('genre_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['genre_id'], ['genres.id'], ondelete='CASCADE'),
sa.ForeignKeyConstraint(['movie_id'], ['movies.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('movie_id', 'genre_id')
op.create_table(
"movies_genres",
sa.Column("movie_id", sa.Integer(), nullable=False),
sa.Column("genre_id", sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(["genre_id"], ["genres.id"], ondelete="CASCADE"),
sa.ForeignKeyConstraint(["movie_id"], ["movies.id"], ondelete="CASCADE"),
sa.PrimaryKeyConstraint("movie_id", "genre_id"),
)
op.create_table('movies_languages',
sa.Column('movie_id', sa.Integer(), nullable=False),
sa.Column('language_id', sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(['language_id'], ['languages.id'], ondelete='CASCADE'),
sa.ForeignKeyConstraint(['movie_id'], ['movies.id'], ondelete='CASCADE'),
sa.PrimaryKeyConstraint('movie_id', 'language_id')
op.create_table(
"movies_languages",
sa.Column("movie_id", sa.Integer(), nullable=False),
sa.Column("language_id", sa.Integer(), nullable=False),
sa.ForeignKeyConstraint(["language_id"], ["languages.id"], ondelete="CASCADE"),
sa.ForeignKeyConstraint(["movie_id"], ["movies.id"], ondelete="CASCADE"),
sa.PrimaryKeyConstraint("movie_id", "language_id"),
)
# ### end Alembic commands ###


def downgrade() -> None:
# ### commands auto generated by Alembic - please adjust! ###
op.drop_table('movies_languages')
op.drop_table('movies_genres')
op.drop_table('actors_movies')
op.drop_table('movies')
op.drop_table('languages')
op.drop_table('genres')
op.drop_table('countries')
op.drop_table('actors')
op.drop_table("movies_languages")
op.drop_table("movies_genres")
op.drop_table("actors_movies")
op.drop_table("movies")
op.drop_table("languages")
op.drop_table("genres")
op.drop_table("countries")
op.drop_table("actors")
# ### end Alembic commands ###
10 changes: 9 additions & 1 deletion src/database/populate.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,15 @@

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


class CSVDatabaseSeeder:
Expand Down Expand Up @@ -139,6 +146,7 @@ def seed(self):
print(f"Unexpected error: {e}")
raise


def main():
settings = get_settings()
with get_db_contextmanager() as db_session:
Expand Down
1 change: 1 addition & 0 deletions src/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from routes import movie_router


app = FastAPI(
title="Movies homework",
description="Description of project"
Expand Down
Loading