ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add a transaction to speaker handling

Browse Source 
to prevent adding a users multiple times to the waiting queue of a list of speakers
This commit is contained in:
Finn Stutzenstein 2020-09-07 08:22:17 +02:00
parent b050a87bb2
commit d739d401c4
No known key found for this signature in database
GPG Key ID: 9042F605C6324654
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -26,6 +26,7 @@ server/.venv
# OS4-Submodules # OS4-Submodules
/openslides-*/ /openslides-*/
/haproxy/ /haproxy/
/docker/keys/
# Plugin development # Plugin development
openslides_* openslides_*
# Old OS3 stuff # Old OS3 stuff

1
server/openslides/agenda/views.py
View File

@ -306,6 +306,7 @@ class ListOfSpeakersViewSet(
return result return result
@detail_route(methods=["POST", "PATCH", "DELETE"]) @detail_route(methods=["POST", "PATCH", "DELETE"])
@transaction.atomic
def manage_speaker(self, request, pk=None): def manage_speaker(self, request, pk=None):
""" """
Special view endpoint to add users to the list of speakers or remove Special view endpoint to add users to the list of speakers or remove

6
server/tests/unit/agenda/test_views.py
View File

@ -1,6 +1,8 @@
from unittest import TestCase from unittest import TestCase
from unittest.mock import MagicMock, patch from unittest.mock import MagicMock, patch
import pytest
from openslides.agenda.views import ListOfSpeakersViewSet from openslides.agenda.views import ListOfSpeakersViewSet
@ -19,6 +21,7 @@ class ListOfSpeakersViewSetManageSpeaker(TestCase):
@patch("openslides.agenda.views.inform_changed_data") @patch("openslides.agenda.views.inform_changed_data")
@patch("openslides.agenda.views.has_perm") @patch("openslides.agenda.views.has_perm")
@patch("openslides.agenda.views.Speaker") @patch("openslides.agenda.views.Speaker")
@pytest.mark.django_db(transaction=False)
def test_add_oneself_as_speaker(self, mock_speaker, mock_has_perm, mock_icd): def test_add_oneself_as_speaker(self, mock_speaker, mock_has_perm, mock_icd):
self.request.method = "POST" self.request.method = "POST"
self.request.user = 1 self.request.user = 1
@ -36,6 +39,7 @@ class ListOfSpeakersViewSetManageSpeaker(TestCase):
@patch("openslides.agenda.views.has_perm") @patch("openslides.agenda.views.has_perm")
@patch("openslides.agenda.views.get_user_model") @patch("openslides.agenda.views.get_user_model")
@patch("openslides.agenda.views.Speaker") @patch("openslides.agenda.views.Speaker")
@pytest.mark.django_db(transaction=False)
def test_add_someone_else_as_speaker( def test_add_someone_else_as_speaker(
self, mock_speaker, mock_get_user_model, mock_has_perm, mock_icd self, mock_speaker, mock_get_user_model, mock_has_perm, mock_icd
): ):
@ -56,6 +60,7 @@ class ListOfSpeakersViewSetManageSpeaker(TestCase):
) )
@patch("openslides.agenda.views.Speaker") @patch("openslides.agenda.views.Speaker")
@pytest.mark.django_db(transaction=False)
def test_remove_oneself(self, mock_speaker): def test_remove_oneself(self, mock_speaker):
self.request.method = "DELETE" self.request.method = "DELETE"
self.request.data = {} self.request.data = {}
@ -66,6 +71,7 @@ class ListOfSpeakersViewSetManageSpeaker(TestCase):
@patch("openslides.agenda.views.inform_changed_data") @patch("openslides.agenda.views.inform_changed_data")
@patch("openslides.agenda.views.has_perm") @patch("openslides.agenda.views.has_perm")
@patch("openslides.agenda.views.Speaker") @patch("openslides.agenda.views.Speaker")
@pytest.mark.django_db(transaction=False)
def test_remove_someone_else( def test_remove_someone_else(
self, mock_speaker, mock_has_perm, mock_inform_changed_data self, mock_speaker, mock_has_perm, mock_inform_changed_data
): ):