Merge pull request #2 from OZ-Coding-School/day2

Day2

Author: Meoyoug

conftest.py

@@ -1,5 +1,6 @@
 import pytest
 
+from src.models.movies import MovieModel
 from src.models.users import UserModel
 
 TEST_BASE_URL = "http://test"
@@ -8,3 +9,4 @@
 @pytest.fixture(scope="function", autouse=True)
 def user_model_clear() -> None:
     UserModel.clear()
+    MovieModel.clear()

main.py

@@ -1,69 +1,19 @@
-from typing import Annotated
-
-from fastapi import FastAPI, HTTPException, Path, Query
+from fastapi import FastAPI
 
+from src.models.movies import MovieModel
 from src.models.users import UserModel
-from src.schemas.users import (
-    UserCreateRequest,
-    UserResponse,
-    UserSearchParams,
-    UserUpdateRequest,
-)
+from src.routers.movie_router import movie_router
+from src.routers.user_router import user_router
 
 app = FastAPI()
 
-UserModel.create_dummy()
-
-
-@app.post("/users")
-async def create_user(data: UserCreateRequest) -> int:
-    user = UserModel(**data.model_dump())
-    return user.id
-
-
-@app.get("/users", response_model=list[UserResponse])
-async def get_all_users() -> list[UserModel]:
-    result = UserModel.all()
-    if not result:
-        raise HTTPException(status_code=404)
-    return result
-
-
-@app.get("/users/search", response_model=list[UserResponse])
-async def search_users(query_params: Annotated[UserSearchParams, Query()]) -> list[UserModel]:
-    valid_query = {key: value for key, value in query_params.model_dump().items() if value is not None}
-    filtered_users = UserModel.filter(**valid_query)
-    if not filtered_users:
-        raise HTTPException(status_code=404)
-    return filtered_users
-
-
-@app.get("/users/{user_id}", response_model=UserResponse)
-async def get_user(user_id: int = Path(gt=0)) -> UserModel:
-    user = UserModel.get(id=user_id)
-    if user is None:
-        raise HTTPException(status_code=404)
-    return user
-
-
-@app.patch("/users/{user_id}", response_model=UserResponse)
-async def update_user(data: UserUpdateRequest, user_id: int = Path(gt=0)) -> UserModel:
-    user = UserModel.get(id=user_id)
-    if user is None:
-        raise HTTPException(status_code=404)
-    user.update(**data.model_dump())
-    return user
-
-
-@app.delete("/users/{user_id}")
-async def delete_user(user_id: int = Path(gt=0)) -> dict[str, str]:
-    user = UserModel.get(id=user_id)
-    if user is None:
-        raise HTTPException(status_code=404)
-    user.delete()
-
-    return {"detail": f"User: {user_id}, Successfully Deleted."}
+# include router in app
+app.include_router(user_router)
+app.include_router(movie_router)
 
+# create dummy for test
+UserModel.create_dummy()
+MovieModel.create_dummy()
 
 if __name__ == "__main__":
     import uvicorn

pyproject.toml

@@ -36,6 +36,13 @@ strict = true
 [tool.coverage.run]
 omit = ["*/test_*.py"]
 
+[tool.coverage.report]
+exclude_also = [
+    "def __repr__",
+    "def __str__",
+    "if __name__ == .__main__.:",
+    ]
+
 [tool.pytest.ini_options]
 asyncio_mode = "auto"
 asyncio_default_fixture_loop_scope = "session"

src/models/movies.py

@@ -34,7 +34,11 @@ def get(cls, **kwargs: Any) -> MovieModel | None:
     @classmethod
     def filter(cls, **kwargs: Any) -> list[MovieModel]:
         """조건에 맞는 모든 영화 리스트 반환"""
-        return [movie for movie in cls._data if all(getattr(movie, key) == value for key, value in kwargs.items())]
+        return [
+            movie
+            for movie in cls._data
+            if all(getattr(movie, key) == value or value in getattr(movie, key) for key, value in kwargs.items())
+        ]
 
     def update(self, **kwargs: Any) -> None:
         """영화 정보 업데이트"""
@@ -59,9 +63,14 @@ def create_dummy(cls) -> None:
             cls.create(
                 title=f"dummy_movie {i}",
                 playtime=random.randint(100, 300),
-                genre=random.choices(["SF", "Romantic", "Adventure", "Action", "Comedy", "Horror"]),
+                genre=random.sample(["SF", "Romantic", "Adventure", "Action", "Comedy", "Horror"], k=3),
             )
 
+    @classmethod
+    def clear(cls) -> None:
+        """모든 영화 삭제"""
+        cls._data = []
+
     def __repr__(self) -> str:
         return f"MovieModel(id={self.id}, title='{self.title}', playtime={self.playtime}, genre='{self.genre}')"
 

src/routers/__init__.py

