Merge pull request #12 from profcomff/1-бэк-рейтинга-преподов

Fixes
profcomff · Oct 17, 2024 · d678fa4 · d678fa4
2 parents be39840 + f22cd07
commit d678fa4
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 24 deletions.
diff --git a/migrations/env.py b/migrations/env.py
@@ -3,8 +3,8 @@
 from alembic import context
 from sqlalchemy import engine_from_config, pool
 
+from rating_api.models import BaseDbModel
 from rating_api.settings import get_settings
-from models.base import BaseDbModel
 
 
 # this is the Alembic Config object, which provides

diff --git a/models/__init__.py → rating_api/models/__init__.py b/models/__init__.py → rating_api/models/__init__.py
diff --git a/models/base.py → rating_api/models/base.py b/models/base.py → rating_api/models/base.py
diff --git a/models/db.py → rating_api/models/db.py b/models/db.py → rating_api/models/db.py
diff --git 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
@@ -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
@@ -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
@@ -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