Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Alsijil
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
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
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Alsijil
Commits
32ef21a6
Commit
32ef21a6
authored
4 years ago
by
yuha
Browse files
Options
Downloads
Patches
Plain Diff
Optimize performance of predicates with custom permission queries
parent
f56f70a5
No related branches found
No related tags found
1 merge request
!90
Performance optimizations
Pipeline
#3670
passed
4 years ago
Stage: test
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/alsijil/util/predicates.py
+16
-11
16 additions, 11 deletions
aleksis/apps/alsijil/util/predicates.py
with
16 additions
and
11 deletions
aleksis/apps/alsijil/util/predicates.py
+
16
−
11
View file @
32ef21a6
...
...
@@ -135,14 +135,16 @@ def has_lesson_group_object_perm(perm: str):
"""
name
=
f
"
has_lesson_group_object_perm:
{
perm
}
"
ct
=
ContentType
.
objects
.
get_for_model
(
Group
)
permissions
=
Permission
.
objects
.
filter
(
content_type
=
ct
,
codename
=
perm
)
@predicate
(
name
)
def
fn
(
user
:
User
,
obj
:
LessonPeriod
)
->
bool
:
if
hasattr
(
obj
,
"
lesson
"
):
for
group
in
obj
.
lesson
.
groups
.
all
():
if
check_object_permission
(
user
,
perm
,
group
):
return
True
return
False
return
True
groups
=
obj
.
lesson
.
groups
.
all
()
qs
=
UserObjectPermission
.
objects
.
filter
(
object_pk__in
=
groups
.
values_list
(
"
pk
"
,
flat
=
True
),
content_type
=
ct
,
user
=
user
,
permission__in
=
permissions
)
return
qs
.
exists
()
return
False
return
fn
...
...
@@ -154,13 +156,16 @@ def has_personal_note_group_perm(perm: str):
"""
name
=
f
"
has_personal_note_person_or_group_perm:
{
perm
}
"
ct
=
ContentType
.
objects
.
get_for_model
(
Person
)
permissions
=
Permission
.
objects
.
filter
(
content_type
=
ct
,
codename
=
perm
)
@predicate
(
name
)
def
fn
(
user
:
User
,
obj
:
PersonalNote
)
->
bool
:
if
hasattr
(
obj
,
"
person
"
):
for
group
in
obj
.
person
.
member_of
.
all
()
:
if
check_o
bject
_p
ermission
(
user
,
perm
,
group
):
return
True
return
False
group
s
=
obj
.
person
.
member_of
.
all
()
qs
=
UserO
bject
P
ermission
.
objects
.
filter
(
object_pk__in
=
groups
.
values_list
(
"
pk
"
,
flat
=
True
),
content_type
=
ct
,
user
=
user
,
permission__in
=
permissions
)
return
qs
.
exists
()
return
False
return
fn
...
...
@@ -224,10 +229,10 @@ def has_any_object_absence(user: User) -> bool:
"""
Predicate which builds a query with all the persons the given users is allowed to register an absence for.
"""
if
get_objects_for_user
(
user
,
"
core.register_absence_person
"
,
Person
).
exists
():
return
True
if
Person
.
objects
.
filter
(
member_of__owners
=
user
.
person
).
exists
():
return
True
if
get_objects_for_user
(
user
,
"
core.register_absence_person
"
,
Person
).
exists
():
return
True
if
Person
.
objects
.
filter
(
member_of__in
=
get_objects_for_user
(
user
,
"
core.register_absence_group
"
,
Group
)
).
exists
():
...
...
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