Софт делиты #33

VladislavVoskoboinik · 2023-03-11T06:58:25Z

Добавил софт делиты, релэйшоншипсы и написал тесты для нововведений

github-actions · 2023-03-11T06:59:51Z

✅ Result of Pytest Coverage

---------- coverage: platform linux, python 3.11.2-final-0 -----------

Name	Stmts	Miss	Cover
print_service/init.py	4	0	100%
print_service/main.py	4	4	0%
print_service/models/init.py	67	3	96%
print_service/models/exceptions.py	3	1	67%
print_service/routes/init.py	1	0	100%
print_service/routes/admin.py	49	26	47%
print_service/routes/auth.py	4	0	100%
print_service/routes/base.py	21	0	100%
print_service/routes/file.py	107	24	78%
print_service/routes/qrprint.py	81	47	42%
print_service/routes/user.py	52	5	90%
print_service/schema.py	2	0	100%
print_service/settings.py	29	0	100%
print_service/utils/init.py	45	1	98%
TOTAL	469	111	76%
==================	26	passed,	1

grigoriev-semyon · 2023-03-11T07:01:22Z

migrations/versions/e364ba4ae2f7_init.py

@@ -22,6 +22,7 @@ def upgrade():
        sa.Column('id', sa.Integer(), nullable=False),
        sa.Column('surname', sa.String(), nullable=False),
        sa.Column('number', sa.String(), nullable=False),
+        sa.Column('is_deleted', sa.Boolean(), nullable=True, default=False),


Этот файл миграций уже применен
Надо новый, старый не трогаем

grigoriev-semyon · 2023-03-11T07:02:41Z

print_service/models/__init__.py

@@ -40,4 +32,63 @@ class File(Model):
        DateTime, nullable=False, default=datetime.utcnow, onupdate=datetime.utcnow
    )

-    owner: Mapped[UnionMember] = relationship('UnionMember', back_populates='files')
+    owner: Mapped[UnionMember] = relationship('UnionMember', back_populates='files', foreign_keys=[owner_id])


А если owner is deleted
Зачем он мне тут?
Надо юзать primaryjoin

grigoriev-semyon · 2023-03-11T07:03:28Z

print_service/models/__init__.py

+    owner: Mapped[UnionMember] = relationship('UnionMember', back_populates='files', foreign_keys=[owner_id])
+
+
+class UnionMember(Model):


Почему софт делиты только в юзере? Погнали в файлы тоже

grigoriev-semyon · 2023-03-11T07:04:26Z

print_service/routes/user.py

@@ -24,6 +24,7 @@ class UserCreate(BaseModel):
    username: constr(strip_whitespace=True, to_upper=True, min_length=1)
    union_number: Optional[constr(strip_whitespace=True, to_upper=True, min_length=1)]
    student_number: Optional[constr(strip_whitespace=True, to_upper=True, min_length=1)]
+    is_deleted: bool = False


Не надо это отдавать в модельках
Если удален то для внешнего мира вообще ничего не возвращается

grigoriev-semyon · 2023-03-11T07:05:12Z

print_service/routes/user.py