@@ -0,0 +1,54 @@
+from typing import Annotated
+
+from fastapi import APIRouter, HTTPException, Path, Query
+
+from src.models.movies import MovieModel
+from src.schemas.movies import (
+    CreateMovieRequest,
+    MovieResponse,
+    MovieSearchParams,
+    MovieUpdateRequest,
+)
+
+movie_router = APIRouter(prefix="/movies", tags=["movies"])
+
+
+@movie_router.post("", response_model=MovieResponse, status_code=201)
+async def create_movie(data: CreateMovieRequest) -> MovieModel:
+    movie = MovieModel.create(**data.model_dump())
+    return movie
+
+
+@movie_router.get("", response_model=list[MovieResponse], status_code=200)
+async def get_movies(query_params: Annotated[MovieSearchParams, Query()]) -> list[MovieModel]:
+    valid_query = {key: value for key, value in query_params.model_dump().items() if value is not None}
+
+    if valid_query:
+        return MovieModel.filter(**valid_query)
+
+    return MovieModel.all()
+
+
+@movie_router.get("/{movie_id}", response_model=MovieResponse, status_code=200)
+async def get_movie(movie_id: int = Path(gt=0)) -> MovieModel:
+    movie = MovieModel.get(id=movie_id)
+    if movie is None:
+        raise HTTPException(status_code=404)
+    return movie
+
+
+@movie_router.patch("/{movie_id}", response_model=MovieResponse, status_code=200)
+async def update_movie(data: MovieUpdateRequest, movie_id: int = Path(gt=0)) -> MovieModel:
+    movie = MovieModel.get(id=movie_id)
+    if movie is None:
+        raise HTTPException(status_code=404)
+    movie.update(**data.model_dump())
+    return movie
+
+
+@movie_router.delete("/{movie_id}", status_code=204)
+async def delete_movie(movie_id: int = Path(gt=0)) -> None:
+    movie = MovieModel.get(id=movie_id)
+    if movie is None:
+        raise HTTPException(status_code=404)
+    movie.delete()

src/routers/movie_router.py

@@ -0,0 +1,63 @@
+from typing import Annotated
+
+from fastapi import APIRouter, HTTPException, Path, Query
+
+from src.models.users import UserModel
+from src.schemas.users import (
+    UserCreateRequest,
+    UserResponse,
+    UserSearchParams,
+    UserUpdateRequest,
+)
+
+user_router = APIRouter(prefix="/users", tags=["users"])
+
+
+@user_router.post("")
+async def create_user(data: UserCreateRequest) -> int:
+    user = UserModel.create(**data.model_dump())
+    return user.id
+
+
+@user_router.get("", response_model=list[UserResponse])
+async def get_all_users() -> list[UserModel]:
+    result = UserModel.all()
+    if not result:
+        raise HTTPException(status_code=404)
+    return result
+
+
+@user_router.get("/search", response_model=list[UserResponse])
+async def search_users(query_params: Annotated[UserSearchParams, Query()]) -> list[UserModel]:
+    valid_query = {key: value for key, value in query_params.model_dump().items() if value is not None}
+    filtered_users = UserModel.filter(**valid_query)
+    if not filtered_users:
+        raise HTTPException(status_code=404)
+    return filtered_users
+
+
+@user_router.get("/{user_id}", response_model=UserResponse)
+async def get_user(user_id: int = Path(gt=0)) -> UserModel:
+    user = UserModel.get(id=user_id)
+    if user is None:
+        raise HTTPException(status_code=404)
+    return user
+
+
+@user_router.patch("/{user_id}", response_model=UserResponse)
+async def update_user(data: UserUpdateRequest, user_id: int = Path(gt=0)) -> UserModel:
+    user = UserModel.get(id=user_id)
+    if user is None:
+        raise HTTPException(status_code=404)
+    user.update(**data.model_dump())
+    return user
+
+
+@user_router.delete("/{user_id}")
+async def delete_user(user_id: int = Path(gt=0)) -> dict[str, str]:
+    user = UserModel.get(id=user_id)
+    if user is None:
+        raise HTTPException(status_code=404)
+    user.delete()
+
+    return {"detail": f"User: {user_id}, Successfully Deleted."}

src/routers/user_router.py

@@ -0,0 +1,27 @@
+from typing import Annotated
+
+from pydantic import BaseModel, Field
+
+
+class CreateMovieRequest(BaseModel):
+    title: str
+    playtime: int
+    genre: list[str]
+
+
+class MovieResponse(BaseModel):
+    id: int
+    title: str
+    playtime: int
+    genre: list[str]
+
+
+class MovieSearchParams(BaseModel):
+    title: str | None = None
+    genre: str | None = None
+
+
+class MovieUpdateRequest(BaseModel):
+    title: str | None = None
+    playtime: Annotated[int, Field(gt=0)] | None = None
+    genre: list[str] | None = None