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
c07b08bd
Verified
Commit
c07b08bd
authored
7 months ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Rewrite data checks for new models
parent
0265905c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!396
Migration path to new models
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/alsijil/checks.py
+157
-0
157 additions, 0 deletions
aleksis/apps/alsijil/checks.py
with
157 additions
and
0 deletions
aleksis/apps/alsijil/
data_
checks.py
→
aleksis/apps/alsijil/checks.py
+
157
−
0
View file @
c07b08bd
import
logging
from
datetime
import
datetime
,
time
from
typing
import
TYPE_CHECKING
from
django.db.models
import
F
from
django.db.models.query_utils
import
Q
from
django.utils.translation
import
gettext
as
_
from
aleksis.apps.chronos.models
import
LessonEvent
from
aleksis.core.data_checks
import
DataCheck
,
IgnoreSolveOption
,
SolveOption
if
TYPE_CHECKING
:
...
...
@@ -32,22 +33,12 @@ class SetGroupsWithCurrentGroupsSolveOption(SolveOption):
check_result
.
delete
()
class
ResetPersonalNoteSolveOption
(
SolveOption
):
name
=
"
reset_personal_note
"
verbose_name
=
_
(
"
Reset personal note to defaults
"
)
@classmethod
def
solve
(
cls
,
check_result
:
"
DataCheckResult
"
):
note
=
check_result
.
related_object
note
.
reset_values
()
note
.
save
()
check_result
.
delete
()
class
NoPersonalNotesInCancelledLessonsDataCheck
(
DataCheck
):
name
=
"
no_personal_notes_in_cancelled_lessons
"
verbose_name
=
_
(
"
Ensure that there are no personal notes in cancelled lessons
"
)
problem_name
=
_
(
"
The personal note is related to a cancelled lesson.
"
)
class
NoParticipationStatusesPersonalNotesInCancelledLessonsDataCheck
(
DataCheck
):
name
=
"
no_personal_notes_participation_statuses_in_cancelled_lessons
"
verbose_name
=
_
(
"
Ensure that there are no participation statuses and personal notes in cancelled lessons
"
)
problem_name
=
_
(
"
The participation status or personal note is related to a cancelled lesson.
"
)
solve_options
=
{
DeleteRelatedObjectSolveOption
.
name
:
DeleteRelatedObjectSolveOption
,
IgnoreSolveOption
.
name
:
IgnoreSolveOption
,
...
...
@@ -55,27 +46,28 @@ class NoPersonalNotesInCancelledLessonsDataCheck(DataCheck):
@classmethod
def
check_data
(
cls
):
from
.models
import
PersonalNote
personal_notes
=
(
PersonalNote
.
objects
.
not_empty
()
.
filter
(
lesson_period__substitutions__cancelled
=
True
,
lesson_period__substitutions__week
=
F
(
"
week
"
),
lesson_period__substitutions__year
=
F
(
"
year
"
),
)
.
prefetch_related
(
"
lesson_period
"
,
"
lesson_period__substitutions
"
)
from
.models
import
NewPersonalNote
,
ParticipationStatus
participation_statuses
=
ParticipationStatus
.
objects
.
filter
(
related_documentation__amends__in
=
LessonEvent
.
objects
.
filter
(
cancelled
=
True
)
)
personal_notes
=
NewPersonalNote
.
objects
.
filter
(
documentation__amends__in
=
LessonEvent
.
objects
.
filter
(
cancelled
=
True
)
)
for
status
in
participation_statuses
:
logging
.
info
(
f
"
Check participation status
{
status
}
"
)
cls
.
register_result
(
status
)
for
note
in
personal_notes
:
logging
.
info
(
f
"
Check personal note
{
note
}
"
)
cls
.
register_result
(
note
)
class
NoGroupsOfPersonsSetInP
ersonalNot
esDataCheck
(
DataCheck
):
name
=
"
no_groups_of_persons_set_in_p
ersonal_not
es
"
verbose_name
=
_
(
"
Ensure that
'
groups_of_person
'
is set for every p
ersonal note
"
)
problem_name
=
_
(
"
The p
ersonal note
has no group in
'
groups_of_person
'
.
"
)
class
NoGroupsOfPersonsSetInP
articipationStatus
esDataCheck
(
DataCheck
):
name
=
"
no_groups_of_persons_set_in_p
articipation_status
es
"
verbose_name
=
_
(
"
Ensure that
'
groups_of_person
'
is set for every p
articipation status
"
)
problem_name
=
_
(
"
The p
articipation status
has no group in
'
groups_of_person
'
.
"
)
solve_options
=
{
SetGroupsWithCurrentGroupsSolveOption
.
name
:
SetGroupsWithCurrentGroupsSolveOption
,
DeleteRelatedObjectSolveOption
.
name
:
DeleteRelatedObjectSolveOption
,
...
...
@@ -84,24 +76,21 @@ class NoGroupsOfPersonsSetInPersonalNotesDataCheck(DataCheck):
@classmethod
def
check_data
(
cls
):
from
.models
import
P
ersonalNote
from
.models
import
P
articipationStatus
personal_notes
=
PersonalNote
.
objects
.
filter
(
groups_of_person__isnull
=
True
)
for
note
in
personal_notes
:
logging
.
info
(
f
"
Check personal note
{
note
}
"
)
cls
.
register_result
(
note
)
participation_statuses
=
ParticipationStatus
.
objects
.
filter
(
groups_of_person__isnull
=
True
)
for
status
in
participation_statuses
:
logging
.
info
(
f
"
Check participation status
{
status
}
"
)
cls
.
register_result
(
status
)
class
LessonDocumentationOnHolidaysDataCheck
(
DataCheck
):
"""
Checks for lesson documentation objects on holidays.
This ignores empty lesson documentation as they are created by default.
"""
class
DocumentationOnHolidaysDataCheck
(
DataCheck
):
"""
Checks for documentation objects on holidays.
"""
name
=
"
lesson_
documentation_on_holidays
"
verbose_name
=
_
(
"
Ensure that there are no
filled out lesson
documentations on holidays
"
)
problem_name
=
_
(
"
The
lesson
documentation is on holidays.
"
)
name
=
"
documentation_on_holidays
"
verbose_name
=
_
(
"
Ensure that there are no documentations on holidays
"
)
problem_name
=
_
(
"
The documentation is on holidays.
"
)
solve_options
=
{
DeleteRelatedObjectSolveOption
.
name
:
DeleteRelatedObjectSolveOption
,
IgnoreSolveOption
.
name
:
IgnoreSolveOption
,
...
...
@@ -111,31 +100,31 @@ class LessonDocumentationOnHolidaysDataCheck(DataCheck):
def
check_data
(
cls
):
from
aleksis.apps.chronos.models
import
Holiday
from
.models
import
Lesson
Documentation
from
.models
import
Documentation
holidays
=
Holiday
.
objects
.
all
()
documentations
=
LessonDocumentation
.
objects
.
not_empty
().
annotate_date_range
()
q
=
Q
(
pk__in
=
[])
for
holiday
in
holidays
:
q
=
q
|
Q
(
day_end__gte
=
holiday
.
date_start
,
day_start__lte
=
holiday
.
date_end
)
documentations
=
documentations
.
filter
(
q
)
q
=
q
|
Q
(
datetime_start__gte
=
datetime
.
combine
(
holiday
.
date_start
,
time
.
min
),
datetime_end__lte
=
datetime
.
combine
(
holiday
.
date_end
,
time
.
max
),
)
documentations
=
Documentation
.
objects
.
filter
(
q
)
for
doc
in
documentations
:
logging
.
info
(
f
"
Lesson d
ocumentation
{
doc
}
is on holidays
"
)
logging
.
info
(
f
"
D
ocumentation
{
doc
}
is on holidays
"
)
cls
.
register_result
(
doc
)
class
PersonalNoteOnHolidaysDataCheck
(
DataCheck
):
"""
Checks for personal note objects on holidays.
class
ParticipationStatus
PersonalNoteOnHolidaysDataCheck
(
DataCheck
):
"""
Checks for
participation status and
personal note objects on holidays.
"""
This ignores empty personal notes as they are created by default.
"""
name
=
"
personal_note_on_holidays
"
verbose_name
=
_
(
"
Ensure that there are no filled out personal notes on holidays
"
)
problem_name
=
_
(
"
The personal note is on holidays.
"
)
name
=
"
participation_status_personal_note_on_holidays
"
verbose_name
=
_
(
"
Ensure that there are no participation statuses or personal notes on holidays
"
)
problem_name
=
_
(
"
The participation status or personal note is on holidays.
"
)
solve_options
=
{
DeleteRelatedObjectSolveOption
.
name
:
DeleteRelatedObjectSolveOption
,
IgnoreSolveOption
.
name
:
IgnoreSolveOption
,
...
...
@@ -145,16 +134,23 @@ class PersonalNoteOnHolidaysDataCheck(DataCheck):
def
check_data
(
cls
):
from
aleksis.apps.chronos.models
import
Holiday
from
.models
import
PersonalNote
from
.models
import
New
PersonalNote
,
ParticipationStatus
holidays
=
Holiday
.
objects
.
all
()
personal_notes
=
PersonalNote
.
objects
.
not_empty
().
annotate_date_range
()
q
=
Q
(
pk__in
=
[])
for
holiday
in
holidays
:
q
=
q
|
Q
(
day_end__gte
=
holiday
.
date_start
,
day_start__lte
=
holiday
.
date_end
)
personal_notes
=
personal_notes
.
filter
(
q
)
q
=
q
|
Q
(
datetime_start__gte
=
datetime
.
combine
(
holiday
.
date_start
,
time
.
min
),
datetime_end__lte
=
datetime
.
combine
(
holiday
.
date_end
,
time
.
max
),
)
participation_statuses
=
ParticipationStatus
.
objects
.
filter
(
q
)
personal_notes
=
NewPersonalNote
.
objects
.
filter
(
q
)
for
status
in
participation_statuses
:
logging
.
info
(
f
"
Participation status
{
status
}
is on holidays
"
)
cls
.
register_result
(
status
)
for
note
in
personal_notes
:
logging
.
info
(
f
"
Personal note
{
note
}
is on holidays
"
)
...
...
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