@@ -49,7 +50,7 @@ async def check_union_member(
    """Проверяет наличие пользователя в списке."""
    user = db.session.query(UnionMember)
    if not settings.ALLOW_STUDENT_NUMBER:
-        user = user.filter(UnionMember.union_number != None)
+        user = user.filter(UnionMember.union_number is not None)


А зачем это изменять? Кажется что алхимия лучше работает с !=

grigoriev-semyon · 2023-03-11T07:06:05Z

print_service/routes/user.py

@@ -93,11 +95,13 @@ def update_list(input: UpdateUserList, user: dict[str, str] = Depends(auth)):
                or_(
                    and_(
                        UnionMember.union_number == user.union_number,
-                        UnionMember.union_number != None,
+                        UnionMember.union_number is not None,
+                        UnionMember.is_deleted is not True,


Почему не используешь фильтр написанный в классе?

grigoriev-semyon · 2023-03-11T07:08:48Z

print_service/routes/user.py

@@ -108,13 +112,14 @@ def update_list(input: UpdateUserList, user: dict[str, str] = Depends(auth)):
            db_user.surname = user.username
            db_user.union_number = user.union_number
            db_user.student_number = user.student_number
+            db_user.is_deleted = user.is_deleted


Ты запрашиваешь с удаленными
Если он там есть то возвращаешь
Это поле не передается в моделях

grigoriev-semyon · 2023-03-11T07:09:16Z

print_service/routes/user.py

+                surname=user.username,
+                union_number=user.union_number,
+                student_number=user.student_number,
+                is_deleted=user.is_deleted


Тут должно по дефолту стоять значение

grigoriev-semyon · 2023-03-11T07:12:01Z

tests/test_routes/test_methods.py

+def test_union_member_update(dbsession):
+    union_member = dict(
+        id=644,
+        surname='test',
+        union_number='6666667',
+        student_number='13033224',
+    )
+    union_member_updated = dict(
+        id=644,
+        surname='not_test',
+        union_number='1233454',
+        student_number='00000004'
+    )
+    UnionMember.create(session=dbsession, **union_member)
+    dbsession.flush()
+    tmp = UnionMember.update(obj_id=union_member['id'], session=dbsession, **union_member_updated)
+    dbsession.flush()
+    assert tmp is not None
+    db_union_member_updated = dbsession.query(UnionMember).filter(UnionMember.id == union_member['id']).one_or_none()
+    assert db_union_member_updated.surname != union_member['surname']
+    assert db_union_member_updated.union_number != union_member['union_number']
+    assert db_union_member_updated.student_number != union_member['student_number']
+    dbsession.query(UnionMember).filter(UnionMember.id == union_member['id']).delete()
+    dbsession.commit()
+
+
+def test_union_member_delete(dbsession):
+    union_member = dict(
+        id=104,
+        surname='test_4',
+        union_number='6666660',
+        student_number='45033224',
+    )
+    UnionMember.create(session=dbsession, **union_member)
+    dbsession.flush()
+    UnionMember.delete(obj_id=union_member['id'], session=dbsession)
+    dbsession.commit()
+    tmp = dbsession.query(UnionMember).filter(UnionMember.id == union_member['id']).one_or_none()
+    assert tmp.is_deleted is True


Нужны тесты на логику работы именно с внешним миром
Кинули джсон
Обновили
Удалили
Восстановили
Это нужно тестировать

Несколько тестов на логику работы класса оставь
Надо протестить тогда каждый метод оттуда
И еще добавь тесты на работу с внешним миром
Через requests

Софт делиты

0cdc7b8

Добавил софт делиты, релэйшоншипсы и написал тесты для нововведений

VladislavVoskoboinik linked an issue Mar 11, 2023 that may be closed by this pull request

Добавить софт делиты в принтер #29

Closed

grigoriev-semyon requested changes Mar 11, 2023

View reviewed changes

grigoriev-semyon closed this Mar 26, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Софт делиты #33

Софт делиты #33

VladislavVoskoboinik commented Mar 11, 2023

github-actions bot commented Mar 11, 2023

grigoriev-semyon Mar 11, 2023

grigoriev-semyon Mar 11, 2023

grigoriev-semyon Mar 11, 2023

grigoriev-semyon Mar 11, 2023

grigoriev-semyon Mar 11, 2023

grigoriev-semyon Mar 11, 2023

grigoriev-semyon Mar 11, 2023

grigoriev-semyon Mar 11, 2023

grigoriev-semyon Mar 11, 2023

grigoriev-semyon Mar 11, 2023

		owner: Mapped[UnionMember] = relationship('UnionMember', back_populates='files', foreign_keys=[owner_id])


		class UnionMember(Model):

Софт делиты #33

Софт делиты #33

Conversation

VladislavVoskoboinik commented Mar 11, 2023

github-actions bot commented Mar 11, 2023

✅ Result of Pytest Coverage

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment