2170 introduce gender model #2485

hjanott · 2024-06-21T13:18:36Z

Themes to check:

meeting export: export only the gender string per user.
meeting import: import the gender only for users that need to be created.
save_saml_account-Action: saml_attr_mapping field continue to use gender:gender mapping. In the action we have to transform the gender-string to an existing or new gender_id and update the user. Always create not existing gender-instances. An action-payload without gender-field may change nothing, a gender-field with an empty string should be interpreted as "no gender value wanted" and the user's gender_id should be set to NULL. @rrenkert @Elblinator hope you agree
user.create/update: now uses gender_id in payload instead of gender as string. Must be also changed in client.
set null in user and organization on deletion of gender-instances

…rganiziation

r-peschke

See comments in migration code.
With help of the openslides-datastore-service pull request 368 it will be easier to write the migration.

docs/actions/organization.update.md

openslides_backend/migrations/migrations/0054_introduce_flexible_gender_model.py

Elblinator

Please change the permission from can_manage_organization to can_manage_accounts to edit/delete or update a gender

hjanott · 2024-06-27T11:18:07Z

can_manage_accounts

I will use can_manage_users instead. ;)

openslides_backend/migrations/migrations/0054_introduce_flexible_gender_model.py

openslides_backend/action/actions/meeting/import_.py

r-peschke · 2024-07-04T09:12:40Z

tests/system/action/meeting/test_import.py

+                "gender/1": {"name": "male"},
+                "gender/2": {"name": "female"},
+                "gender/3": {"name": "diverse"},
+                "gender/4": {"name": "non-binary"},


Amend an existing test: explicit test for the field gender being empty after importing a new user

I used test_all_migrations for this.

r-peschke · 2024-07-04T16:15:04Z

openslides_backend/action/actions/user/user_mixins.py

+) -> dict[str, int] | None:
+    """returns gender as a dict of "name" and "id" if it exists, otherwise raises ActionException"""
+    if gender_id := instance.get("gender_id"):
+        gender_dict = datastore.get_all("gender", ["id", "name"], lock_result=False)


use a simple self.datastore.get("gender", gender_id,...) to read the gender instance.

I use the fqid to get the gender now.

r-peschke · 2024-07-04T16:22:19Z

openslides_backend/action/actions/user/user_mixins.py

-                )
+def check_gender_exists(
+    datastore: DatastoreService, instance: dict[str, Any]
+) -> dict[str, int] | None:


don't return anything, it is never used

r-peschke · 2024-07-05T13:13:42Z

tests/system/action/user/test_save_saml_account.py

@@ -29,7 +29,7 @@ def setUp(self) -> None:
                        "first_name": "firstName",
                        "last_name": "lastName",
                        "email": "email",
-                        "gender": "gender",
+                        "gender_id": "gender_id",


revert to gender:gender

openslides_backend/action/actions/user/merge_together.py

r-peschke · 2024-07-05T13:21:08Z

tests/system/action/organization/test_update.py

@@ -12,7 +12,7 @@ class OrganizationUpdateActionTest(BaseActionTestCase):
        "first_name": "firstName",
        "last_name": "lastName",
        "email": "email",
-        "gender": "gender",
+        "gender_id": "gender_id",


revert to gender:gender

r-peschke

Just 2 little things in documentation.
I'll try to solve the user update problem.

r-peschke · 2024-09-02T13:46:21Z

docs/actions/gender.delete.md

+```
+
+## Action
+Deletes the gender.


Add some text like The first 4 gender names are fixed and cannot be changed or delete.

r-peschke · 2024-09-02T13:46:49Z

docs/actions/gender.update.md

+```
+
+## Action
+Updates the gender if a gender with that name doesn't exist.


Also add some text like The first 4 gender names are fixed and cannot be changed or delete

…e import without any new genders would result in exception.

hjanott · 2024-09-05T16:00:57Z

I'll try to solve the user update problem.

Thank you. That was really helpful. I didn't think of adding it to the org like this.

reiterl · 2024-09-11T06:31:05Z

Notice: Needs to be updated, to work with my pr in client.

r-peschke

LGTM

openslides_backend/action/actions/user/merge_together.py

r-peschke

No changes anymore by merging main

* draft create update delete + tests + testupdates + migration * update meta rep * general error removal and improvement for draft * remove meeting import error * update meeting import so that checker removes gender_id * general code improvements delete gender checks for back relation in organiziation * md documentation + pleasing mypy * use defaultdict * use new in memory flag of datastore * fix mypy error by upping datastore version * change the permission from can_manage_organization to can_manage_users * improve documentation * lock result false + no orga check * add test for gender import * make name and org id required * Use gender string for saml and meeting import. Refine gender actions and mixin. General code improvements. * cleanup and documentation improvement * beautify code * add test update gender on user merge. * update docs test for meeting import and saml account (+ new test) create gender for saml accounts * updated meta * meeting import create user with gender. export gender strings. improve tests. * Separate test for gender on meeting import. General code improvements in saml, export, import and migration plus additional test for empty string. * extend test for gender import, plus fixes. docs update * improve user and gender updates/creation * Gender will not be created without being used anymore. Fix error where import without any new genders would result in exception. * Improve gender action documentation * fixed typo in migration gender female * update meta --------- Co-authored-by: Ralf Peschke <ralf.peschke@intevation.de> Co-authored-by: rrenkert <raimund@renkert.org>

