From 85bedd555b65ce142cf2a0e88b465e2a496e0f95 Mon Sep 17 00:00:00 2001 From: Artem Morozov Date: Thu, 17 Oct 2024 18:29:09 +0300 Subject: [PATCH] Fixes --- migrations/env.py | 2 +- {models => rating_api/models}/__init__.py | 0 {models => rating_api/models}/base.py | 0 {models => rating_api/models}/db.py | 0 rating_api/routes/comment.py | 13 ++++--------- rating_api/routes/lecturer.py | 4 ++-- tests/test_routes/test_comment.py | 7 +------ tests/test_routes/test_lecturer.py | 7 +------ 8 files changed, 9 insertions(+), 24 deletions(-) rename {models => rating_api/models}/__init__.py (100%) rename {models => rating_api/models}/base.py (100%) rename {models => rating_api/models}/db.py (100%) diff --git a/migrations/env.py b/migrations/env.py index fc7a102..60528da 100644 --- a/migrations/env.py +++ b/migrations/env.py @@ -3,7 +3,7 @@ from alembic import context from sqlalchemy import engine_from_config, pool -from models.base import BaseDbModel +from rating_api.models import BaseDbModel from rating_api.settings import get_settings diff --git a/models/__init__.py b/rating_api/models/__init__.py similarity index 100% rename from models/__init__.py rename to rating_api/models/__init__.py diff --git a/models/base.py b/rating_api/models/base.py similarity index 100% rename from models/base.py rename to rating_api/models/base.py diff --git a/models/db.py b/rating_api/models/db.py similarity index 100% rename from models/db.py rename to rating_api/models/db.py diff --git a/rating_api/routes/comment.py b/rating_api/routes/comment.py index 6ff501d..237b64b 100644 --- a/rating_api/routes/comment.py +++ b/rating_api/routes/comment.py @@ -1,23 +1,18 @@ import datetime -from typing import Annotated, Literal +from typing import Literal from uuid import UUID from auth_lib.fastapi import UnionAuth -from fastapi import APIRouter, Depends, HTTPException, Query +from fastapi import APIRouter, Depends, Query from fastapi_sqlalchemy import db -from models import Comment, Lecturer, LecturerUserComment, ReviewStatus -from rating_api.exceptions import AlreadyExists, ForbiddenAction, ObjectNotFound, TooManyCommentRequests +from rating_api.models import Comment, Lecturer, LecturerUserComment, ReviewStatus +from rating_api.exceptions import ForbiddenAction, ObjectNotFound, TooManyCommentRequests from rating_api.schemas.base import StatusResponseModel from rating_api.schemas.models import ( CommentGet, CommentGetAll, CommentPost, - LecturerGet, - LecturerGetAll, - LecturerPatch, - LecturerPost, - LecturerUserCommentPost, ) from rating_api.settings import Settings, get_settings diff --git a/rating_api/routes/lecturer.py b/rating_api/routes/lecturer.py index 92cbaf6..e370225 100644 --- a/rating_api/routes/lecturer.py +++ b/rating_api/routes/lecturer.py @@ -1,11 +1,11 @@ from typing import Literal from auth_lib.fastapi import UnionAuth -from fastapi import APIRouter, Depends, HTTPException, Query +from fastapi import APIRouter, Depends, Query from fastapi_sqlalchemy import db from sqlalchemy import and_ -from models import Comment, Lecturer, LecturerUserComment, ReviewStatus +from rating_api.models import Comment, Lecturer, LecturerUserComment, ReviewStatus from rating_api.exceptions import AlreadyExists, ObjectNotFound from rating_api.schemas.base import StatusResponseModel from rating_api.schemas.models import CommentGet, LecturerGet, LecturerGetAll, LecturerPatch, LecturerPost diff --git a/tests/test_routes/test_comment.py b/tests/test_routes/test_comment.py index 88b8d56..8361450 100644 --- a/tests/test_routes/test_comment.py +++ b/tests/test_routes/test_comment.py @@ -1,14 +1,9 @@ import logging import uuid -from datetime import datetime, timedelta -import httpx as httpx -from sqlalchemy.orm import Session from starlette import status -from starlette.testclient import TestClient -from models import Comment, Lecturer, LecturerUserComment, ReviewStatus -from rating_api.schemas.models import LecturerPost +from rating_api.models import Comment, Lecturer, LecturerUserComment, ReviewStatus from rating_api.settings import get_settings diff --git a/tests/test_routes/test_lecturer.py b/tests/test_routes/test_lecturer.py index d4b4fc3..85146b8 100644 --- a/tests/test_routes/test_lecturer.py +++ b/tests/test_routes/test_lecturer.py @@ -1,13 +1,8 @@ import logging -from datetime import datetime, timedelta -import httpx as httpx -from sqlalchemy.orm import Session from starlette import status -from starlette.testclient import TestClient -from models import Comment, Lecturer, ReviewStatus -from rating_api.schemas.models import LecturerPost +from rating_api.models import Comment, Lecturer, ReviewStatus from rating_api.settings import get_settings