Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix participant import with meeting admin #2684

Merged
merged 12 commits into from
Oct 16, 2024
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,12 @@ def validate_entry(self, entry: dict[str, Any]) -> dict[str, Any]:
)

payload_index = entry.pop("payload_index", None)
# only needed for get_failing_fields not to fail
if gender := entry.pop("gender", None):
entry["gender_id"] = {}
failing_fields = self.permission_check.get_failing_fields(entry)
if gender:
entry.pop("gender_id")
entry.pop("group_ids")
entry.pop("structure_level_ids")
entry.pop("meeting_id")
Expand Down Expand Up @@ -152,6 +157,8 @@ def validate_entry(self, entry: dict[str, Any]) -> dict[str, Any]:

if payload_index:
entry["payload_index"] = payload_index
if gender:
entry["gender"] = gender

return results

Expand Down
58 changes: 58 additions & 0 deletions tests/system/action/user/test_participant_json_upload.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ def setUp(self) -> None:
self.set_models(
{
"organization/1": {"gender_ids": [1, 2, 3, 4]},
"gender/1": {"name": "male"},
"gender/2": {"name": "female"},
"gender/3": {"name": "diverse"},
"gender/4": {"name": "non-binary"},
"meeting/1": {
"name": "test",
"group_ids": [1, 7],
Expand Down Expand Up @@ -361,6 +365,60 @@ def test_json_upload_permission_2(self) -> None:
True,
)

def test_json_upload_permission_meeting_admin(self) -> None:
self.create_meeting()
user_id = self.create_user_for_meeting(1)
self.set_user_groups(user_id, [2])
self.login(user_id)
response = self.request(
"participant.json_upload",
{
"meeting_id": 1,
"data": [
{"username": "test", "gender": "male", "default_password": "secret"}
],
},
)
self.assert_status_code(response, 200)
self.assert_model_exists(
"import_preview/1",
{
"name": "participant",
"state": ImportState.DONE,
"result": {
"meeting_id": 1,
"rows": [
{
"state": ImportState.NEW,
"messages": [],
"data": {
"username": {
"value": "test",
"info": ImportState.DONE,
},
"groups": [
{
"id": 1,
"info": ImportState.GENERATED,
"value": "group1",
}
],
"gender": {
"id": 1,
"info": ImportState.DONE,
"value": "male",
},
"default_password": {
"value": "secret",
"info": ImportState.DONE,
},
},
}
],
},
},
)

def test_json_upload_locked_meeting(self) -> None:
self.base_locked_out_superadmin_permission_test(
{},
Expand Down