|
1 | | -# TODO archivable member |
2 | | -from datetime import datetime |
3 | | - |
4 | 1 | import pytest |
5 | 2 | from sqlalchemy import select |
6 | 3 | from sqlalchemy.orm import Session |
7 | 4 |
|
8 | | -from pycroft.helpers.interval import closedopen |
9 | | -from pycroft.lib.user_deletion import scrub_mail, scrubbable_mails |
10 | | -from pycroft.model.config import Config |
| 5 | +from pycroft.lib.user_deletion import scrub_all_mails, scrub_mail, scrubbable_mails |
11 | 6 | from pycroft.model.scrubbing import ScrubLog |
12 | | -from pycroft.model.user import PropertyGroup, User |
13 | | -from tests import factories as f |
| 7 | +from pycroft.model.user import User |
14 | 8 | from tests.assertions import assert_one |
15 | 9 |
|
16 | 10 |
|
@@ -40,35 +34,7 @@ def test_scrubbing_scrubs_mail(user_archivable: User, processor: User, session: |
40 | 34 | ) |
41 | 35 |
|
42 | 36 |
|
43 | | -@pytest.fixture(scope="module") |
44 | | -def user_archivable(module_session: Session, config: Config) -> User: |
45 | | - # TODO: user wtih membership |
46 | | - return f.UserFactory.create( |
47 | | - registered_at=datetime(2020, 7, 1), |
48 | | - with_membership=True, |
49 | | - membership__active_during=closedopen(datetime(2020, 7, 1), datetime(2021, 11, 25)), |
50 | | - membership__group=config.member_group, |
51 | | - without_room=True, |
52 | | - ) |
53 | | - |
54 | | - |
55 | | -@pytest.fixture(scope="module", autouse=True) |
56 | | -def user_do_not_archive( |
57 | | - module_session: Session, config: Config, group_do_not_archive: PropertyGroup |
58 | | -) -> User: |
59 | | - """ |
60 | | - Create a user with a membership in a group that has the do-not-archive |
61 | | - property. |
62 | | - """ |
63 | | - # TODO _very old_ membership, but also mem in a group |
64 | | - user = f.UserFactory.create( |
65 | | - registered_at=datetime(2020, 7, 1), |
66 | | - with_membership=True, |
67 | | - membership__active_during=closedopen(datetime(2020, 7, 1), datetime(2021, 11, 25)), |
68 | | - membership__group=config.member_group, |
69 | | - without_room=True, |
70 | | - ) |
71 | | - f.MembershipFactory.create( |
72 | | - user=user, group=group_do_not_archive, active_during=closedopen(datetime(2020, 7, 1), None) |
73 | | - ) |
74 | | - return user |
| 37 | +def test_bulk_scrubbing_scrubs_mail( |
| 38 | + users_archivable: list[User], users_notarchivable: list[User], processor: User, session: Session |
| 39 | +): |
| 40 | + scrub_all_mails(session, author=processor) |
0 commit comments