Solution

docker-compose.yml

@@ -5,7 +5,7 @@ services:
     env_file:
       - .env
     ports:
-      - "5432:5432"
+      - "5433:5432"
     volumes:
       - ./init.sql:/docker-entrypoint-initdb.d/init.sql
       - postgres_theater_data:/var/lib/postgresql/data/
@@ -45,7 +45,7 @@ services:
       - PYTHONPATH=/usr/src/fastapi
       - WATCHFILES_FORCE_POLLING=true
     ports:
-      - "8000:8000"
+      - "8080:8000"
     depends_on:
       db:
         condition: service_healthy

src/database/migrations/env.py

@@ -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
 

src/database/migrations/versions/d0c53c351d00_temp_migration.py

@@ -0,0 +1,34 @@
+"""temp_migration
+
+Revision ID: d0c53c351d00
+Revises: ea3a65568bd9
+Create Date: 2025-02-17 16:28:57.022412
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision: str = 'd0c53c351d00'
+down_revision: Union[str, None] = 'ea3a65568bd9'
+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.alter_column('countries', 'name',
+               existing_type=sa.VARCHAR(length=255),
+               nullable=False)
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.alter_column('countries', 'name',
+               existing_type=sa.VARCHAR(length=255),
+               nullable=True)
+    # ### end Alembic commands ###

src/database/models.py

@@ -1,9 +1,23 @@
 import datetime
 from enum import Enum
-from typing import Optional
 
-from sqlalchemy import String, Float, Text, DECIMAL, UniqueConstraint, Date, ForeignKey, Table, Column
-from sqlalchemy.orm import DeclarativeBase, mapped_column, Mapped, relationship
+from sqlalchemy import (
+    String,
+    Float,
+    Text,
+    DECIMAL,
+    UniqueConstraint,
+    Date,
+    ForeignKey,
+    Table,
+    Column
+)
+from sqlalchemy.orm import (
+    DeclarativeBase,
+    mapped_column,
+    Mapped,
+    relationship
+)
 from sqlalchemy import Enum as SQLAlchemyEnum
 
 
@@ -24,36 +38,55 @@ class MovieStatusEnum(str, Enum):
     Base.metadata,
     Column(
         "movie_id",
-        ForeignKey("movies.id", ondelete="CASCADE"), primary_key=True, nullable=False),
+        ForeignKey("movies.id", ondelete="CASCADE"),
+        primary_key=True,
+        nullable=False
+    ),
     Column(
         "genre_id",
-        ForeignKey("genres.id", ondelete="CASCADE"), primary_key=True, nullable=False),
+        ForeignKey("genres.id", ondelete="CASCADE"),
+        primary_key=True,
+        nullable=False
+    ),
 )
 
 ActorsMoviesModel = Table(
     "actors_movies",
     Base.metadata,
     Column(
         "movie_id",
-        ForeignKey("movies.id", ondelete="CASCADE"), primary_key=True, nullable=False),
+        ForeignKey("movies.id", ondelete="CASCADE"),
+        primary_key=True,
+        nullable=False
+    ),
     Column(
         "actor_id",
-        ForeignKey("actors.id", ondelete="CASCADE"), primary_key=True, nullable=False),
+        ForeignKey("actors.id", ondelete="CASCADE"),
+        primary_key=True,
+        nullable=False
+    ),
 )
 
 MoviesLanguagesModel = Table(
     "movies_languages",
     Base.metadata,
-    Column("movie_id", ForeignKey("movies.id", ondelete="CASCADE"), primary_key=True),
-    Column("language_id", ForeignKey("languages.id", ondelete="CASCADE"), primary_key=True),
+    Column("movie_id",
+           ForeignKey("movies.id", ondelete="CASCADE"),
+           primary_key=True),
+    Column("language_id",
+           ForeignKey("languages.id", ondelete="CASCADE"),
+           primary_key=True),
 )
 
 
 class GenreModel(Base):
     __tablename__ = "genres"
 
-    id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
-    name: Mapped[str] = mapped_column(String(255), unique=True, nullable=False)
+    id: Mapped[int] = mapped_column(primary_key=True,
+                                    autoincrement=True)
+    name: Mapped[str] = mapped_column(String(255),
+                                      unique=True,
+                                      nullable=False)
 
     movies: Mapped[list["MovieModel"]] = relationship(
         "MovieModel",
@@ -69,7 +102,9 @@ class ActorModel(Base):
     __tablename__ = "actors"
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
-    name: Mapped[str] = mapped_column(String(255), unique=True, nullable=False)
+    name: Mapped[str] = mapped_column(String(255),
+                                      unique=True,
+                                      nullable=False)
 
     movies: Mapped[list["MovieModel"]] = relationship(
         "MovieModel",
@@ -86,9 +121,12 @@ class CountryModel(Base):
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     code: Mapped[str] = mapped_column(String(3), unique=True, nullable=False)
-    name: Mapped[Optional[str]] = mapped_column(String(255), nullable=True)
+    name: Mapped[str] = mapped_column(String(255), nullable=False)
 
-    movies: Mapped[list["MovieModel"]] = relationship("MovieModel", back_populates="country")
+    movies: Mapped[list["MovieModel"]] = relationship(
+        "MovieModel",
+        back_populates="country"
+    )
 
     def __repr__(self):
         return f"<Country(code='{self.code}', name='{self.name}')>"
@@ -98,7 +136,9 @@ class LanguageModel(Base):
     __tablename__ = "languages"
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
-    name: Mapped[str] = mapped_column(String(255), unique=True, nullable=False)
+    name: Mapped[str] = mapped_column(String(255),
+                                      unique=True,
+                                      nullable=False)
 
     movies: Mapped[list["MovieModel"]] = relationship(
         "MovieModel",
@@ -121,11 +161,14 @@ class MovieModel(Base):
     status: Mapped[MovieStatusEnum] = mapped_column(
         SQLAlchemyEnum(MovieStatusEnum), nullable=False
     )
-    budget: Mapped[float] = mapped_column(DECIMAL(15, 2), nullable=False)
+    budget: Mapped[float] = mapped_column(DECIMAL(15, 2),
+                                          nullable=False)
     revenue: Mapped[float] = mapped_column(Float, nullable=False)
 
-    country_id: Mapped[int] = mapped_column(ForeignKey("countries.id"), nullable=False)
-    country: Mapped["CountryModel"] = relationship("CountryModel", back_populates="movies")
+    country_id: Mapped[int] = mapped_column(ForeignKey("countries.id"),
+                                            nullable=False)
+    country: Mapped["CountryModel"] = relationship("CountryModel",
+                                                   back_populates="movies")
 
     genres: Mapped[list["GenreModel"]] = relationship(
         "GenreModel",
@@ -146,12 +189,16 @@ class MovieModel(Base):
     )
 
     __table_args__ = (
-        UniqueConstraint("name", "date", name="unique_movie_constraint"),
+        UniqueConstraint("name",
+                         "date",
+                         name="unique_movie_constraint"),
     )
 
     @classmethod
     def default_order_by(cls):
         return [cls.id.desc()]
 
     def __repr__(self):
-        return f"<Movie(name='{self.name}', release_date='{self.date}', score={self.score})>"
+        return (f"<Movie(name='{self.name}', "
+                f"release_date='{self.date}', "
+                f"score={self.score})>")

src/database/populate.py

@@ -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:
@@ -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:

src/main.py

@@ -1,6 +1,5 @@
 from fastapi import FastAPI
-
-from routes import movie_router
+from routes.movies import router as movie_router
 
 app = FastAPI(
     title="Movies homework",
@@ -9,4 +8,6 @@
 
 api_version_prefix = "/api/v1"
 
-app.include_router(movie_router, prefix=f"{api_version_prefix}/theater", tags=["theater"])
+app.include_router(movie_router,
+                   prefix=f"{api_version_prefix}/theater",
+                   tags=["theater"])