Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
concrexit
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
70
Issues
70
List
Boards
Labels
Service Desk
Milestones
Merge Requests
10
Merge Requests
10
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
thalia
concrexit
Commits
c0062b4c
Commit
c0062b4c
authored
Mar 02, 2019
by
Joren Vrancken
1
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/dataminimisation' into 'master'
Data minimisation See merge request
!1185
parents
2a264c69
bb29b924
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
2 deletions
+25
-2
website/members/management/commands/dataminimisation.py
website/members/management/commands/dataminimisation.py
+0
-0
website/members/services.py
website/members/services.py
+2
-2
website/members/tests/test_services.py
website/members/tests/test_services.py
+23
-0
No files found.
website/members/management/commands/datamini
ni
misation.py
→
website/members/management/commands/dataminimisation.py
View file @
c0062b4c
File moved
website/members/services.py
View file @
c0062b4c
...
...
@@ -173,8 +173,8 @@ def execute_data_minimisation(dry_run=False):
:return: list of processed members
"""
members
=
(
Member
.
objects
.
filter
(
Q
(
membership__until__isnull
=
Fals
e
)
|
Q
(
membership__until__lte
=
timezone
.
now
().
date
()))
.
exclude
(
Q
(
membership__until__isnull
=
Tru
e
)
|
Q
(
membership__until__gt
=
timezone
.
now
().
date
()))
.
distinct
()
.
prefetch_related
(
'membership_set'
,
'profile'
))
deletion_period
=
timezone
.
now
().
date
()
-
timezone
.
timedelta
(
days
=
31
)
...
...
website/members/tests/test_services.py
View file @
c0062b4c
...
...
@@ -275,3 +275,26 @@ class DataMinimisationTest(TestCase):
self
.
membership
.
save
()
processed
=
services
.
execute_data_minimisation
(
True
)
self
.
assertEqual
(
len
(
processed
),
0
)
self
.
membership
.
until
=
timezone
.
now
().
replace
(
year
=
2018
,
month
=
9
,
day
=
1
)
self
.
membership
.
save
()
with
self
.
subTest
(
'Newer year membership after expired one'
):
m
=
Membership
.
objects
.
create
(
user
=
self
.
member
,
type
=
Membership
.
MEMBER
,
since
=
timezone
.
now
().
replace
(
year
=
2018
,
month
=
9
,
day
=
10
),
until
=
timezone
.
now
().
replace
(
year
=
2019
,
month
=
8
,
day
=
31
),
)
processed
=
services
.
execute_data_minimisation
(
True
)
self
.
assertEqual
(
len
(
processed
),
0
)
m
.
delete
()
with
self
.
subTest
(
'Newer study membership after expired one'
):
m
=
Membership
.
objects
.
create
(
user
=
self
.
member
,
type
=
Membership
.
MEMBER
,
since
=
timezone
.
now
().
replace
(
year
=
2018
,
month
=
9
,
day
=
10
),
until
=
None
)
processed
=
services
.
execute_data_minimisation
(
True
)
self
.
assertEqual
(
len
(
processed
),
0
)
m
.
delete
()
Joren Vrancken
@jvrancken
mentioned in commit
1725048e
·
Mar 02, 2019
mentioned in commit
1725048e
mentioned in commit 1725048e9478018b6d27c8f7a538eb94ba8fb3d2
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment