Skip to content

Commit 623bda4

Browse files
CaseAsLimboCaseAsLimbo
committed
Были применены black и isort T_T
1 parent c277471 commit 623bda4

3 files changed

Lines changed: 40 additions & 37 deletions

File tree

‎rating_api/models/db.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ class Lecturer(BaseDbModel):
5050
avatar_link: Mapped[str] = mapped_column(String, nullable=True, comment="Ссылка на аву препода")
5151
timetable_id: Mapped[int]
5252
comments: Mapped[list[Comment]] = relationship("Comment", back_populates="lecturer")
53-
lecturer_user_comments: Mapped[list[LecturerUserComment]] = relationship("LecturerUserComment", back_populates="lecturer", cascade="all, delete-orphan")
53+
lecturer_user_comments: Mapped[list[LecturerUserComment]] = relationship(
54+
"LecturerUserComment", back_populates="lecturer", cascade="all, delete-orphan"
55+
)
5456
mark_weighted: Mapped[float] = mapped_column(
5557
Float,
5658
nullable=False,

‎tests/conftest.py‎

Lines changed: 32 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,15 @@
99
from alembic import command
1010
from alembic.config import Config as AlembicConfig
1111
from fastapi.testclient import TestClient
12-
from sqlalchemy import create_engine
13-
14-
from sqlalchemy import event
1512
from fastapi_sqlalchemy import db
16-
13+
from sqlalchemy import create_engine, event
1714
from sqlalchemy.orm import sessionmaker
1815
from testcontainers.postgres import PostgresContainer
1916

2017
from rating_api.models.db import *
2118
from rating_api.routes import app
2219
from rating_api.settings import Settings, get_settings
2320

24-
from auth_lib.fastapi import UnionAuth
2521

2622
class PostgresConfig:
2723
"""Дата-класс со значениями для контейнера с тестовой БД и alembic-миграции."""
@@ -100,35 +96,34 @@ def dbsession(db_container):
10096
def logging_sql_req_before_execute(dbsession):
10197
"""
10298
Фикстура для логирования всех сформированных в рамках одной транзакции
103-
SQL-запросов, до их отправки в бд, то есть до Session.flush() или
99+
SQL-запросов, до их отправки в бд, то есть до Session.flush() или
104100
до Session.commit(), а так же событий сессии BEGIN, COMMIT и ROLLBACK
105101
"""
106102
engine = dbsession.get_bind()
107103

108104
@event.listens_for(engine, "before_execute", named=True)
109105
def sql_requests_listener(**kw_entities_of_executing):
110106
print("\n========= SQL command =========\n")
111-
print(f"SQL was sended: {kw_entities_of_executing.get("clauseelement")}\n")
107+
print(f"SQL was sended: {kw_entities_of_executing.get('clauseelement')}\n")
112108
print("===============================\n")
113109

114110
@event.listens_for(dbsession, "after_begin", named=True)
115111
def begin_listener(**kw):
116112
print("\n========= BEGIN =========\n")
117113
print(f"BEGIN was executed\n")
118-
print("===============================\n")
114+
print("===============================\n")
119115

120116
@event.listens_for(dbsession, "after_rollback", named=True)
121117
def begin_listener(**kw):
122118
print("\n========= ROLLBACK =========\n")
123119
print(f"ROLLBACK was executed\n")
124-
print("===============================\n")
120+
print("===============================\n")
125121

126122
@event.listens_for(dbsession, "after_commit", named=True)
127123
def begin_listener(**kw):
128124
print("\n========= COMMIT =========\n")
129125
print(f"COMMIT was executed\n")
130-
print("===============================\n")
131-
126+
print("===============================\n")
132127

133128

134129
@pytest.fixture()
@@ -144,28 +139,32 @@ def authlib_user():
144139
"""
145140
Данные о пользователе, возвращаемые сервисом auth.
146141
"""
147-
return {"auth_methods":["email","github_auth"],
148-
"session_scopes":[
149-
{"id":145,"name":"auth.session.create"},
150-
{"id":146,"name":"auth.session.update"},
151-
{"id":165,"name":"auth.user.selfdelete"}
152-
],
153-
"user_scopes":[
154-
{"id":145,"name":"auth.session.create"},
155-
{"id":146,"name":"auth.session.update"},
156-
{"id":165,"name":"auth.user.selfdelete"}
157-
],
158-
"indirect_groups":[99],
159-
"groups":[99],
160-
"id":0,
161-
"email":"aslimbo2001@gmail.com",
162-
"userdata":[
163-
{"category":"Личная информация","param":"Полное имя","value":"Namazov Maksim"},
164-
{"category":"Личная информация","param":"Фото","value":"https://avatars.githubusercontent.com/u/192724282?v=4"},
165-
{"category":"Контакты","param":"Имя пользователя GitHub","value":"CaseAsLimbo"}
166-
]
167-
}
168-
142+
return {
143+
"auth_methods": ["email", "github_auth"],
144+
"session_scopes": [
145+
{"id": 145, "name": "auth.session.create"},
146+
{"id": 146, "name": "auth.session.update"},
147+
{"id": 165, "name": "auth.user.selfdelete"},
148+
],
149+
"user_scopes": [
150+
{"id": 145, "name": "auth.session.create"},
151+
{"id": 146, "name": "auth.session.update"},
152+
{"id": 165, "name": "auth.user.selfdelete"},
153+
],
154+
"indirect_groups": [99],
155+
"groups": [99],
156+
"id": 0,
157+
"email": "aslimbo2001@gmail.com",
158+
"userdata": [
159+
{"category": "Личная информация", "param": "Полное имя", "value": "Namazov Maksim"},
160+
{
161+
"category": "Личная информация",
162+
"param": "Фото",
163+
"value": "https://avatars.githubusercontent.com/u/192724282?v=4",
164+
},
165+
{"category": "Контакты", "param": "Имя пользователя GitHub", "value": "CaseAsLimbo"},
166+
],
167+
}
169168

170169

171170
@pytest.fixture()

‎tests/test_routes/test_comment.py‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
import logging
33

44
import pytest
5+
from auth_lib.fastapi import UnionAuth
56
from starlette import status
67

78
from rating_api.models import Comment, CommentReaction, LecturerUserComment, Reaction, ReviewStatus
89
from rating_api.settings import get_settings
910

10-
from auth_lib.fastapi import UnionAuth
1111

1212
logger = logging.getLogger(__name__)
1313
url: str = '/comment'
@@ -178,13 +178,15 @@
178178
def test_create_comment(client, dbsession, lecturers, body, lecturer_n, response_status):
179179
params = {"lecturer_id": lecturers[lecturer_n].id}
180180
post_response = client.post(url, json=body, params=params)
181-
181+
182182
# Проверка корректности переданных в userdata "param"
183183
user = UnionAuth.__call__(post_response)
184184
acceptable_params = ["Полное имя", "Фото", "Имя пользователя GitHub", "Номер Телефона"]
185185
real_params = [i["param"] for i in user.get("userdata")]
186186
for i in real_params:
187-
assert i in acceptable_params, f"Не допустимый параметр: \"{i}\"! Список допустимых параметров: {acceptable_params}"
187+
assert (
188+
i in acceptable_params
189+
), f"Не допустимый параметр: \"{i}\"! Список допустимых параметров: {acceptable_params}"
188190

189191
assert post_response.status_code == response_status
190192
if response_status == status.HTTP_200_OK:

0 commit comments

Comments
 (0)