hjanott added 2 commits June 21, 2024 14:55

draft create update delete + tests + testupdates + migration

3e4b85d

update meta rep

36f1d70

hjanott added feature migration Introduces a new migration labels Jun 21, 2024

hjanott added this to the 4.2 milestone Jun 21, 2024

hjanott requested a review from r-peschke June 21, 2024 13:18

hjanott assigned hjanott and r-peschke Jun 21, 2024

hjanott marked this pull request as ready for review June 21, 2024 13:57

hjanott marked this pull request as draft June 21, 2024 14:17

hjanott added 7 commits June 21, 2024 16:35

general error removal and improvement for draft

a025ba2

remove meeting import error

275aed2

update meeting import so that checker removes gender_id

9a79a5e

general code improvements delete gender checks for back relation in o…

42b63b6

…rganiziation

md documentation + pleasing mypy

b4f9e8f

merge upstream main

9162ee6

Merge commit 'b1d1e6fd' into 2170_introduce_gender_model

6e74b9c

r-peschke requested changes Jun 26, 2024

View reviewed changes

hjanott added 3 commits June 26, 2024 17:56

use defaultdict

8dfbd80

use new in memory flag of datastore

c356c42

fix mypy error by upping datastore version

468f9eb

Elblinator reviewed Jun 27, 2024

View reviewed changes

hjanott added 3 commits June 27, 2024 13:20

change the permission from can_manage_organization to can_manage_users

87dfb9e

improve documentation

3aec96d

lock result false + no orga check

21addc2

r-peschke mentioned this pull request Jul 5, 2024

remove statutes (amendments) #2506

Merged

add test for gender import

443cb58

r-peschke requested changes Jul 5, 2024

View reviewed changes

make name and org id required

773582b

r-peschke removed their assignment Aug 28, 2024

update meta repo

92fa165

r-peschke requested changes Sep 3, 2024

View reviewed changes

r-peschke and others added 2 commits September 4, 2024 14:01

improve user and gender updates/creation

5b26bf1

Gender will not be created without being used anymore. Fix error wher…

20b6d5c

…e import without any new genders would result in exception.

hjanott requested a review from r-peschke September 5, 2024 15:55

Improve gender action documentation

ee2cff4

hjanott assigned r-peschke Sep 6, 2024

fixed typo in migration gender female

033ebde

reiterl mentioned this pull request Sep 11, 2024

Customizable gender field OpenSlides/openslides-client#4027

Merged

Merge main and update migration index.

e922d46

r-peschke approved these changes Sep 18, 2024

View reviewed changes

openslides_backend/action/actions/user/merge_together.py Show resolved Hide resolved

r-peschke removed their assignment Sep 18, 2024

r-peschke self-requested a review September 18, 2024 12:25

r-peschke approved these changes Sep 18, 2024

View reviewed changes

hjanott and others added 5 commits September 19, 2024 11:14

Merge branch 'main' into 2170_introduce_gender_model

9b51eff

Merge branch 'main' into 2170_introduce_gender_model

13aa7b6

update meta

8a4a6fd

merge upstream main

fa6aa20

Merge branch 'main' into 2170_introduce_gender_model

2b85c6e

rrenkert added this pull request to the merge queue Sep 27, 2024

hjanott removed this pull request from the merge queue due to a manual request Sep 27, 2024

move to upstream main

798c49b

rrenkert enabled auto-merge September 27, 2024 13:53

rrenkert added this pull request to the merge queue Sep 27, 2024

Merged via the queue into OpenSlides:main with commit 221e2d8 Sep 27, 2024
5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

2170 introduce gender model #2485

2170 introduce gender model #2485

hjanott commented Jun 21, 2024 •

edited

Loading

r-peschke left a comment

Elblinator left a comment

hjanott commented Jun 27, 2024 •

edited

Loading

r-peschke Jul 4, 2024

hjanott Jul 30, 2024 •

edited

Loading

r-peschke Jul 4, 2024

hjanott Aug 1, 2024

r-peschke Jul 4, 2024

hjanott Aug 1, 2024

r-peschke Jul 5, 2024

hjanott Aug 1, 2024

r-peschke Jul 5, 2024

hjanott Aug 1, 2024

r-peschke left a comment

r-peschke Sep 2, 2024

hjanott Sep 5, 2024

r-peschke Sep 2, 2024

hjanott Sep 5, 2024

hjanott commented Sep 5, 2024

reiterl commented Sep 11, 2024

r-peschke left a comment

r-peschke left a comment

2170 introduce gender model #2485

2170 introduce gender model #2485

Conversation

hjanott commented Jun 21, 2024 • edited Loading

r-peschke left a comment

Choose a reason for hiding this comment

Elblinator left a comment

Choose a reason for hiding this comment

hjanott commented Jun 27, 2024 • edited Loading

Choose a reason for hiding this comment

hjanott Jul 30, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

r-peschke left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hjanott commented Sep 5, 2024

reiterl commented Sep 11, 2024

r-peschke left a comment

Choose a reason for hiding this comment

r-peschke left a comment

Choose a reason for hiding this comment

hjanott commented Jun 21, 2024 •

edited

Loading

hjanott commented Jun 27, 2024 •

edited

Loading

hjanott Jul 30, 2024 •

edited

Loading