Skip to content

Commit dca9171

Browse files
WudextWudext
committed
Flake8 and Black
1 parent bdff039 commit dca9171

10 files changed

Lines changed: 67 additions & 102 deletions

File tree

‎migrations/versions/670f4caac7dd_init.py‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,27 @@
88

99

1010
def upgrade():
11-
op.create_table('category',
12-
sa.Column('id', sa.Integer(), nullable=False),
13-
sa.Column('name', sa.String(), nullable=True),
14-
sa.Column('type', sa.String(), nullable=True),
15-
sa.PrimaryKeyConstraint('id')
11+
op.create_table(
12+
'category',
13+
sa.Column('id', sa.Integer(), nullable=False),
14+
sa.Column('name', sa.String(), nullable=True),
15+
sa.Column('type', sa.String(), nullable=True),
16+
sa.PrimaryKeyConstraint('id'),
1617
)
17-
op.create_table('button',
18-
sa.Column('id', sa.Integer(), nullable=False),
19-
sa.Column('name', sa.String(), nullable=True),
20-
sa.Column('category_id', sa.Integer(), nullable=True),
21-
sa.Column('icon', sa.String(), nullable=True),
22-
sa.ForeignKeyConstraint(['category_id'], ['category.id'], ),
23-
sa.PrimaryKeyConstraint('id')
18+
op.create_table(
19+
'button',
20+
sa.Column('id', sa.Integer(), nullable=False),
21+
sa.Column('name', sa.String(), nullable=True),
22+
sa.Column('category_id', sa.Integer(), nullable=True),
23+
sa.Column('icon', sa.String(), nullable=True),
24+
sa.ForeignKeyConstraint(
25+
['category_id'],
26+
['category.id'],
27+
),
28+
sa.PrimaryKeyConstraint('id'),
2429
)
2530

2631

2732
def downgrade():
2833
op.drop_table('button')
29-
op.drop_table('category')
34+
op.drop_table('category')

‎migrations/versions/6a486347af93_order.py‎

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -20,42 +20,22 @@ def upgrade():
2020
op.add_column('button', sa.Column('order', sa.Integer(), nullable=False))
2121
op.add_column('button', sa.Column('link', sa.String(), nullable=False))
2222
op.add_column('button', sa.Column('type', sa.String(), nullable=False))
23-
op.alter_column('button', 'name',
24-
existing_type=sa.VARCHAR(),
25-
nullable=False)
26-
op.alter_column('button', 'category_id',
27-
existing_type=sa.INTEGER(),
28-
nullable=False)
29-
op.alter_column('button', 'icon',
30-
existing_type=sa.VARCHAR(),
31-
nullable=False)
23+
op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=False)
24+
op.alter_column('button', 'category_id', existing_type=sa.INTEGER(), nullable=False)
25+
op.alter_column('button', 'icon', existing_type=sa.VARCHAR(), nullable=False)
3226
op.add_column('category', sa.Column('order', sa.Integer(), nullable=False))
33-
op.alter_column('category', 'name',
34-
existing_type=sa.VARCHAR(),
35-
nullable=False)
36-
op.alter_column('category', 'type',
37-
existing_type=sa.VARCHAR(),
38-
nullable=False)
27+
op.alter_column('category', 'name', existing_type=sa.VARCHAR(), nullable=False)
28+
op.alter_column('category', 'type', existing_type=sa.VARCHAR(), nullable=False)
3929

4030

4131
def downgrade():
4232
# ### commands auto generated by Alembic - please adjust! ###
43-
op.alter_column('category', 'type',
44-
existing_type=sa.VARCHAR(),
45-
nullable=True)
46-
op.alter_column('category', 'name',
47-
existing_type=sa.VARCHAR(),
48-
nullable=True)
33+
op.alter_column('category', 'type', existing_type=sa.VARCHAR(), nullable=True)
34+
op.alter_column('category', 'name', existing_type=sa.VARCHAR(), nullable=True)
4935
op.drop_column('category', 'order')
50-
op.alter_column('button', 'icon',
51-
existing_type=sa.VARCHAR(),
52-
nullable=True)
53-
op.alter_column('button', 'category_id',
54-
existing_type=sa.INTEGER(),
55-
nullable=True)
56-
op.alter_column('button', 'name',
57-
existing_type=sa.VARCHAR(),
58-
nullable=True)
36+
op.alter_column('button', 'icon', existing_type=sa.VARCHAR(), nullable=True)
37+
op.alter_column('button', 'category_id', existing_type=sa.INTEGER(), nullable=True)
38+
op.alter_column('button', 'name', existing_type=sa.VARCHAR(), nullable=True)
5939
op.drop_column('button', 'type')
6040
op.drop_column('button', 'link')
6141
op.drop_column('button', 'order')

‎services_backend/models/database.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,3 @@ class Button(Base):
2121
icon: Mapped[str] = mapped_column(String)
2222
link: Mapped[str] = mapped_column(String)
2323
type: Mapped[str] = mapped_column(String)
24-

‎services_backend/routes/base.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
app = FastAPI()
1111

1212

13-
app.add_middleware(
14-
DBSessionMiddleware, db_url=settings.DB_DSN, engine_args={"pool_pre_ping": True}
15-
)
13+
app.add_middleware(DBSessionMiddleware, db_url=settings.DB_DSN, engine_args={"pool_pre_ping": True})
1614

1715
app.add_middleware(
1816
CORSMiddleware,

‎services_backend/routes/button.py‎

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,19 @@ def remove_button(button_id: int, category_id: int):
5353
if not button:
5454
raise HTTPException(status_code=404, detail="Button does not exist")
5555
if button.category_id != category_id:
56-
raise HTTPException(status_code=404, detail="Button is not this category")
56+
raise HTTPException(status_code=404, detail="Button is not in this category")
5757
db.session.delete(button)
58-
db.session.query(Button) \
59-
.filter(Button.order > button.order) \
60-
.update({"order": Button.order - 1})
58+
db.session.query(Button).filter(Button.order > button.order).update({"order": Button.order - 1})
6159
db.session.commit()
6260

6361

6462
@button.patch("/{button_id}", response_model=ButtonUpdate)
6563
def update_button(button_inp: ButtonUpdate, button_id: int, category_id: int):
6664
query = db.session.query(Button).filter(Button.id == button_id)
6765
button = query.one_or_none()
68-
last_button = db.session.query(Button).filter(Button.category_id == category_id).order_by(Button.order.desc()).first()
66+
last_button = (
67+
db.session.query(Button).filter(Button.category_id == category_id).order_by(Button.order.desc()).first()
68+
)
6969
category = db.session.query(Category).filter(Category.id == category_id).one_or_none()
7070

7171
if not category:
@@ -79,22 +79,17 @@ def update_button(button_inp: ButtonUpdate, button_id: int, category_id: int):
7979

8080
if button_inp.order:
8181
if last_button and (button_inp.order > last_button.order + 1):
82-
raise HTTPException(status_code=400, detail=f"Can`t create button with order {button_inp.order}. "
83-
f"Last category is {last_button.order}")
82+
raise HTTPException(
83+
status_code=400,
84+
detail=f"Can`t create button with order {button_inp.order}. " f"Last category is {last_button.order}",
85+
)
8486
if button_inp.order < 1:
85-
raise HTTPException(status_code=400,
86-
detail="Order can`t be less than 1")
87+
raise HTTPException(status_code=400, detail="Order can`t be less than 1")
8788
if button.order > button_inp.order:
88-
db.session.query(Button) \
89-
.filter(Button.order < button.order) \
90-
.update({"order": Button.order + 1})
89+
db.session.query(Button).filter(Button.order < button.order).update({"order": Button.order + 1})
9190
elif button.order < button_inp.order:
92-
db.session.query(Button) \
93-
.filter(Button.order > button.order) \
94-
.update({"order": Button.order - 1})
91+
db.session.query(Button).filter(Button.order > button.order).update({"order": Button.order - 1})
9592

96-
query.update(
97-
button_inp.dict(exclude_unset=True, exclude_none=True)
98-
)
93+
query.update(button_inp.dict(exclude_unset=True, exclude_none=True))
9994
db.session.commit()
10095
return button

‎services_backend/routes/category.py‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,23 @@ def create_category(category_inp: CategoryCreate):
2222
def get_categories(offset: int = 0, limit: int = 100):
2323
if (offset < 0) or (limit < 0):
2424
raise HTTPException(400, detail="Offset or limit cant be negative")
25-
return [CategoryGet.from_orm(row).dict(exclude={"buttons"}) for row in db.session.query(Category).order_by(Category.order).offset(offset).limit(limit).all()]
25+
return [
26+
CategoryGet.from_orm(row).dict(exclude={"buttons"})
27+
for row in db.session.query(Category).order_by(Category.order).offset(offset).limit(limit).all()
28+
]
2629

2730

2831
@category.get("/{category_id}", response_model=CategoryGet, response_model_exclude_none=True)
2932
def get_category(category_id: int):
3033
category = db.session.query(Category).filter(Category.id == category_id).one_or_none()
3134
if not category:
3235
raise HTTPException(status_code=404, detail="Category does not exist")
33-
return {"id": category_id,
34-
"order": category.order,
35-
"name": category.name,
36-
"type": category.type,
37-
}
36+
return {
37+
"id": category_id,
38+
"order": category.order,
39+
"name": category.name,
40+
"type": category.type,
41+
}
3842

3943

4044
@category.delete("/{category_id}", response_model=None)
@@ -45,9 +49,7 @@ def remove_category(category_id: int):
4549
for button in db.session.query(Button).filter(Button.category_id == category_id).all():
4650
db.session.delete(button)
4751
db.session.flush()
48-
db.session.query(Category) \
49-
.filter(Category.order > category.order) \
50-
.update({"order": Category.order - 1})
52+
db.session.query(Category).filter(Category.order > category.order).update({"order": Category.order - 1})
5153
db.session.delete(category)
5254
db.session.commit()
5355

@@ -64,24 +66,20 @@ def update_category(category_inp: CategoryUpdate, category_id: int):
6466

6567
if category_inp.order:
6668
if category_inp.order < 1:
67-
raise HTTPException(status_code=400,
68-
detail="Order can`t be less than 1")
69+
raise HTTPException(status_code=400, detail="Order can`t be less than 1")
6970
if last_category and (category_inp.order > last_category.order):
70-
raise HTTPException(status_code=400, detail=f"Can`t create category with order {category_inp.order}. "
71-
f"Last category is {last_category.order}")
71+
raise HTTPException(
72+
status_code=400,
73+
detail=f"Can`t create category with order {category_inp.order}. "
74+
f"Last category is {last_category.order}",
75+
)
7276

7377
if category.order > category_inp.order:
74-
db.session.query(Category) \
75-
.filter(Category.order < category.order) \
76-
.update({"order": Category.order + 1})
78+
db.session.query(Category).filter(Category.order < category.order).update({"order": Category.order + 1})
7779
elif category.order < category_inp.order:
78-
db.session.query(Category) \
79-
.filter(Category.order > category.order) \
80-
.update({"order": Category.order - 1})
80+
db.session.query(Category).filter(Category.order > category.order).update({"order": Category.order - 1})
8181

8282
query = db.session.query(Category).filter(Category.id == category_id)
83-
query.update(
84-
category_inp.dict(exclude_unset=True, exclude_none=True)
85-
)
83+
query.update(category_inp.dict(exclude_unset=True, exclude_none=True))
8684
db.session.commit()
8785
return category

‎services_backend/routes/models/button.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,3 @@ class ButtonGet(Base):
2424
name: str | None
2525
link: str | None
2626
type: str | None
27-

‎services_backend/routes/models/category.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ class CategoryGet(Base):
1919
type: str | None
2020
name: str | None
2121
buttons: list[ButtonGet] | None
22-

‎tests/api/button.py‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def test_post_success(self, client, db_category, dbsession):
1717
"icon": "https://lh3.googleusercontent.com/yURn6ISxDySTdXZAW2PUcADMnU3y9YX0M1RyXOH8a3sa1Tr0pHhPLGw5BKuiLiXa3Eh0fyHm7Dfsd9FodK3fxJge6g=w640-h400-e365-rj-sc0x00ffffff",
1818
"name": "string",
1919
"link": "google.com",
20-
"type": "test"
20+
"type": "test",
2121
}
2222
res = client.post(f"/category/{db_category.id}/button/", data=json.dumps(body))
2323
assert res.status_code == status.HTTP_200_OK
@@ -27,9 +27,7 @@ def test_post_success(self, client, db_category, dbsession):
2727
assert res_body["name"] == body["name"]
2828
assert res_body["link"] == body["link"]
2929
assert res_body["type"] == body["type"]
30-
db_button_created: Button = (
31-
dbsession.query(Button).filter(Button.id == res_body["id"]).one_or_none()
32-
)
30+
db_button_created: Button = dbsession.query(Button).filter(Button.id == res_body["id"]).one_or_none()
3331
assert db_button_created
3432
assert db_button_created.icon == body["icon"]
3533
assert db_button_created.name == body["name"]
@@ -57,8 +55,7 @@ def test_delete_by_id_success(self, client, dbsession, db_button, db_category):
5755
assert get_res.status_code == status.HTTP_404_NOT_FOUND
5856

5957
def test_patch_by_id_success(self, db_button, client, db_category):
60-
body = {"icon": "cool icon", "name": "nice name", "order": 2,
61-
"link": "ya.ru", "type": "nice type"}
58+
body = {"icon": "cool icon", "name": "nice name", "order": 2, "link": "ya.ru", "type": "nice type"}
6259
res = client.patch(f"/category/{db_category.id}/button/{db_button.id}", data=json.dumps(body))
6360
assert res.status_code == status.HTTP_200_OK
6461
res_body = res.json()
@@ -77,10 +74,7 @@ def test_patch_unset_params(self, client, db_button, db_category):
7774
res = client.patch(f"/category/{db_category.id}/button/{db_button.id}", data=json.dumps(body))
7875
assert res.status_code == status.HTTP_200_OK
7976
assert res.json()["icon"] == body["icon"]
80-
body_name = {
81-
"name": "string",
82-
"order": 1
83-
}
77+
body_name = {"name": "string", "order": 1}
8478
res = client.patch(f"/category/{db_category.id}/button/{db_button.id}", data=json.dumps(body_name))
8579
assert res.status_code == status.HTTP_200_OK
8680
assert res.json()["name"] == body_name["name"]

‎tests/api/category.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,7 @@ def test_patch_unset_params(self, client, db_category):
6767
res = client.patch(f"{self._url}{db_category.id}", data=json.dumps(body))
6868
assert res.status_code == status.HTTP_200_OK
6969
assert res.json()["order"] == body["order"]
70-
body_ord = {
71-
"order": 1
72-
}
70+
body_ord = {"order": 1}
7371
res = client.patch(f"{self._url}{db_category.id}", data=json.dumps(body_ord))
7472
assert res.status_code == status.HTTP_200_OK
7573
assert res.json()["order"] == body_ord["order"]

0 commit comments

Comments
 (0)