Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
greg
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
it-bott-integrasjoner
greg
Commits
8baaafba
Commit
8baaafba
authored
3 years ago
by
Tore.Brede
Browse files
Options
Downloads
Patches
Plain Diff
GREG-28: Adding a filter for active roles
parent
db154c5e
No related branches found
No related tags found
1 merge request
!32
GREG-28: Adding a filter for active roles
Pipeline
#91470
failed
3 years ago
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
greg/api/filters.py
+23
-1
23 additions, 1 deletion
greg/api/filters.py
greg/api/views/person.py
+7
-1
7 additions, 1 deletion
greg/api/views/person.py
greg/tests/api/test_person.py
+43
-0
43 additions, 0 deletions
greg/tests/api/test_person.py
with
73 additions
and
2 deletions
greg/api/filters.py
+
23
−
1
View file @
8baaafba
from
datetime
import
datetime
from
django.db.models
import
Q
,
When
,
Case
,
BooleanField
from
django_filters.rest_framework
import
(
from
django_filters.rest_framework
import
(
BaseInFilter
,
BaseInFilter
,
BooleanFilter
,
BooleanFilter
,
...
@@ -23,10 +26,29 @@ class PersonFilter(FilterSet):
...
@@ -23,10 +26,29 @@ class PersonFilter(FilterSet):
verified
=
BooleanFilter
(
verified
=
BooleanFilter
(
field_name
=
"
identities__verified_by_id
"
,
lookup_expr
=
"
isnull
"
,
exclude
=
True
field_name
=
"
identities__verified_by_id
"
,
lookup_expr
=
"
isnull
"
,
exclude
=
True
)
)
active
=
BooleanFilter
(
method
=
"
active_role_filter
"
)
class
Meta
:
class
Meta
:
model
=
Person
model
=
Person
fields
=
[
"
first_name
"
,
"
last_name
"
,
"
verified
"
]
fields
=
[
"
first_name
"
,
"
last_name
"
,
"
verified
"
,
"
active
"
]
def
active_role_filter
(
self
,
queryset
,
name
,
value
):
if
value
:
datetime_now
=
datetime
.
now
()
return
queryset
.
annotate
(
active
=
Case
(
When
(
Q
(
person_roles__start_date__isnull
=
True
)
|
Q
(
person_roles__start_date__lte
=
datetime_now
),
person_roles__end_date__gte
=
datetime_now
,
then
=
True
,
),
default
=
False
,
output_field
=
BooleanField
(),
)
).
filter
(
active
=
value
)
return
queryset
class
PersonIdentityFilter
(
FilterSet
):
class
PersonIdentityFilter
(
FilterSet
):
...
...
This diff is collapsed.
Click to expand it.
greg/api/views/person.py
+
7
−
1
View file @
8baaafba
...
@@ -32,7 +32,13 @@ class PersonViewSet(viewsets.ModelViewSet):
...
@@ -32,7 +32,13 @@ class PersonViewSet(viewsets.ModelViewSet):
"
both verified and not verified are returned
"
,
"
both verified and not verified are returned
"
,
required
=
False
,
required
=
False
,
type
=
bool
,
type
=
bool
,
)
),
OpenApiParameter
(
name
=
"
active
"
,
description
=
"
If try only include persons with an active role
"
,
required
=
False
,
type
=
bool
,
),
]
]
)
)
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
def
list
(
self
,
request
,
*
args
,
**
kwargs
):
...
...
This diff is collapsed.
Click to expand it.
greg/tests/api/test_person.py
+
43
−
0
View file @
8baaafba
import
datetime
from
typing
import
Dict
from
typing
import
Dict
import
pytest
import
pytest
...
@@ -420,3 +421,45 @@ def test_add_duplicate_role_fails(
...
@@ -420,3 +421,45 @@ def test_add_duplicate_role_fails(
# Check that there is still only one role attached to the person
# Check that there is still only one role attached to the person
roles_for_person
=
client
.
get
(
url
).
json
()[
"
results
"
]
roles_for_person
=
client
.
get
(
url
).
json
()[
"
results
"
]
assert
len
(
roles_for_person
)
==
1
assert
len
(
roles_for_person
)
==
1
@pytest.mark.django_db
def
test_filter_active_includes_person_with_active_role
(
client
,
person_foo
:
Person
,
person_foo_role
:
PersonRole
,
sponsor_guy
:
Sponsor
,
unit_foo
:
OrganizationalUnit
,
role_test_guest
:
Role
,
):
date_today
=
datetime
.
date
.
today
()
PersonRole
.
objects
.
create
(
person
=
person_foo
,
role
=
role_test_guest
,
end_date
=
date_today
+
datetime
.
timedelta
(
days
=
1
),
registered_by
=
sponsor_guy
,
unit
=
unit_foo
,
)
url
=
reverse
(
"
v1:person-list
"
)
response
=
client
.
get
(
url
,
{
"
active
"
:
"
true
"
})
results
=
response
.
json
()[
"
results
"
]
assert
len
(
results
)
==
1
assert
results
[
0
][
"
first_name
"
]
==
"
Foo
"
assert
results
[
0
][
"
last_name
"
]
==
"
Foo
"
@pytest.mark.django_db
def
test_filter_active_excludes_person_with_no_active_role
(
client
,
person_foo
:
Person
,
person_foo_role
:
PersonRole
,
sponsor_guy
:
Sponsor
,
unit_foo
:
OrganizationalUnit
,
role_test_guest
:
Role
,
):
url
=
reverse
(
"
v1:person-list
"
)
response
=
client
.
get
(
url
,
{
"
active
"
:
"
true
"
})
results
=
response
.
json
()[
"
results
"
]
assert
len
(
results
)
==
0
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment