From 1adc29e72d0df118465155f6f9d4f303796f1bf6 Mon Sep 17 00:00:00 2001
From: Julian Leucker <leuckerj@gmail.com>
Date: Tue, 21 May 2024 11:14:05 +0200
Subject: [PATCH] Fix naming and permissions in mutations
---
aleksis/apps/alsijil/schema/__init__.py | 6 +++---
aleksis/apps/alsijil/schema/extra_marks.py | 2 +-
aleksis/apps/alsijil/schema/participation_status.py | 2 +-
aleksis/apps/alsijil/schema/personal_note.py | 6 +++++-
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/aleksis/apps/alsijil/schema/__init__.py b/aleksis/apps/alsijil/schema/__init__.py
index 4ecfef27e..5a99230c2 100644
--- a/aleksis/apps/alsijil/schema/__init__.py
+++ b/aleksis/apps/alsijil/schema/__init__.py
@@ -189,6 +189,6 @@ class Mutation(graphene.ObjectType):
update_extra_marks = ExtraMarkBatchPatchMutation.Field()
delete_extra_marks = ExtraMarkBatchDeleteMutation.Field()
- create_personal_note = PersonalNoteBatchCreateMutation.Field()
- update_personal_note = PersonalNoteBatchPatchMutation.Field()
- delete_personal_note = PersonalNoteBatchDeleteMutation.Field()
+ create_personal_notes = PersonalNoteBatchCreateMutation.Field()
+ update_personal_notes = PersonalNoteBatchPatchMutation.Field()
+ delete_personal_notes = PersonalNoteBatchDeleteMutation.Field()
diff --git a/aleksis/apps/alsijil/schema/extra_marks.py b/aleksis/apps/alsijil/schema/extra_marks.py
index 912821014..2ee2bdc09 100644
--- a/aleksis/apps/alsijil/schema/extra_marks.py
+++ b/aleksis/apps/alsijil/schema/extra_marks.py
@@ -33,7 +33,7 @@ class ExtraMarkBatchCreateMutation(BaseBatchCreateMutation):
class ExtraMarkBatchDeleteMutation(BaseBatchDeleteMutation):
class Meta:
model = ExtraMark
- permission_required = "alsijil.delete_extra_mark" # FIXME
+ permissions = ("alsijil.delete_extra_mark",) # FIXME
class ExtraMarkBatchPatchMutation(BaseBatchPatchMutation):
diff --git a/aleksis/apps/alsijil/schema/participation_status.py b/aleksis/apps/alsijil/schema/participation_status.py
index 2e5a99faf..ac678e676 100644
--- a/aleksis/apps/alsijil/schema/participation_status.py
+++ b/aleksis/apps/alsijil/schema/participation_status.py
@@ -42,7 +42,7 @@ class ParticipationStatusType(
return NewPersonalNote.objects.filter(
person=root.person,
documentation=root.related_documentation,
- note__isnull=False,
+ extra_mark__isnull=True,
)
diff --git a/aleksis/apps/alsijil/schema/personal_note.py b/aleksis/apps/alsijil/schema/personal_note.py
index 33f44b5ef..05ffd7825 100644
--- a/aleksis/apps/alsijil/schema/personal_note.py
+++ b/aleksis/apps/alsijil/schema/personal_note.py
@@ -28,6 +28,8 @@ class PersonalNoteType(
class PersonalNoteBatchCreateMutation(BaseBatchCreateMutation):
class Meta:
model = NewPersonalNote
+ type_name = "BatchCreatePersonalNoteInput"
+ return_field_name = "personalNotes"
fields = ("note", "extra_mark", "documentation", "person")
permissions = ("alsijil.create_personal_note",) # FIXME
@@ -35,10 +37,12 @@ class PersonalNoteBatchCreateMutation(BaseBatchCreateMutation):
class PersonalNoteBatchPatchMutation(BaseBatchPatchMutation):
class Meta:
model = NewPersonalNote
+ type_name = "BatchPatchPersonalNoteInput"
+ return_field_name = "personalNotes"
fields = ("id", "note", "extra_mark", "documentation", "person")
permissions = ("alsijil.change_personal_note",) # FIXME
class PersonalNoteBatchDeleteMutation(BaseBatchDeleteMutation):
class Meta:
model = NewPersonalNote
- permission_required = "alsijil.delete_personal_note" # FIXME
+ permissions = ("alsijil.delete_personal_note",) # FIXME
--
GitLab