From d193a0e8264ffd984883ed6389d444c356c9e417 Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Sun, 29 Aug 2021 15:45:45 +0200
Subject: [PATCH] Fix unique constraint on personal notes
---
CHANGELOG.rst | 2 +-
.../0015_fix_unique_personal_note.py | 29 +++++++++++++++++++
aleksis/apps/alsijil/models.py | 18 +++++++-----
3 files changed, 40 insertions(+), 9 deletions(-)
create mode 100644 aleksis/apps/alsijil/migrations/0015_fix_unique_personal_note.py
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ad82cddf9..d941adfc7 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -13,6 +13,7 @@ Fixed
~~~~~
* Fix problems with displaying dates for events in the week and lesson view.
+* Unique constraint on lesson documentations and personal notes did not work and caused racey duplicates.
`2.0rc5`_ - 2021-08-12
----------------------
@@ -22,7 +23,6 @@ Fixed
* The _Delete personal note_ action didn't work due to wrong usage of ``bulk_update``.
* Groups and persons were shown multiple times in some forms due to filtering by permissions.
-* Unique constraint on lesson documentations did not work and caused racey duplicates.
`2.0rc4`_ - 2021-08-01
----------------------
diff --git a/aleksis/apps/alsijil/migrations/0015_fix_unique_personal_note.py b/aleksis/apps/alsijil/migrations/0015_fix_unique_personal_note.py
new file mode 100644
index 000000000..195e0ec80
--- /dev/null
+++ b/aleksis/apps/alsijil/migrations/0015_fix_unique_personal_note.py
@@ -0,0 +1,29 @@
+# Generated by Django 3.2.4 on 2021-08-29 13:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('alsijil', '0014_fix_unique_lesson_documentation'),
+ ]
+
+ operations = [
+ migrations.RemoveConstraint(
+ model_name='personalnote',
+ name='unique_personal_note_per_object',
+ ),
+ migrations.AddConstraint(
+ model_name='personalnote',
+ constraint=models.UniqueConstraint(fields=('week', 'year', 'lesson_period', 'person'), name='unique_note_per_lp'),
+ ),
+ migrations.AddConstraint(
+ model_name='personalnote',
+ constraint=models.UniqueConstraint(fields=('week', 'year', 'event', 'person'), name='unique_note_per_ev'),
+ ),
+ migrations.AddConstraint(
+ model_name='personalnote',
+ constraint=models.UniqueConstraint(fields=('week', 'year', 'extra_lesson', 'person'), name='unique_note_per_el'),
+ ),
+ ]
diff --git a/aleksis/apps/alsijil/models.py b/aleksis/apps/alsijil/models.py
index 58292f435..1c9cc9951 100644
--- a/aleksis/apps/alsijil/models.py
+++ b/aleksis/apps/alsijil/models.py
@@ -283,8 +283,13 @@ class PersonalNote(RegisterObjectRelatedMixin, ExtensibleModel):
check=lesson_related_constraint_q, name="one_relation_only_personal_note"
),
models.UniqueConstraint(
- fields=("lesson_period", "week", "year", "event", "extra_lesson"),
- name="unique_personal_note_per_object",
+ fields=("week", "year", "lesson_period", "person"), name="unique_note_per_lp",
+ ),
+ models.UniqueConstraint(
+ fields=("week", "year", "event", "person"), name="unique_note_per_ev",
+ ),
+ models.UniqueConstraint(
+ fields=("week", "year", "extra_lesson", "person"), name="unique_note_per_el",
),
]
@@ -373,16 +378,13 @@ class LessonDocumentation(RegisterObjectRelatedMixin, ExtensibleModel):
check=lesson_related_constraint_q, name="one_relation_only_lesson_documentation",
),
models.UniqueConstraint(
- fields=("week", "year", "lesson_period"),
- name="unique_documentation_per_lp",
+ fields=("week", "year", "lesson_period"), name="unique_documentation_per_lp",
),
models.UniqueConstraint(
- fields=("week", "year", "event"),
- name="unique_documentation_per_ev",
+ fields=("week", "year", "event"), name="unique_documentation_per_ev",
),
models.UniqueConstraint(
- fields=("week", "year", "extra_lesson"),
- name="unique_documentation_per_el",
+ fields=("week", "year", "extra_lesson"), name="unique_documentation_per_el",
),
]
--
GitLab