From 66599903bfb7c769c6df20ba764c1f8783c21a1b Mon Sep 17 00:00:00 2001 From: Oskar Hahn Date: Thu, 9 Jul 2026 18:11:44 +0200 Subject: [PATCH] go generate --- datastore/dsfetch/fields_generated.go | 17 +- datastore/dskey/gen_collection_fields.go | 1147 ++++++++++---------- datastore/dsmodels/models_generated.go | 15 +- datastore/field_def.go | 4 +- datastore/pgtest/sql/schema_relational.sql | 45 +- meta | 2 +- metagen/field_def.go | 7 +- 7 files changed, 637 insertions(+), 600 deletions(-) diff --git a/datastore/dsfetch/fields_generated.go b/datastore/dsfetch/fields_generated.go index 8804da908..e3d29ea8a 100644 --- a/datastore/dsfetch/fields_generated.go +++ b/datastore/dsfetch/fields_generated.go @@ -2381,13 +2381,13 @@ func (r *Fetch) MeetingUser_UserID(meetingUserID int) *ValueInt { return &ValueInt{fetch: r, key: key, required: true} } -func (r *Fetch) MeetingUser_VoteDelegatedToID(meetingUserID int) *ValueMaybeInt { - key, err := dskey.FromParts("meeting_user", meetingUserID, "vote_delegated_to_id") +func (r *Fetch) MeetingUser_VoteDelegatedToIDs(meetingUserID int) *ValueIntSlice { + key, err := dskey.FromParts("meeting_user", meetingUserID, "vote_delegated_to_ids") if err != nil { - return &ValueMaybeInt{err: err} + return &ValueIntSlice{err: err} } - return &ValueMaybeInt{fetch: r, key: key} + return &ValueIntSlice{fetch: r, key: key} } func (r *Fetch) MeetingUser_VoteDelegationsFromIDs(meetingUserID int) *ValueIntSlice { @@ -4550,6 +4550,15 @@ func (r *Fetch) Meeting_UsersPdfWlanSsid(meetingID int) *ValueString { return &ValueString{fetch: r, key: key} } +func (r *Fetch) Meeting_UsersVoteDelegationsMaxAmount(meetingID int) *ValueInt { + key, err := dskey.FromParts("meeting", meetingID, "users_vote_delegations_max_amount") + if err != nil { + return &ValueInt{err: err} + } + + return &ValueInt{fetch: r, key: key} +} + func (r *Fetch) Meeting_WelcomeText(meetingID int) *ValueString { key, err := dskey.FromParts("meeting", meetingID, "welcome_text") if err != nil { diff --git a/datastore/dskey/gen_collection_fields.go b/datastore/dskey/gen_collection_fields.go index 3b6c44ab4..f1545b7ba 100644 --- a/datastore/dskey/gen_collection_fields.go +++ b/datastore/dskey/gen_collection_fields.go @@ -403,6 +403,7 @@ var collectionFields = [...]collectionField{ {"meeting", "users_pdf_wlan_encryption"}, {"meeting", "users_pdf_wlan_password"}, {"meeting", "users_pdf_wlan_ssid"}, + {"meeting", "users_vote_delegations_max_amount"}, {"meeting", "welcome_text"}, {"meeting", "welcome_title"}, {"meeting_mediafile", "A"}, @@ -457,7 +458,7 @@ var collectionFields = [...]collectionField{ {"meeting_user", "speaker_ids"}, {"meeting_user", "structure_level_ids"}, {"meeting_user", "user_id"}, - {"meeting_user", "vote_delegated_to_id"}, + {"meeting_user", "vote_delegated_to_ids"}, {"meeting_user", "vote_delegations_from_ids"}, {"meeting_user", "vote_weight"}, {"motion", "A"}, @@ -1778,1148 +1779,1150 @@ func collectionFieldToID(cf string) int { return 399 case "meeting/users_pdf_wlan_ssid": return 400 - case "meeting/welcome_text": + case "meeting/users_vote_delegations_max_amount": return 401 - case "meeting/welcome_title": + case "meeting/welcome_text": return 402 - case "meeting_mediafile/A": + case "meeting/welcome_title": return 403 - case "meeting_mediafile/access_group_ids": + case "meeting_mediafile/A": return 404 - case "meeting_mediafile/attachment_ids": + case "meeting_mediafile/access_group_ids": return 405 - case "meeting_mediafile/id": + case "meeting_mediafile/attachment_ids": return 406 - case "meeting_mediafile/inherited_access_group_ids": + case "meeting_mediafile/id": return 407 - case "meeting_mediafile/is_public": + case "meeting_mediafile/inherited_access_group_ids": return 408 - case "meeting_mediafile/list_of_speakers_id": + case "meeting_mediafile/is_public": return 409 - case "meeting_mediafile/mediafile_id": + case "meeting_mediafile/list_of_speakers_id": return 410 - case "meeting_mediafile/meeting_id": + case "meeting_mediafile/mediafile_id": return 411 - case "meeting_mediafile/projection_ids": + case "meeting_mediafile/meeting_id": return 412 - case "meeting_mediafile/used_as_font_bold_in_meeting_id": + case "meeting_mediafile/projection_ids": return 413 - case "meeting_mediafile/used_as_font_bold_italic_in_meeting_id": + case "meeting_mediafile/used_as_font_bold_in_meeting_id": return 414 - case "meeting_mediafile/used_as_font_chyron_speaker_name_in_meeting_id": + case "meeting_mediafile/used_as_font_bold_italic_in_meeting_id": return 415 - case "meeting_mediafile/used_as_font_italic_in_meeting_id": + case "meeting_mediafile/used_as_font_chyron_speaker_name_in_meeting_id": return 416 - case "meeting_mediafile/used_as_font_monospace_in_meeting_id": + case "meeting_mediafile/used_as_font_italic_in_meeting_id": return 417 - case "meeting_mediafile/used_as_font_projector_h1_in_meeting_id": + case "meeting_mediafile/used_as_font_monospace_in_meeting_id": return 418 - case "meeting_mediafile/used_as_font_projector_h2_in_meeting_id": + case "meeting_mediafile/used_as_font_projector_h1_in_meeting_id": return 419 - case "meeting_mediafile/used_as_font_regular_in_meeting_id": + case "meeting_mediafile/used_as_font_projector_h2_in_meeting_id": return 420 - case "meeting_mediafile/used_as_logo_pdf_ballot_paper_in_meeting_id": + case "meeting_mediafile/used_as_font_regular_in_meeting_id": return 421 - case "meeting_mediafile/used_as_logo_pdf_footer_l_in_meeting_id": + case "meeting_mediafile/used_as_logo_pdf_ballot_paper_in_meeting_id": return 422 - case "meeting_mediafile/used_as_logo_pdf_footer_r_in_meeting_id": + case "meeting_mediafile/used_as_logo_pdf_footer_l_in_meeting_id": return 423 - case "meeting_mediafile/used_as_logo_pdf_header_l_in_meeting_id": + case "meeting_mediafile/used_as_logo_pdf_footer_r_in_meeting_id": return 424 - case "meeting_mediafile/used_as_logo_pdf_header_r_in_meeting_id": + case "meeting_mediafile/used_as_logo_pdf_header_l_in_meeting_id": return 425 - case "meeting_mediafile/used_as_logo_projector_header_in_meeting_id": + case "meeting_mediafile/used_as_logo_pdf_header_r_in_meeting_id": return 426 - case "meeting_mediafile/used_as_logo_projector_main_in_meeting_id": + case "meeting_mediafile/used_as_logo_projector_header_in_meeting_id": return 427 - case "meeting_mediafile/used_as_logo_web_header_in_meeting_id": + case "meeting_mediafile/used_as_logo_projector_main_in_meeting_id": return 428 - case "meeting_user/A": + case "meeting_mediafile/used_as_logo_web_header_in_meeting_id": return 429 - case "meeting_user/B": + case "meeting_user/A": return 430 - case "meeting_user/C": + case "meeting_user/B": return 431 - case "meeting_user/D": + case "meeting_user/C": return 432 - case "meeting_user/E": + case "meeting_user/D": return 433 - case "meeting_user/about_me": + case "meeting_user/E": return 434 - case "meeting_user/acting_ballot_ids": + case "meeting_user/about_me": return 435 - case "meeting_user/assignment_candidate_ids": + case "meeting_user/acting_ballot_ids": return 436 - case "meeting_user/chat_message_ids": + case "meeting_user/assignment_candidate_ids": return 437 - case "meeting_user/comment": + case "meeting_user/chat_message_ids": return 438 - case "meeting_user/group_ids": + case "meeting_user/comment": return 439 - case "meeting_user/id": + case "meeting_user/group_ids": return 440 - case "meeting_user/locked_out": + case "meeting_user/id": return 441 - case "meeting_user/meeting_id": + case "meeting_user/locked_out": return 442 - case "meeting_user/motion_editor_ids": + case "meeting_user/meeting_id": return 443 - case "meeting_user/motion_submitter_ids": + case "meeting_user/motion_editor_ids": return 444 - case "meeting_user/motion_supporter_ids": + case "meeting_user/motion_submitter_ids": return 445 - case "meeting_user/motion_working_group_speaker_ids": + case "meeting_user/motion_supporter_ids": return 446 - case "meeting_user/number": + case "meeting_user/motion_working_group_speaker_ids": return 447 - case "meeting_user/personal_note_ids": + case "meeting_user/number": return 448 - case "meeting_user/poll_option_ids": + case "meeting_user/personal_note_ids": return 449 - case "meeting_user/poll_voted_ids": + case "meeting_user/poll_option_ids": return 450 - case "meeting_user/represented_ballot_ids": + case "meeting_user/poll_voted_ids": return 451 - case "meeting_user/speaker_ids": + case "meeting_user/represented_ballot_ids": return 452 - case "meeting_user/structure_level_ids": + case "meeting_user/speaker_ids": return 453 - case "meeting_user/user_id": + case "meeting_user/structure_level_ids": return 454 - case "meeting_user/vote_delegated_to_id": + case "meeting_user/user_id": return 455 - case "meeting_user/vote_delegations_from_ids": + case "meeting_user/vote_delegated_to_ids": return 456 - case "meeting_user/vote_weight": + case "meeting_user/vote_delegations_from_ids": return 457 - case "motion/A": + case "meeting_user/vote_weight": return 458 - case "motion/B": + case "motion/A": return 459 - case "motion/C": + case "motion/B": return 460 - case "motion/D": + case "motion/C": return 461 - case "motion/E": + case "motion/D": return 462 - case "motion/additional_submitter": + case "motion/E": return 463 - case "motion/agenda_item_id": + case "motion/additional_submitter": return 464 - case "motion/all_derived_motion_ids": + case "motion/agenda_item_id": return 465 - case "motion/all_origin_ids": + case "motion/all_derived_motion_ids": return 466 - case "motion/amendment_ids": + case "motion/all_origin_ids": return 467 - case "motion/amendment_paragraphs": + case "motion/amendment_ids": return 468 - case "motion/attachment_meeting_mediafile_ids": + case "motion/amendment_paragraphs": return 469 - case "motion/block_id": + case "motion/attachment_meeting_mediafile_ids": return 470 - case "motion/category_id": + case "motion/block_id": return 471 - case "motion/category_weight": + case "motion/category_id": return 472 - case "motion/change_recommendation_ids": + case "motion/category_weight": return 473 - case "motion/comment_ids": + case "motion/change_recommendation_ids": return 474 - case "motion/created": + case "motion/comment_ids": return 475 - case "motion/derived_motion_ids": + case "motion/created": return 476 - case "motion/diff_version": + case "motion/derived_motion_ids": return 477 - case "motion/editor_ids": + case "motion/diff_version": return 478 - case "motion/forwarded": + case "motion/editor_ids": return 479 - case "motion/history_entry_ids": + case "motion/forwarded": return 480 - case "motion/id": + case "motion/history_entry_ids": return 481 - case "motion/identical_motion_ids": + case "motion/id": return 482 - case "motion/last_modified": + case "motion/identical_motion_ids": return 483 - case "motion/lead_motion_id": + case "motion/last_modified": return 484 - case "motion/list_of_speakers_id": + case "motion/lead_motion_id": return 485 - case "motion/marked_forwarded": + case "motion/list_of_speakers_id": return 486 - case "motion/meeting_id": + case "motion/marked_forwarded": return 487 - case "motion/modified_final_version": + case "motion/meeting_id": return 488 - case "motion/number": + case "motion/modified_final_version": return 489 - case "motion/number_value": + case "motion/number": return 490 - case "motion/origin_id": + case "motion/number_value": return 491 - case "motion/origin_meeting_id": + case "motion/origin_id": return 492 - case "motion/personal_note_ids": + case "motion/origin_meeting_id": return 493 - case "motion/poll_ids": + case "motion/personal_note_ids": return 494 - case "motion/projection_ids": + case "motion/poll_ids": return 495 - case "motion/reason": + case "motion/projection_ids": return 496 - case "motion/recommendation_extension": + case "motion/reason": return 497 - case "motion/recommendation_extension_reference_ids": + case "motion/recommendation_extension": return 498 - case "motion/recommendation_id": + case "motion/recommendation_extension_reference_ids": return 499 - case "motion/referenced_in_motion_recommendation_extension_ids": + case "motion/recommendation_id": return 500 - case "motion/referenced_in_motion_state_extension_ids": + case "motion/referenced_in_motion_recommendation_extension_ids": return 501 - case "motion/sequential_number": + case "motion/referenced_in_motion_state_extension_ids": return 502 - case "motion/sort_child_ids": + case "motion/sequential_number": return 503 - case "motion/sort_parent_id": + case "motion/sort_child_ids": return 504 - case "motion/sort_weight": + case "motion/sort_parent_id": return 505 - case "motion/start_line_number": + case "motion/sort_weight": return 506 - case "motion/state_extension": + case "motion/start_line_number": return 507 - case "motion/state_extension_reference_ids": + case "motion/state_extension": return 508 - case "motion/state_id": + case "motion/state_extension_reference_ids": return 509 - case "motion/submitter_ids": + case "motion/state_id": return 510 - case "motion/supporter_ids": + case "motion/submitter_ids": return 511 - case "motion/tag_ids": + case "motion/supporter_ids": return 512 - case "motion/text": + case "motion/tag_ids": return 513 - case "motion/text_hash": + case "motion/text": return 514 - case "motion/title": + case "motion/text_hash": return 515 - case "motion/workflow_timestamp": + case "motion/title": return 516 - case "motion/working_group_speaker_ids": + case "motion/workflow_timestamp": return 517 - case "motion_block/A": + case "motion/working_group_speaker_ids": return 518 - case "motion_block/agenda_item_id": + case "motion_block/A": return 519 - case "motion_block/id": + case "motion_block/agenda_item_id": return 520 - case "motion_block/internal": + case "motion_block/id": return 521 - case "motion_block/list_of_speakers_id": + case "motion_block/internal": return 522 - case "motion_block/meeting_id": + case "motion_block/list_of_speakers_id": return 523 - case "motion_block/motion_ids": + case "motion_block/meeting_id": return 524 - case "motion_block/projection_ids": + case "motion_block/motion_ids": return 525 - case "motion_block/sequential_number": + case "motion_block/projection_ids": return 526 - case "motion_block/title": + case "motion_block/sequential_number": return 527 - case "motion_category/A": + case "motion_block/title": return 528 - case "motion_category/child_ids": + case "motion_category/A": return 529 - case "motion_category/id": + case "motion_category/child_ids": return 530 - case "motion_category/level": + case "motion_category/id": return 531 - case "motion_category/meeting_id": + case "motion_category/level": return 532 - case "motion_category/motion_ids": + case "motion_category/meeting_id": return 533 - case "motion_category/name": + case "motion_category/motion_ids": return 534 - case "motion_category/parent_id": + case "motion_category/name": return 535 - case "motion_category/prefix": + case "motion_category/parent_id": return 536 - case "motion_category/sequential_number": + case "motion_category/prefix": return 537 - case "motion_category/weight": + case "motion_category/sequential_number": return 538 - case "motion_change_recommendation/A": + case "motion_category/weight": return 539 - case "motion_change_recommendation/creation_time": + case "motion_change_recommendation/A": return 540 - case "motion_change_recommendation/id": + case "motion_change_recommendation/creation_time": return 541 - case "motion_change_recommendation/internal": + case "motion_change_recommendation/id": return 542 - case "motion_change_recommendation/line_from": + case "motion_change_recommendation/internal": return 543 - case "motion_change_recommendation/line_to": + case "motion_change_recommendation/line_from": return 544 - case "motion_change_recommendation/meeting_id": + case "motion_change_recommendation/line_to": return 545 - case "motion_change_recommendation/motion_id": + case "motion_change_recommendation/meeting_id": return 546 - case "motion_change_recommendation/other_description": + case "motion_change_recommendation/motion_id": return 547 - case "motion_change_recommendation/rejected": + case "motion_change_recommendation/other_description": return 548 - case "motion_change_recommendation/text": + case "motion_change_recommendation/rejected": return 549 - case "motion_change_recommendation/type": + case "motion_change_recommendation/text": return 550 - case "motion_comment/A": + case "motion_change_recommendation/type": return 551 - case "motion_comment/comment": + case "motion_comment/A": return 552 - case "motion_comment/id": + case "motion_comment/comment": return 553 - case "motion_comment/meeting_id": + case "motion_comment/id": return 554 - case "motion_comment/motion_id": + case "motion_comment/meeting_id": return 555 - case "motion_comment/section_id": + case "motion_comment/motion_id": return 556 - case "motion_comment_section/A": + case "motion_comment/section_id": return 557 - case "motion_comment_section/comment_ids": + case "motion_comment_section/A": return 558 - case "motion_comment_section/id": + case "motion_comment_section/comment_ids": return 559 - case "motion_comment_section/meeting_id": + case "motion_comment_section/id": return 560 - case "motion_comment_section/name": + case "motion_comment_section/meeting_id": return 561 - case "motion_comment_section/read_group_ids": + case "motion_comment_section/name": return 562 - case "motion_comment_section/sequential_number": + case "motion_comment_section/read_group_ids": return 563 - case "motion_comment_section/submitter_can_write": + case "motion_comment_section/sequential_number": return 564 - case "motion_comment_section/weight": + case "motion_comment_section/submitter_can_write": return 565 - case "motion_comment_section/write_group_ids": + case "motion_comment_section/weight": return 566 - case "motion_editor/A": + case "motion_comment_section/write_group_ids": return 567 - case "motion_editor/id": + case "motion_editor/A": return 568 - case "motion_editor/meeting_id": + case "motion_editor/id": return 569 - case "motion_editor/meeting_user_id": + case "motion_editor/meeting_id": return 570 - case "motion_editor/motion_id": + case "motion_editor/meeting_user_id": return 571 - case "motion_editor/weight": + case "motion_editor/motion_id": return 572 - case "motion_state/A": + case "motion_editor/weight": return 573 - case "motion_state/allow_amendment_forwarding": + case "motion_state/A": return 574 - case "motion_state/allow_create_poll": + case "motion_state/allow_amendment_forwarding": return 575 - case "motion_state/allow_motion_forwarding": + case "motion_state/allow_create_poll": return 576 - case "motion_state/allow_submitter_edit": + case "motion_state/allow_motion_forwarding": return 577 - case "motion_state/allow_support": + case "motion_state/allow_submitter_edit": return 578 - case "motion_state/css_class": + case "motion_state/allow_support": return 579 - case "motion_state/first_state_of_workflow_id": + case "motion_state/css_class": return 580 - case "motion_state/id": + case "motion_state/first_state_of_workflow_id": return 581 - case "motion_state/is_internal": + case "motion_state/id": return 582 - case "motion_state/meeting_id": + case "motion_state/is_internal": return 583 - case "motion_state/merge_amendment_into_final": + case "motion_state/meeting_id": return 584 - case "motion_state/motion_ids": + case "motion_state/merge_amendment_into_final": return 585 - case "motion_state/motion_recommendation_ids": + case "motion_state/motion_ids": return 586 - case "motion_state/name": + case "motion_state/motion_recommendation_ids": return 587 - case "motion_state/next_state_ids": + case "motion_state/name": return 588 - case "motion_state/previous_state_ids": + case "motion_state/next_state_ids": return 589 - case "motion_state/recommendation_label": + case "motion_state/previous_state_ids": return 590 - case "motion_state/restrictions": + case "motion_state/recommendation_label": return 591 - case "motion_state/set_number": + case "motion_state/restrictions": return 592 - case "motion_state/set_workflow_timestamp": + case "motion_state/set_number": return 593 - case "motion_state/show_recommendation_extension_field": + case "motion_state/set_workflow_timestamp": return 594 - case "motion_state/show_state_extension_field": + case "motion_state/show_recommendation_extension_field": return 595 - case "motion_state/state_button_label": + case "motion_state/show_state_extension_field": return 596 - case "motion_state/submitter_withdraw_back_ids": + case "motion_state/state_button_label": return 597 - case "motion_state/submitter_withdraw_state_id": + case "motion_state/submitter_withdraw_back_ids": return 598 - case "motion_state/weight": + case "motion_state/submitter_withdraw_state_id": return 599 - case "motion_state/workflow_id": + case "motion_state/weight": return 600 - case "motion_submitter/A": + case "motion_state/workflow_id": return 601 - case "motion_submitter/id": + case "motion_submitter/A": return 602 - case "motion_submitter/meeting_id": + case "motion_submitter/id": return 603 - case "motion_submitter/meeting_user_id": + case "motion_submitter/meeting_id": return 604 - case "motion_submitter/motion_id": + case "motion_submitter/meeting_user_id": return 605 - case "motion_submitter/weight": + case "motion_submitter/motion_id": return 606 - case "motion_supporter/A": + case "motion_submitter/weight": return 607 - case "motion_supporter/id": + case "motion_supporter/A": return 608 - case "motion_supporter/meeting_id": + case "motion_supporter/id": return 609 - case "motion_supporter/meeting_user_id": + case "motion_supporter/meeting_id": return 610 - case "motion_supporter/motion_id": + case "motion_supporter/meeting_user_id": return 611 - case "motion_workflow/A": + case "motion_supporter/motion_id": return 612 - case "motion_workflow/default_amendment_workflow_meeting_id": + case "motion_workflow/A": return 613 - case "motion_workflow/default_workflow_meeting_id": + case "motion_workflow/default_amendment_workflow_meeting_id": return 614 - case "motion_workflow/first_state_id": + case "motion_workflow/default_workflow_meeting_id": return 615 - case "motion_workflow/id": + case "motion_workflow/first_state_id": return 616 - case "motion_workflow/meeting_id": + case "motion_workflow/id": return 617 - case "motion_workflow/name": + case "motion_workflow/meeting_id": return 618 - case "motion_workflow/sequential_number": + case "motion_workflow/name": return 619 - case "motion_workflow/state_ids": + case "motion_workflow/sequential_number": return 620 - case "motion_working_group_speaker/A": + case "motion_workflow/state_ids": return 621 - case "motion_working_group_speaker/id": + case "motion_working_group_speaker/A": return 622 - case "motion_working_group_speaker/meeting_id": + case "motion_working_group_speaker/id": return 623 - case "motion_working_group_speaker/meeting_user_id": + case "motion_working_group_speaker/meeting_id": return 624 - case "motion_working_group_speaker/motion_id": + case "motion_working_group_speaker/meeting_user_id": return 625 - case "motion_working_group_speaker/weight": + case "motion_working_group_speaker/motion_id": return 626 - case "organization/A": + case "motion_working_group_speaker/weight": return 627 - case "organization/B": + case "organization/A": return 628 - case "organization/C": + case "organization/B": return 629 - case "organization/D": + case "organization/C": return 630 - case "organization/E": + case "organization/D": return 631 - case "organization/active_meeting_ids": + case "organization/E": return 632 - case "organization/archived_meeting_ids": + case "organization/active_meeting_ids": return 633 - case "organization/committee_ids": + case "organization/archived_meeting_ids": return 634 - case "organization/default_language": + case "organization/committee_ids": return 635 - case "organization/description": + case "organization/default_language": return 636 - case "organization/disable_forward_with_attachments": + case "organization/description": return 637 - case "organization/enable_anonymous": + case "organization/disable_forward_with_attachments": return 638 - case "organization/enable_chat": + case "organization/enable_anonymous": return 639 - case "organization/enable_electronic_voting": + case "organization/enable_chat": return 640 - case "organization/gender_ids": + case "organization/enable_electronic_voting": return 641 - case "organization/id": + case "organization/gender_ids": return 642 - case "organization/legal_notice": + case "organization/id": return 643 - case "organization/limit_of_meetings": + case "organization/legal_notice": return 644 - case "organization/limit_of_users": + case "organization/limit_of_meetings": return 645 - case "organization/login_text": + case "organization/limit_of_users": return 646 - case "organization/mediafile_ids": + case "organization/login_text": return 647 - case "organization/name": + case "organization/mediafile_ids": return 648 - case "organization/organization_tag_ids": + case "organization/name": return 649 - case "organization/privacy_policy": + case "organization/organization_tag_ids": return 650 - case "organization/published_mediafile_ids": + case "organization/privacy_policy": return 651 - case "organization/require_duplicate_from": + case "organization/published_mediafile_ids": return 652 - case "organization/reset_password_verbose_errors": + case "organization/require_duplicate_from": return 653 - case "organization/restrict_edit_forward_committees": + case "organization/reset_password_verbose_errors": return 654 - case "organization/restrict_editing_same_level_committee_admins": + case "organization/restrict_edit_forward_committees": return 655 - case "organization/saml_attr_mapping": + case "organization/restrict_editing_same_level_committee_admins": return 656 - case "organization/saml_enabled": + case "organization/saml_attr_mapping": return 657 - case "organization/saml_login_button_text": + case "organization/saml_enabled": return 658 - case "organization/saml_metadata_idp": + case "organization/saml_login_button_text": return 659 - case "organization/saml_metadata_sp": + case "organization/saml_metadata_idp": return 660 - case "organization/saml_private_key": + case "organization/saml_metadata_sp": return 661 - case "organization/template_meeting_ids": + case "organization/saml_private_key": return 662 - case "organization/theme_id": + case "organization/template_meeting_ids": return 663 - case "organization/theme_ids": + case "organization/theme_id": return 664 - case "organization/time_zone": + case "organization/theme_ids": return 665 - case "organization/url": + case "organization/time_zone": return 666 - case "organization/user_ids": + case "organization/url": return 667 - case "organization/users_email_body": + case "organization/user_ids": return 668 - case "organization/users_email_replyto": + case "organization/users_email_body": return 669 - case "organization/users_email_sender": + case "organization/users_email_replyto": return 670 - case "organization/users_email_subject": + case "organization/users_email_sender": return 671 - case "organization_tag/A": + case "organization/users_email_subject": return 672 - case "organization_tag/color": + case "organization_tag/A": return 673 - case "organization_tag/id": + case "organization_tag/color": return 674 - case "organization_tag/name": + case "organization_tag/id": return 675 - case "organization_tag/organization_id": + case "organization_tag/name": return 676 - case "organization_tag/tagged_ids": + case "organization_tag/organization_id": return 677 - case "personal_note/A": + case "organization_tag/tagged_ids": return 678 - case "personal_note/content_object_id": + case "personal_note/A": return 679 - case "personal_note/id": + case "personal_note/content_object_id": return 680 - case "personal_note/meeting_id": + case "personal_note/id": return 681 - case "personal_note/meeting_user_id": + case "personal_note/meeting_id": return 682 - case "personal_note/note": + case "personal_note/meeting_user_id": return 683 - case "personal_note/star": + case "personal_note/note": return 684 - case "point_of_order_category/A": + case "personal_note/star": return 685 - case "point_of_order_category/id": + case "point_of_order_category/A": return 686 - case "point_of_order_category/meeting_id": + case "point_of_order_category/id": return 687 - case "point_of_order_category/rank": + case "point_of_order_category/meeting_id": return 688 - case "point_of_order_category/speaker_ids": + case "point_of_order_category/rank": return 689 - case "point_of_order_category/text": + case "point_of_order_category/speaker_ids": return 690 - case "poll/A": + case "point_of_order_category/text": return 691 - case "poll/B": + case "poll/A": return 692 - case "poll/allow_invalid": + case "poll/B": return 693 - case "poll/allow_vote_split": + case "poll/allow_invalid": return 694 - case "poll/anonymized": + case "poll/allow_vote_split": return 695 - case "poll/ballot_ids": + case "poll/anonymized": return 696 - case "poll/config_id": + case "poll/ballot_ids": return 697 - case "poll/content_object_id": + case "poll/config_id": return 698 - case "poll/entitled_group_ids": + case "poll/content_object_id": return 699 - case "poll/history_entry_ids": + case "poll/entitled_group_ids": return 700 - case "poll/id": + case "poll/history_entry_ids": return 701 - case "poll/live_voting_enabled": + case "poll/id": return 702 - case "poll/meeting_id": + case "poll/live_voting_enabled": return 703 - case "poll/option_ids": + case "poll/meeting_id": return 704 - case "poll/projection_ids": + case "poll/option_ids": return 705 - case "poll/published": + case "poll/projection_ids": return 706 - case "poll/result": + case "poll/published": return 707 - case "poll/sequential_number": + case "poll/result": return 708 - case "poll/state": + case "poll/sequential_number": return 709 - case "poll/title": + case "poll/state": return 710 - case "poll/visibility": + case "poll/title": return 711 - case "poll/voted_ids": + case "poll/visibility": return 712 - case "poll_ballot/A": + case "poll/voted_ids": return 713 - case "poll_ballot/B": + case "poll_ballot/A": return 714 - case "poll_ballot/C": + case "poll_ballot/B": return 715 - case "poll_ballot/acting_meeting_user_id": + case "poll_ballot/C": return 716 - case "poll_ballot/id": + case "poll_ballot/acting_meeting_user_id": return 717 - case "poll_ballot/poll_id": + case "poll_ballot/id": return 718 - case "poll_ballot/represented_meeting_user_id": + case "poll_ballot/poll_id": return 719 - case "poll_ballot/split": + case "poll_ballot/represented_meeting_user_id": return 720 - case "poll_ballot/value": + case "poll_ballot/split": return 721 - case "poll_ballot/weight": + case "poll_ballot/value": return 722 - case "poll_config_approval/A": + case "poll_ballot/weight": return 723 - case "poll_config_approval/allow_abstain": + case "poll_config_approval/A": return 724 - case "poll_config_approval/id": + case "poll_config_approval/allow_abstain": return 725 - case "poll_config_approval/onehundred_percent_base": + case "poll_config_approval/id": return 726 - case "poll_config_approval/poll_id": + case "poll_config_approval/onehundred_percent_base": return 727 - case "poll_config_rating_approval/A": + case "poll_config_approval/poll_id": return 728 - case "poll_config_rating_approval/allow_abstain": + case "poll_config_rating_approval/A": return 729 - case "poll_config_rating_approval/id": + case "poll_config_rating_approval/allow_abstain": return 730 - case "poll_config_rating_approval/max_options_amount": + case "poll_config_rating_approval/id": return 731 - case "poll_config_rating_approval/max_yes_amount": + case "poll_config_rating_approval/max_options_amount": return 732 - case "poll_config_rating_approval/min_options_amount": + case "poll_config_rating_approval/max_yes_amount": return 733 - case "poll_config_rating_approval/onehundred_percent_base": + case "poll_config_rating_approval/min_options_amount": return 734 - case "poll_config_rating_approval/poll_id": + case "poll_config_rating_approval/onehundred_percent_base": return 735 - case "poll_config_rating_score/A": + case "poll_config_rating_approval/poll_id": return 736 - case "poll_config_rating_score/id": + case "poll_config_rating_score/A": return 737 - case "poll_config_rating_score/max_options_amount": + case "poll_config_rating_score/id": return 738 - case "poll_config_rating_score/max_vote_sum": + case "poll_config_rating_score/max_options_amount": return 739 - case "poll_config_rating_score/max_votes_per_option": + case "poll_config_rating_score/max_vote_sum": return 740 - case "poll_config_rating_score/min_options_amount": + case "poll_config_rating_score/max_votes_per_option": return 741 - case "poll_config_rating_score/min_vote_sum": + case "poll_config_rating_score/min_options_amount": return 742 - case "poll_config_rating_score/onehundred_percent_base": + case "poll_config_rating_score/min_vote_sum": return 743 - case "poll_config_rating_score/poll_id": + case "poll_config_rating_score/onehundred_percent_base": return 744 - case "poll_config_selection/A": + case "poll_config_rating_score/poll_id": return 745 - case "poll_config_selection/allow_nota": + case "poll_config_selection/A": return 746 - case "poll_config_selection/display_chart": + case "poll_config_selection/allow_nota": return 747 - case "poll_config_selection/id": + case "poll_config_selection/display_chart": return 748 - case "poll_config_selection/max_options_amount": + case "poll_config_selection/id": return 749 - case "poll_config_selection/min_options_amount": + case "poll_config_selection/max_options_amount": return 750 - case "poll_config_selection/onehundred_percent_base": + case "poll_config_selection/min_options_amount": return 751 - case "poll_config_selection/poll_id": + case "poll_config_selection/onehundred_percent_base": return 752 - case "poll_config_selection/strike_out": + case "poll_config_selection/poll_id": return 753 - case "poll_config_stv_scottish/A": + case "poll_config_selection/strike_out": return 754 - case "poll_config_stv_scottish/id": + case "poll_config_stv_scottish/A": return 755 - case "poll_config_stv_scottish/poll_id": + case "poll_config_stv_scottish/id": return 756 - case "poll_config_stv_scottish/posts": + case "poll_config_stv_scottish/poll_id": return 757 - case "poll_option/A": + case "poll_config_stv_scottish/posts": return 758 - case "poll_option/id": + case "poll_option/A": return 759 - case "poll_option/meeting_user_id": + case "poll_option/id": return 760 - case "poll_option/poll_id": + case "poll_option/meeting_user_id": return 761 - case "poll_option/text": + case "poll_option/poll_id": return 762 - case "poll_option/weight": + case "poll_option/text": return 763 - case "projection/A": + case "poll_option/weight": return 764 - case "projection/content_object_id": + case "projection/A": return 765 - case "projection/current_projector_id": + case "projection/content_object_id": return 766 - case "projection/history_projector_id": + case "projection/current_projector_id": return 767 - case "projection/id": + case "projection/history_projector_id": return 768 - case "projection/meeting_id": + case "projection/id": return 769 - case "projection/options": + case "projection/meeting_id": return 770 - case "projection/preview_projector_id": + case "projection/options": return 771 - case "projection/stable": + case "projection/preview_projector_id": return 772 - case "projection/type": + case "projection/stable": return 773 - case "projection/weight": + case "projection/type": return 774 - case "projector/A": + case "projection/weight": return 775 - case "projector/aspect_ratio_denominator": + case "projector/A": return 776 - case "projector/aspect_ratio_numerator": + case "projector/aspect_ratio_denominator": return 777 - case "projector/background_color": + case "projector/aspect_ratio_numerator": return 778 - case "projector/chyron_background_color": + case "projector/background_color": return 779 - case "projector/chyron_background_color_2": + case "projector/chyron_background_color": return 780 - case "projector/chyron_font_color": + case "projector/chyron_background_color_2": return 781 - case "projector/chyron_font_color_2": + case "projector/chyron_font_color": return 782 - case "projector/color": + case "projector/chyron_font_color_2": return 783 - case "projector/current_projection_ids": + case "projector/color": return 784 - case "projector/header_background_color": + case "projector/current_projection_ids": return 785 - case "projector/header_font_color": + case "projector/header_background_color": return 786 - case "projector/header_h1_color": + case "projector/header_font_color": return 787 - case "projector/history_projection_ids": + case "projector/header_h1_color": return 788 - case "projector/id": + case "projector/history_projection_ids": return 789 - case "projector/is_internal": + case "projector/id": return 790 - case "projector/meeting_id": + case "projector/is_internal": return 791 - case "projector/name": + case "projector/meeting_id": return 792 - case "projector/preview_projection_ids": + case "projector/name": return 793 - case "projector/scale": + case "projector/preview_projection_ids": return 794 - case "projector/scroll": + case "projector/scale": return 795 - case "projector/sequential_number": + case "projector/scroll": return 796 - case "projector/show_clock": + case "projector/sequential_number": return 797 - case "projector/show_header_footer": + case "projector/show_clock": return 798 - case "projector/show_logo": + case "projector/show_header_footer": return 799 - case "projector/show_title": + case "projector/show_logo": return 800 - case "projector/used_as_default_projector_for_agenda_item_list_in_meeting_id": + case "projector/show_title": return 801 - case "projector/used_as_default_projector_for_amendment_in_meeting_id": + case "projector/used_as_default_projector_for_agenda_item_list_in_meeting_id": return 802 - case "projector/used_as_default_projector_for_assignment_in_meeting_id": + case "projector/used_as_default_projector_for_amendment_in_meeting_id": return 803 - case "projector/used_as_default_projector_for_assignment_poll_in_meeting_id": + case "projector/used_as_default_projector_for_assignment_in_meeting_id": return 804 - case "projector/used_as_default_projector_for_countdown_in_meeting_id": + case "projector/used_as_default_projector_for_assignment_poll_in_meeting_id": return 805 - case "projector/used_as_default_projector_for_current_los_in_meeting_id": + case "projector/used_as_default_projector_for_countdown_in_meeting_id": return 806 - case "projector/used_as_default_projector_for_list_of_speakers_in_meeting_id": + case "projector/used_as_default_projector_for_current_los_in_meeting_id": return 807 - case "projector/used_as_default_projector_for_mediafile_in_meeting_id": + case "projector/used_as_default_projector_for_list_of_speakers_in_meeting_id": return 808 - case "projector/used_as_default_projector_for_message_in_meeting_id": + case "projector/used_as_default_projector_for_mediafile_in_meeting_id": return 809 - case "projector/used_as_default_projector_for_motion_block_in_meeting_id": + case "projector/used_as_default_projector_for_message_in_meeting_id": return 810 - case "projector/used_as_default_projector_for_motion_in_meeting_id": + case "projector/used_as_default_projector_for_motion_block_in_meeting_id": return 811 - case "projector/used_as_default_projector_for_motion_poll_in_meeting_id": + case "projector/used_as_default_projector_for_motion_in_meeting_id": return 812 - case "projector/used_as_default_projector_for_poll_in_meeting_id": + case "projector/used_as_default_projector_for_motion_poll_in_meeting_id": return 813 - case "projector/used_as_default_projector_for_topic_in_meeting_id": + case "projector/used_as_default_projector_for_poll_in_meeting_id": return 814 - case "projector/used_as_reference_projector_meeting_id": + case "projector/used_as_default_projector_for_topic_in_meeting_id": return 815 - case "projector/width": + case "projector/used_as_reference_projector_meeting_id": return 816 - case "projector_countdown/A": + case "projector/width": return 817 - case "projector_countdown/countdown_time": + case "projector_countdown/A": return 818 - case "projector_countdown/default_time": + case "projector_countdown/countdown_time": return 819 - case "projector_countdown/description": + case "projector_countdown/default_time": return 820 - case "projector_countdown/id": + case "projector_countdown/description": return 821 - case "projector_countdown/meeting_id": + case "projector_countdown/id": return 822 - case "projector_countdown/projection_ids": + case "projector_countdown/meeting_id": return 823 - case "projector_countdown/running": + case "projector_countdown/projection_ids": return 824 - case "projector_countdown/title": + case "projector_countdown/running": return 825 - case "projector_countdown/used_as_list_of_speakers_countdown_meeting_id": + case "projector_countdown/title": return 826 - case "projector_countdown/used_as_poll_countdown_meeting_id": + case "projector_countdown/used_as_list_of_speakers_countdown_meeting_id": return 827 - case "projector_message/A": + case "projector_countdown/used_as_poll_countdown_meeting_id": return 828 - case "projector_message/id": + case "projector_message/A": return 829 - case "projector_message/meeting_id": + case "projector_message/id": return 830 - case "projector_message/message": + case "projector_message/meeting_id": return 831 - case "projector_message/projection_ids": + case "projector_message/message": return 832 - case "speaker/A": + case "projector_message/projection_ids": return 833 - case "speaker/answer": + case "speaker/A": return 834 - case "speaker/begin_time": + case "speaker/answer": return 835 - case "speaker/end_time": + case "speaker/begin_time": return 836 - case "speaker/id": + case "speaker/end_time": return 837 - case "speaker/list_of_speakers_id": + case "speaker/id": return 838 - case "speaker/meeting_id": + case "speaker/list_of_speakers_id": return 839 - case "speaker/meeting_user_id": + case "speaker/meeting_id": return 840 - case "speaker/note": + case "speaker/meeting_user_id": return 841 - case "speaker/pause_time": + case "speaker/note": return 842 - case "speaker/point_of_order": + case "speaker/pause_time": return 843 - case "speaker/point_of_order_category_id": + case "speaker/point_of_order": return 844 - case "speaker/speech_state": + case "speaker/point_of_order_category_id": return 845 - case "speaker/structure_level_list_of_speakers_id": + case "speaker/speech_state": return 846 - case "speaker/total_pause": + case "speaker/structure_level_list_of_speakers_id": return 847 - case "speaker/unpause_time": + case "speaker/total_pause": return 848 - case "speaker/weight": + case "speaker/unpause_time": return 849 - case "structure_level/A": + case "speaker/weight": return 850 - case "structure_level/color": + case "structure_level/A": return 851 - case "structure_level/default_time": + case "structure_level/color": return 852 - case "structure_level/id": + case "structure_level/default_time": return 853 - case "structure_level/meeting_id": + case "structure_level/id": return 854 - case "structure_level/meeting_user_ids": + case "structure_level/meeting_id": return 855 - case "structure_level/name": + case "structure_level/meeting_user_ids": return 856 - case "structure_level/structure_level_list_of_speakers_ids": + case "structure_level/name": return 857 - case "structure_level_list_of_speakers/A": + case "structure_level/structure_level_list_of_speakers_ids": return 858 - case "structure_level_list_of_speakers/additional_time": + case "structure_level_list_of_speakers/A": return 859 - case "structure_level_list_of_speakers/current_start_time": + case "structure_level_list_of_speakers/additional_time": return 860 - case "structure_level_list_of_speakers/id": + case "structure_level_list_of_speakers/current_start_time": return 861 - case "structure_level_list_of_speakers/initial_time": + case "structure_level_list_of_speakers/id": return 862 - case "structure_level_list_of_speakers/list_of_speakers_id": + case "structure_level_list_of_speakers/initial_time": return 863 - case "structure_level_list_of_speakers/meeting_id": + case "structure_level_list_of_speakers/list_of_speakers_id": return 864 - case "structure_level_list_of_speakers/remaining_time": + case "structure_level_list_of_speakers/meeting_id": return 865 - case "structure_level_list_of_speakers/speaker_ids": + case "structure_level_list_of_speakers/remaining_time": return 866 - case "structure_level_list_of_speakers/structure_level_id": + case "structure_level_list_of_speakers/speaker_ids": return 867 - case "tag/A": + case "structure_level_list_of_speakers/structure_level_id": return 868 - case "tag/id": + case "tag/A": return 869 - case "tag/meeting_id": + case "tag/id": return 870 - case "tag/name": + case "tag/meeting_id": return 871 - case "tag/tagged_ids": + case "tag/name": return 872 - case "theme/A": + case "tag/tagged_ids": return 873 - case "theme/abstain": + case "theme/A": return 874 - case "theme/accent_100": + case "theme/abstain": return 875 - case "theme/accent_200": + case "theme/accent_100": return 876 - case "theme/accent_300": + case "theme/accent_200": return 877 - case "theme/accent_400": + case "theme/accent_300": return 878 - case "theme/accent_50": + case "theme/accent_400": return 879 - case "theme/accent_500": + case "theme/accent_50": return 880 - case "theme/accent_600": + case "theme/accent_500": return 881 - case "theme/accent_700": + case "theme/accent_600": return 882 - case "theme/accent_800": + case "theme/accent_700": return 883 - case "theme/accent_900": + case "theme/accent_800": return 884 - case "theme/accent_a100": + case "theme/accent_900": return 885 - case "theme/accent_a200": + case "theme/accent_a100": return 886 - case "theme/accent_a400": + case "theme/accent_a200": return 887 - case "theme/accent_a700": + case "theme/accent_a400": return 888 - case "theme/headbar": + case "theme/accent_a700": return 889 - case "theme/id": + case "theme/headbar": return 890 - case "theme/name": + case "theme/id": return 891 - case "theme/no": + case "theme/name": return 892 - case "theme/organization_id": + case "theme/no": return 893 - case "theme/primary_100": + case "theme/organization_id": return 894 - case "theme/primary_200": + case "theme/primary_100": return 895 - case "theme/primary_300": + case "theme/primary_200": return 896 - case "theme/primary_400": + case "theme/primary_300": return 897 - case "theme/primary_50": + case "theme/primary_400": return 898 - case "theme/primary_500": + case "theme/primary_50": return 899 - case "theme/primary_600": + case "theme/primary_500": return 900 - case "theme/primary_700": + case "theme/primary_600": return 901 - case "theme/primary_800": + case "theme/primary_700": return 902 - case "theme/primary_900": + case "theme/primary_800": return 903 - case "theme/primary_a100": + case "theme/primary_900": return 904 - case "theme/primary_a200": + case "theme/primary_a100": return 905 - case "theme/primary_a400": + case "theme/primary_a200": return 906 - case "theme/primary_a700": + case "theme/primary_a400": return 907 - case "theme/theme_for_organization_id": + case "theme/primary_a700": return 908 - case "theme/warn_100": + case "theme/theme_for_organization_id": return 909 - case "theme/warn_200": + case "theme/warn_100": return 910 - case "theme/warn_300": + case "theme/warn_200": return 911 - case "theme/warn_400": + case "theme/warn_300": return 912 - case "theme/warn_50": + case "theme/warn_400": return 913 - case "theme/warn_500": + case "theme/warn_50": return 914 - case "theme/warn_600": + case "theme/warn_500": return 915 - case "theme/warn_700": + case "theme/warn_600": return 916 - case "theme/warn_800": + case "theme/warn_700": return 917 - case "theme/warn_900": + case "theme/warn_800": return 918 - case "theme/warn_a100": + case "theme/warn_900": return 919 - case "theme/warn_a200": + case "theme/warn_a100": return 920 - case "theme/warn_a400": + case "theme/warn_a200": return 921 - case "theme/warn_a700": + case "theme/warn_a400": return 922 - case "theme/yes": + case "theme/warn_a700": return 923 - case "topic/A": + case "theme/yes": return 924 - case "topic/agenda_item_id": + case "topic/A": return 925 - case "topic/attachment_meeting_mediafile_ids": + case "topic/agenda_item_id": return 926 - case "topic/id": + case "topic/attachment_meeting_mediafile_ids": return 927 - case "topic/list_of_speakers_id": + case "topic/id": return 928 - case "topic/meeting_id": + case "topic/list_of_speakers_id": return 929 - case "topic/poll_ids": + case "topic/meeting_id": return 930 - case "topic/projection_ids": + case "topic/poll_ids": return 931 - case "topic/sequential_number": + case "topic/projection_ids": return 932 - case "topic/text": + case "topic/sequential_number": return 933 - case "topic/title": + case "topic/text": return 934 - case "user/A": + case "topic/title": return 935 - case "user/B": + case "user/A": return 936 - case "user/D": + case "user/B": return 937 - case "user/E": + case "user/D": return 938 - case "user/F": + case "user/E": return 939 - case "user/G": + case "user/F": return 940 - case "user/H": + case "user/G": return 941 - case "user/can_change_own_password": + case "user/H": return 942 - case "user/committee_ids": + case "user/can_change_own_password": return 943 - case "user/committee_management_ids": + case "user/committee_ids": return 944 - case "user/default_password": + case "user/committee_management_ids": return 945 - case "user/default_vote_weight": + case "user/default_password": return 946 - case "user/email": + case "user/default_vote_weight": return 947 - case "user/external": + case "user/email": return 948 - case "user/first_name": + case "user/external": return 949 - case "user/gender_id": + case "user/first_name": return 950 - case "user/history_entry_ids": + case "user/gender_id": return 951 - case "user/history_position_ids": + case "user/history_entry_ids": return 952 - case "user/home_committee_id": + case "user/history_position_ids": return 953 - case "user/id": + case "user/home_committee_id": return 954 - case "user/is_active": + case "user/id": return 955 - case "user/is_demo_user": + case "user/is_active": return 956 - case "user/is_physical_person": + case "user/is_demo_user": return 957 - case "user/is_present_in_meeting_ids": + case "user/is_physical_person": return 958 - case "user/last_email_sent": + case "user/is_present_in_meeting_ids": return 959 - case "user/last_login": + case "user/last_email_sent": return 960 - case "user/last_name": + case "user/last_login": return 961 - case "user/meeting_ids": + case "user/last_name": return 962 - case "user/meeting_user_ids": + case "user/meeting_ids": return 963 - case "user/member_number": + case "user/meeting_user_ids": return 964 - case "user/organization_id": + case "user/member_number": return 965 - case "user/organization_management_level": + case "user/organization_id": return 966 - case "user/password": + case "user/organization_management_level": return 967 - case "user/pronoun": + case "user/password": return 968 - case "user/saml_id": + case "user/pronoun": return 969 - case "user/title": + case "user/saml_id": return 970 - case "user/username": + case "user/title": return 971 + case "user/username": + return 972 default: return -1 } diff --git a/datastore/dsmodels/models_generated.go b/datastore/dsmodels/models_generated.go index fe86dc8b1..87f2437fe 100644 --- a/datastore/dsmodels/models_generated.go +++ b/datastore/dsmodels/models_generated.go @@ -2173,6 +2173,7 @@ type Meeting struct { UsersPdfWlanEncryption string UsersPdfWlanPassword string UsersPdfWlanSsid string + UsersVoteDelegationsMaxAmount int WelcomeText string WelcomeTitle string AdminGroup *dsfetch.Maybe[Group] @@ -2509,6 +2510,7 @@ func (b *meetingBuilder) lazy(ds *Fetch, idI any) *Meeting { ds.Meeting_UsersPdfWlanEncryption(id).Lazy(&c.UsersPdfWlanEncryption) ds.Meeting_UsersPdfWlanPassword(id).Lazy(&c.UsersPdfWlanPassword) ds.Meeting_UsersPdfWlanSsid(id).Lazy(&c.UsersPdfWlanSsid) + ds.Meeting_UsersVoteDelegationsMaxAmount(id).Lazy(&c.UsersVoteDelegationsMaxAmount) ds.Meeting_WelcomeText(id).Lazy(&c.WelcomeText) ds.Meeting_WelcomeTitle(id).Lazy(&c.WelcomeTitle) return &c @@ -4022,7 +4024,7 @@ type MeetingUser struct { SpeakerIDs []int StructureLevelIDs []int UserID int - VoteDelegatedToID dsfetch.Maybe[int] + VoteDelegatedToIDs []int VoteDelegationsFromIDs []int VoteWeight decimal.Decimal ActingBallotList []PollBallot @@ -4041,7 +4043,7 @@ type MeetingUser struct { SpeakerList []Speaker StructureLevelList []StructureLevel User *User - VoteDelegatedTo *dsfetch.Maybe[MeetingUser] + VoteDelegatedToList []MeetingUser VoteDelegationsFromList []MeetingUser } @@ -4073,7 +4075,7 @@ func (b *meetingUserBuilder) lazy(ds *Fetch, idI any) *MeetingUser { ds.MeetingUser_SpeakerIDs(id).Lazy(&c.SpeakerIDs) ds.MeetingUser_StructureLevelIDs(id).Lazy(&c.StructureLevelIDs) ds.MeetingUser_UserID(id).Lazy(&c.UserID) - ds.MeetingUser_VoteDelegatedToID(id).Lazy(&c.VoteDelegatedToID) + ds.MeetingUser_VoteDelegatedToIDs(id).Lazy(&c.VoteDelegatedToIDs) ds.MeetingUser_VoteDelegationsFromIDs(id).Lazy(&c.VoteDelegationsFromIDs) ds.MeetingUser_VoteWeight(id).Lazy(&c.VoteWeight) return &c @@ -4290,13 +4292,14 @@ func (b *meetingUserBuilder) User() *userBuilder { } } -func (b *meetingUserBuilder) VoteDelegatedTo() *meetingUserBuilder { +func (b *meetingUserBuilder) VoteDelegatedToList() *meetingUserBuilder { return &meetingUserBuilder{ builder: builder[meetingUserBuilder, *meetingUserBuilder, MeetingUser, *MeetingUser]{ fetch: b.fetch, parent: b, - idField: "VoteDelegatedToID", - relField: "VoteDelegatedTo", + idField: "VoteDelegatedToIDs", + relField: "VoteDelegatedToList", + many: true, conv: func(p *MeetingUser) MeetingUser { return *p }, }, } diff --git a/datastore/field_def.go b/datastore/field_def.go index c5c4bc87e..e3865e6a0 100644 --- a/datastore/field_def.go +++ b/datastore/field_def.go @@ -16,9 +16,9 @@ var collectionFields = map[string][]string{ "import_preview": {"created", "id", "name", "result", "state"}, "list_of_speakers": {"closed", "content_object_id", "id", "meeting_id", "moderator_notes", "projection_ids", "sequential_number", "speaker_ids", "structure_level_list_of_speakers_ids"}, "mediafile": {"child_ids", "create_timestamp", "filename", "filesize", "id", "is_directory", "meeting_mediafile_ids", "mimetype", "owner_id", "parent_id", "pdf_information", "published_to_meetings_in_organization_id", "title", "token"}, - "meeting": {"admin_group_id", "agenda_enable_numbering", "agenda_item_creation", "agenda_item_ids", "agenda_new_items_default_visibility", "agenda_number_prefix", "agenda_numeral_system", "agenda_show_internal_items_on_projector", "agenda_show_subtitles", "agenda_show_topic_navigation_on_detail_view", "all_projection_ids", "anonymous_group_id", "applause_enable", "applause_max_amount", "applause_min_amount", "applause_particle_image_url", "applause_show_level", "applause_timeout", "applause_type", "assignment_candidate_ids", "assignment_ids", "assignment_poll_add_candidates_to_list_of_speakers", "assignment_poll_ballot_paper_number", "assignment_poll_ballot_paper_selection", "assignment_poll_default_group_ids", "assignment_poll_default_method", "assignment_poll_default_onehundred_percent_base", "assignment_poll_default_type", "assignment_poll_enable_max_votes_per_option", "assignment_poll_sort_poll_result_by_votes", "assignments_export_preamble", "assignments_export_title", "chat_group_ids", "chat_message_ids", "committee_id", "conference_auto_connect", "conference_auto_connect_next_speakers", "conference_enable_helpdesk", "conference_los_restriction", "conference_open_microphone", "conference_open_video", "conference_show", "conference_stream_poster_url", "conference_stream_url", "custom_translations", "default_group_id", "default_meeting_for_committee_id", "default_projector_agenda_item_list_ids", "default_projector_amendment_ids", "default_projector_assignment_ids", "default_projector_assignment_poll_ids", "default_projector_countdown_ids", "default_projector_current_los_ids", "default_projector_list_of_speakers_ids", "default_projector_mediafile_ids", "default_projector_message_ids", "default_projector_motion_block_ids", "default_projector_motion_ids", "default_projector_motion_poll_ids", "default_projector_poll_ids", "default_projector_topic_ids", "description", "enable_anonymous", "end_time", "export_csv_encoding", "export_csv_separator", "export_pdf_fontsize", "export_pdf_line_height", "export_pdf_page_margin_bottom", "export_pdf_page_margin_left", "export_pdf_page_margin_right", "export_pdf_page_margin_top", "export_pdf_pagenumber_alignment", "export_pdf_pagesize", "external_id", "font_bold_id", "font_bold_italic_id", "font_chyron_speaker_name_id", "font_italic_id", "font_monospace_id", "font_projector_h1_id", "font_projector_h2_id", "font_regular_id", "forwarded_motion_ids", "group_ids", "id", "imported_at", "is_active_in_organization_id", "is_archived_in_organization_id", "jitsi_domain", "jitsi_room_name", "jitsi_room_password", "language", "list_of_speakers_allow_multiple_speakers", "list_of_speakers_amount_last_on_projector", "list_of_speakers_amount_next_on_projector", "list_of_speakers_can_create_point_of_order_for_others", "list_of_speakers_can_set_contribution_self", "list_of_speakers_closing_disables_point_of_order", "list_of_speakers_countdown_id", "list_of_speakers_couple_countdown", "list_of_speakers_default_structure_level_time", "list_of_speakers_enable_interposed_question", "list_of_speakers_enable_point_of_order_categories", "list_of_speakers_enable_point_of_order_speakers", "list_of_speakers_enable_pro_contra_speech", "list_of_speakers_hide_contribution_count", "list_of_speakers_ids", "list_of_speakers_initially_closed", "list_of_speakers_intervention_time", "list_of_speakers_present_users_only", "list_of_speakers_show_amount_of_speakers_on_slide", "list_of_speakers_show_first_contribution", "list_of_speakers_speaker_note_for_everyone", "location", "locked_from_inside", "logo_pdf_ballot_paper_id", "logo_pdf_footer_l_id", "logo_pdf_footer_r_id", "logo_pdf_header_l_id", "logo_pdf_header_r_id", "logo_projector_header_id", "logo_projector_main_id", "logo_web_header_id", "mediafile_ids", "meeting_mediafile_ids", "meeting_user_ids", "motion_block_ids", "motion_category_ids", "motion_change_recommendation_ids", "motion_comment_ids", "motion_comment_section_ids", "motion_editor_ids", "motion_ids", "motion_poll_ballot_paper_number", "motion_poll_ballot_paper_selection", "motion_poll_default_allow_abstain", "motion_poll_default_group_ids", "motion_poll_default_onehundred_percent_base", "motion_poll_default_type", "motion_poll_projection_max_columns", "motion_poll_projection_name_order_first", "motion_state_ids", "motion_submitter_ids", "motion_supporter_ids", "motion_workflow_ids", "motion_working_group_speaker_ids", "motions_amendments_enabled", "motions_amendments_in_main_list", "motions_amendments_multiple_paragraphs", "motions_amendments_of_amendments", "motions_amendments_prefix", "motions_amendments_text_mode", "motions_block_slide_columns", "motions_create_enable_additional_submitter_text", "motions_default_amendment_workflow_id", "motions_default_line_numbering", "motions_default_sorting", "motions_default_workflow_id", "motions_enable_editor", "motions_enable_origin_motion_display", "motions_enable_reason_on_projector", "motions_enable_recommendation_on_projector", "motions_enable_restricted_editor_for_manager", "motions_enable_restricted_editor_for_non_manager", "motions_enable_sidebox_on_projector", "motions_enable_text_on_projector", "motions_enable_working_group_speaker", "motions_export_follow_recommendation", "motions_export_preamble", "motions_export_submitter_recommendation", "motions_export_title", "motions_hide_metadata_background", "motions_line_length", "motions_number_min_digits", "motions_number_type", "motions_number_with_blank", "motions_origin_motion_toggle_default", "motions_preamble", "motions_reason_required", "motions_recommendation_text_mode", "motions_recommendations_by", "motions_show_referring_motions", "motions_show_sequential_number", "motions_supporters_min_amount", "name", "organization_tag_ids", "personal_note_ids", "point_of_order_category_ids", "poll_ballot_paper_number", "poll_ballot_paper_selection", "poll_countdown_id", "poll_couple_countdown", "poll_default_allow_invalid", "poll_default_allow_vote_split", "poll_default_group_ids", "poll_default_live_voting_enabled", "poll_default_method", "poll_default_onehundred_percent_base", "poll_default_type", "poll_ids", "poll_sort_poll_result_by_votes", "present_user_ids", "projection_ids", "projector_countdown_default_time", "projector_countdown_ids", "projector_countdown_warning_time", "projector_ids", "projector_message_ids", "reference_projector_id", "relevant_history_entry_ids", "speaker_ids", "start_time", "structure_level_ids", "structure_level_list_of_speakers_ids", "tag_ids", "template_for_organization_id", "time_zone", "topic_ids", "topic_poll_default_group_ids", "user_ids", "users_allow_self_set_present", "users_email_body", "users_email_replyto", "users_email_sender", "users_email_subject", "users_enable_presence_view", "users_enable_vote_delegations", "users_enable_vote_weight", "users_forbid_delegator_as_submitter", "users_forbid_delegator_as_supporter", "users_forbid_delegator_in_list_of_speakers", "users_forbid_delegator_to_vote", "users_pdf_welcometext", "users_pdf_welcometitle", "users_pdf_wlan_encryption", "users_pdf_wlan_password", "users_pdf_wlan_ssid", "welcome_text", "welcome_title"}, + "meeting": {"admin_group_id", "agenda_enable_numbering", "agenda_item_creation", "agenda_item_ids", "agenda_new_items_default_visibility", "agenda_number_prefix", "agenda_numeral_system", "agenda_show_internal_items_on_projector", "agenda_show_subtitles", "agenda_show_topic_navigation_on_detail_view", "all_projection_ids", "anonymous_group_id", "applause_enable", "applause_max_amount", "applause_min_amount", "applause_particle_image_url", "applause_show_level", "applause_timeout", "applause_type", "assignment_candidate_ids", "assignment_ids", "assignment_poll_add_candidates_to_list_of_speakers", "assignment_poll_ballot_paper_number", "assignment_poll_ballot_paper_selection", "assignment_poll_default_group_ids", "assignment_poll_default_method", "assignment_poll_default_onehundred_percent_base", "assignment_poll_default_type", "assignment_poll_enable_max_votes_per_option", "assignment_poll_sort_poll_result_by_votes", "assignments_export_preamble", "assignments_export_title", "chat_group_ids", "chat_message_ids", "committee_id", "conference_auto_connect", "conference_auto_connect_next_speakers", "conference_enable_helpdesk", "conference_los_restriction", "conference_open_microphone", "conference_open_video", "conference_show", "conference_stream_poster_url", "conference_stream_url", "custom_translations", "default_group_id", "default_meeting_for_committee_id", "default_projector_agenda_item_list_ids", "default_projector_amendment_ids", "default_projector_assignment_ids", "default_projector_assignment_poll_ids", "default_projector_countdown_ids", "default_projector_current_los_ids", "default_projector_list_of_speakers_ids", "default_projector_mediafile_ids", "default_projector_message_ids", "default_projector_motion_block_ids", "default_projector_motion_ids", "default_projector_motion_poll_ids", "default_projector_poll_ids", "default_projector_topic_ids", "description", "enable_anonymous", "end_time", "export_csv_encoding", "export_csv_separator", "export_pdf_fontsize", "export_pdf_line_height", "export_pdf_page_margin_bottom", "export_pdf_page_margin_left", "export_pdf_page_margin_right", "export_pdf_page_margin_top", "export_pdf_pagenumber_alignment", "export_pdf_pagesize", "external_id", "font_bold_id", "font_bold_italic_id", "font_chyron_speaker_name_id", "font_italic_id", "font_monospace_id", "font_projector_h1_id", "font_projector_h2_id", "font_regular_id", "forwarded_motion_ids", "group_ids", "id", "imported_at", "is_active_in_organization_id", "is_archived_in_organization_id", "jitsi_domain", "jitsi_room_name", "jitsi_room_password", "language", "list_of_speakers_allow_multiple_speakers", "list_of_speakers_amount_last_on_projector", "list_of_speakers_amount_next_on_projector", "list_of_speakers_can_create_point_of_order_for_others", "list_of_speakers_can_set_contribution_self", "list_of_speakers_closing_disables_point_of_order", "list_of_speakers_countdown_id", "list_of_speakers_couple_countdown", "list_of_speakers_default_structure_level_time", "list_of_speakers_enable_interposed_question", "list_of_speakers_enable_point_of_order_categories", "list_of_speakers_enable_point_of_order_speakers", "list_of_speakers_enable_pro_contra_speech", "list_of_speakers_hide_contribution_count", "list_of_speakers_ids", "list_of_speakers_initially_closed", "list_of_speakers_intervention_time", "list_of_speakers_present_users_only", "list_of_speakers_show_amount_of_speakers_on_slide", "list_of_speakers_show_first_contribution", "list_of_speakers_speaker_note_for_everyone", "location", "locked_from_inside", "logo_pdf_ballot_paper_id", "logo_pdf_footer_l_id", "logo_pdf_footer_r_id", "logo_pdf_header_l_id", "logo_pdf_header_r_id", "logo_projector_header_id", "logo_projector_main_id", "logo_web_header_id", "mediafile_ids", "meeting_mediafile_ids", "meeting_user_ids", "motion_block_ids", "motion_category_ids", "motion_change_recommendation_ids", "motion_comment_ids", "motion_comment_section_ids", "motion_editor_ids", "motion_ids", "motion_poll_ballot_paper_number", "motion_poll_ballot_paper_selection", "motion_poll_default_allow_abstain", "motion_poll_default_group_ids", "motion_poll_default_onehundred_percent_base", "motion_poll_default_type", "motion_poll_projection_max_columns", "motion_poll_projection_name_order_first", "motion_state_ids", "motion_submitter_ids", "motion_supporter_ids", "motion_workflow_ids", "motion_working_group_speaker_ids", "motions_amendments_enabled", "motions_amendments_in_main_list", "motions_amendments_multiple_paragraphs", "motions_amendments_of_amendments", "motions_amendments_prefix", "motions_amendments_text_mode", "motions_block_slide_columns", "motions_create_enable_additional_submitter_text", "motions_default_amendment_workflow_id", "motions_default_line_numbering", "motions_default_sorting", "motions_default_workflow_id", "motions_enable_editor", "motions_enable_origin_motion_display", "motions_enable_reason_on_projector", "motions_enable_recommendation_on_projector", "motions_enable_restricted_editor_for_manager", "motions_enable_restricted_editor_for_non_manager", "motions_enable_sidebox_on_projector", "motions_enable_text_on_projector", "motions_enable_working_group_speaker", "motions_export_follow_recommendation", "motions_export_preamble", "motions_export_submitter_recommendation", "motions_export_title", "motions_hide_metadata_background", "motions_line_length", "motions_number_min_digits", "motions_number_type", "motions_number_with_blank", "motions_origin_motion_toggle_default", "motions_preamble", "motions_reason_required", "motions_recommendation_text_mode", "motions_recommendations_by", "motions_show_referring_motions", "motions_show_sequential_number", "motions_supporters_min_amount", "name", "organization_tag_ids", "personal_note_ids", "point_of_order_category_ids", "poll_ballot_paper_number", "poll_ballot_paper_selection", "poll_countdown_id", "poll_couple_countdown", "poll_default_allow_invalid", "poll_default_allow_vote_split", "poll_default_group_ids", "poll_default_live_voting_enabled", "poll_default_method", "poll_default_onehundred_percent_base", "poll_default_type", "poll_ids", "poll_sort_poll_result_by_votes", "present_user_ids", "projection_ids", "projector_countdown_default_time", "projector_countdown_ids", "projector_countdown_warning_time", "projector_ids", "projector_message_ids", "reference_projector_id", "relevant_history_entry_ids", "speaker_ids", "start_time", "structure_level_ids", "structure_level_list_of_speakers_ids", "tag_ids", "template_for_organization_id", "time_zone", "topic_ids", "topic_poll_default_group_ids", "user_ids", "users_allow_self_set_present", "users_email_body", "users_email_replyto", "users_email_sender", "users_email_subject", "users_enable_presence_view", "users_enable_vote_delegations", "users_enable_vote_weight", "users_forbid_delegator_as_submitter", "users_forbid_delegator_as_supporter", "users_forbid_delegator_in_list_of_speakers", "users_forbid_delegator_to_vote", "users_pdf_welcometext", "users_pdf_welcometitle", "users_pdf_wlan_encryption", "users_pdf_wlan_password", "users_pdf_wlan_ssid", "users_vote_delegations_max_amount", "welcome_text", "welcome_title"}, "meeting_mediafile": {"access_group_ids", "attachment_ids", "id", "inherited_access_group_ids", "is_public", "list_of_speakers_id", "mediafile_id", "meeting_id", "projection_ids", "used_as_font_bold_in_meeting_id", "used_as_font_bold_italic_in_meeting_id", "used_as_font_chyron_speaker_name_in_meeting_id", "used_as_font_italic_in_meeting_id", "used_as_font_monospace_in_meeting_id", "used_as_font_projector_h1_in_meeting_id", "used_as_font_projector_h2_in_meeting_id", "used_as_font_regular_in_meeting_id", "used_as_logo_pdf_ballot_paper_in_meeting_id", "used_as_logo_pdf_footer_l_in_meeting_id", "used_as_logo_pdf_footer_r_in_meeting_id", "used_as_logo_pdf_header_l_in_meeting_id", "used_as_logo_pdf_header_r_in_meeting_id", "used_as_logo_projector_header_in_meeting_id", "used_as_logo_projector_main_in_meeting_id", "used_as_logo_web_header_in_meeting_id"}, - "meeting_user": {"about_me", "acting_ballot_ids", "assignment_candidate_ids", "chat_message_ids", "comment", "group_ids", "id", "locked_out", "meeting_id", "motion_editor_ids", "motion_submitter_ids", "motion_supporter_ids", "motion_working_group_speaker_ids", "number", "personal_note_ids", "poll_option_ids", "poll_voted_ids", "represented_ballot_ids", "speaker_ids", "structure_level_ids", "user_id", "vote_delegated_to_id", "vote_delegations_from_ids", "vote_weight"}, + "meeting_user": {"about_me", "acting_ballot_ids", "assignment_candidate_ids", "chat_message_ids", "comment", "group_ids", "id", "locked_out", "meeting_id", "motion_editor_ids", "motion_submitter_ids", "motion_supporter_ids", "motion_working_group_speaker_ids", "number", "personal_note_ids", "poll_option_ids", "poll_voted_ids", "represented_ballot_ids", "speaker_ids", "structure_level_ids", "user_id", "vote_delegated_to_ids", "vote_delegations_from_ids", "vote_weight"}, "motion": {"additional_submitter", "agenda_item_id", "all_derived_motion_ids", "all_origin_ids", "amendment_ids", "amendment_paragraphs", "attachment_meeting_mediafile_ids", "block_id", "category_id", "category_weight", "change_recommendation_ids", "comment_ids", "created", "derived_motion_ids", "diff_version", "editor_ids", "forwarded", "history_entry_ids", "id", "identical_motion_ids", "last_modified", "lead_motion_id", "list_of_speakers_id", "marked_forwarded", "meeting_id", "modified_final_version", "number", "number_value", "origin_id", "origin_meeting_id", "personal_note_ids", "poll_ids", "projection_ids", "reason", "recommendation_extension", "recommendation_extension_reference_ids", "recommendation_id", "referenced_in_motion_recommendation_extension_ids", "referenced_in_motion_state_extension_ids", "sequential_number", "sort_child_ids", "sort_parent_id", "sort_weight", "start_line_number", "state_extension", "state_extension_reference_ids", "state_id", "submitter_ids", "supporter_ids", "tag_ids", "text", "text_hash", "title", "workflow_timestamp", "working_group_speaker_ids"}, "motion_block": {"agenda_item_id", "id", "internal", "list_of_speakers_id", "meeting_id", "motion_ids", "projection_ids", "sequential_number", "title"}, "motion_category": {"child_ids", "id", "level", "meeting_id", "motion_ids", "name", "parent_id", "prefix", "sequential_number", "weight"}, diff --git a/datastore/pgtest/sql/schema_relational.sql b/datastore/pgtest/sql/schema_relational.sql index 551733b7b..cc7bb0b99 100644 --- a/datastore/pgtest/sql/schema_relational.sql +++ b/datastore/pgtest/sql/schema_relational.sql @@ -1,7 +1,7 @@ -- schema_relational.sql for initial database setup OpenSlides -- Code generated. DO NOT EDIT. --- MODELS_YML_CHECKSUM = '65103beb4910ed9e78b253bf2639b69c' +-- MODELS_YML_CHECKSUM = 'accb55ba8debadb6c55f69dfb508076b' -- ENUM definitions @@ -1442,6 +1442,8 @@ Password: {password} This email was generated automatically.', users_enable_vote_delegations boolean, + users_vote_delegations_max_amount integer + CONSTRAINT default_meeting_users_vote_delegations_max_amount DEFAULT 1, users_forbid_delegator_in_list_of_speakers boolean, users_forbid_delegator_as_submitter boolean, users_forbid_delegator_as_supporter boolean, @@ -1570,7 +1572,6 @@ CREATE TABLE meeting_user_t ( CONSTRAINT required_meeting_user_user_id NOT NULL, meeting_id integer CONSTRAINT required_meeting_user_meeting_id NOT NULL, - vote_delegated_to_id integer, CONSTRAINT unique_meeting_user_meeting_id_user_id UNIQUE (meeting_id, user_id) ); @@ -2750,6 +2751,22 @@ CREATE INDEX idx_gm_meeting_mediafile_attachment_ids_t_attachment_id_3c67b77 ON CREATE INDEX idx_gm_meeting_mediafile_attachment_ids_t_attachment_id_8abf47a ON gm_meeting_mediafile_attachment_ids_t (attachment_id_topic_id); CREATE INDEX idx_gm_meeting_mediafile_attachment_ids_t_attachment_id_66fb18e ON gm_meeting_mediafile_attachment_ids_t (attachment_id_assignment_id); +CREATE TABLE nm_meeting_user_vote_delegated_to_ids_meeting_user_t ( + vote_delegations_from_id integer + CONSTRAINT required_nm_meeting_user_vote_delegated_to_ids_meeting_u2c2dede NOT NULL + CONSTRAINT fk_nm_meeting_user_vote_delegated_to_ids_meeting_user_t_3faa0ec REFERENCES meeting_user_t (id) + ON DELETE CASCADE + INITIALLY DEFERRED, + vote_delegated_to_id integer + CONSTRAINT required_nm_meeting_user_vote_delegated_to_ids_meeting_ueb04d5e NOT NULL + CONSTRAINT fk_nm_meeting_user_vote_delegated_to_ids_meeting_user_t_d8197d4 REFERENCES meeting_user_t (id) + ON DELETE CASCADE + INITIALLY DEFERRED, + CONSTRAINT pk_nm_meeting_user_vote_delegated_to_ids_meeting_user_t PRIMARY KEY (vote_delegations_from_id, vote_delegated_to_id) +); +CREATE INDEX idx_nm_meeting_user_vote_delegated_to_ids_meeting_user_tee86852 ON nm_meeting_user_vote_delegated_to_ids_meeting_user_t (vote_delegations_from_id); +CREATE INDEX idx_nm_meeting_user_vote_delegated_to_ids_meeting_user_t54a80eb ON nm_meeting_user_vote_delegated_to_ids_meeting_user_t (vote_delegated_to_id); + CREATE TABLE nm_meeting_user_poll_voted_ids_poll_t ( meeting_user_id integer CONSTRAINT required_nm_meeting_user_poll_voted_ids_poll_t_meeting_user_id NOT NULL @@ -3153,7 +3170,8 @@ CREATE VIEW "meeting_user" AS SELECT *, (select array_agg(mw.id ORDER BY mw.id) from motion_working_group_speaker_t mw where mw.meeting_user_id = m.id) as motion_working_group_speaker_ids, (select array_agg(ms.id ORDER BY ms.id) from motion_submitter_t ms where ms.meeting_user_id = m.id) as motion_submitter_ids, (select array_agg(a.id ORDER BY a.id) from assignment_candidate_t a where a.meeting_user_id = m.id) as assignment_candidate_ids, -(select array_agg(mu.id ORDER BY mu.id) from meeting_user_t mu where mu.vote_delegated_to_id = m.id) as vote_delegations_from_ids, +(select array_agg(n.vote_delegated_to_id ORDER BY n.vote_delegated_to_id) from nm_meeting_user_vote_delegated_to_ids_meeting_user_t n where n.vote_delegations_from_id = m.id) as vote_delegated_to_ids, +(select array_agg(n.vote_delegations_from_id ORDER BY n.vote_delegations_from_id) from nm_meeting_user_vote_delegated_to_ids_meeting_user_t n where n.vote_delegated_to_id = m.id) as vote_delegations_from_ids, (select array_agg(n.poll_id ORDER BY n.poll_id) from nm_meeting_user_poll_voted_ids_poll_t n where n.meeting_user_id = m.id) as poll_voted_ids, (select array_agg(p.id ORDER BY p.id) from poll_option_t p where p.meeting_user_id = m.id) as poll_option_ids, (select array_agg(p.id ORDER BY p.id) from poll_ballot_t p where p.acting_meeting_user_id = m.id) as acting_ballot_ids, @@ -3574,8 +3592,6 @@ ALTER TABLE meeting_user_t ADD CONSTRAINT fk_meeting_user_t_user_id_user_t_id FO CREATE INDEX idx_meeting_user_t_user_id ON meeting_user_t (user_id); ALTER TABLE meeting_user_t ADD CONSTRAINT fk_meeting_user_t_meeting_id_meeting_t_id FOREIGN KEY(meeting_id) REFERENCES meeting_t(id) INITIALLY DEFERRED; CREATE INDEX idx_meeting_user_t_meeting_id ON meeting_user_t (meeting_id); -ALTER TABLE meeting_user_t ADD CONSTRAINT fk_meeting_user_t_vote_delegated_to_id_meeting_user_t_id FOREIGN KEY(vote_delegated_to_id) REFERENCES meeting_user_t(id) INITIALLY DEFERRED; -CREATE INDEX idx_meeting_user_t_vote_delegated_to_id ON meeting_user_t (vote_delegated_to_id); ALTER TABLE motion_t ADD CONSTRAINT fk_motion_t_lead_motion_id_motion_t_id FOREIGN KEY(lead_motion_id) REFERENCES motion_t(id) INITIALLY DEFERRED; CREATE INDEX idx_motion_t_lead_motion_id ON motion_t (lead_motion_id); @@ -4782,8 +4798,11 @@ CREATE TRIGGER tr_log_meeting_user_t_user_id AFTER INSERT OR UPDATE OF user_id O FOR EACH ROW EXECUTE FUNCTION log_modified_related_models('user', 'user_id', 'meeting_user_ids'); CREATE TRIGGER tr_log_meeting_user_t_meeting_id AFTER INSERT OR UPDATE OF meeting_id OR DELETE ON meeting_user_t FOR EACH ROW EXECUTE FUNCTION log_modified_related_models('meeting', 'meeting_id', 'meeting_user_ids'); -CREATE TRIGGER tr_log_meeting_user_t_vote_delegated_to_id AFTER INSERT OR UPDATE OF vote_delegated_to_id OR DELETE ON meeting_user_t -FOR EACH ROW EXECUTE FUNCTION log_modified_related_models('meeting_user', 'vote_delegated_to_id', 'vote_delegations_from_ids'); + +CREATE TRIGGER tr_log_nm_meeting_user_vote_delegated_to_ids_meeting_user_t AFTER INSERT OR UPDATE OR DELETE ON nm_meeting_user_vote_delegated_to_ids_meeting_user_t +FOR EACH ROW EXECUTE FUNCTION log_modified_related_models('meeting_user','vote_delegations_from_id','vote_delegated_to_ids','meeting_user','vote_delegated_to_id','vote_delegations_from_ids'); +CREATE CONSTRAINT TRIGGER notify_transaction_end AFTER INSERT OR UPDATE OR DELETE ON nm_meeting_user_vote_delegated_to_ids_meeting_user_t +DEFERRABLE INITIALLY DEFERRED FOR EACH ROW EXECUTE FUNCTION notify_transaction_end(); CREATE TRIGGER tr_log_nm_meeting_user_poll_voted_ids_poll_t AFTER INSERT OR UPDATE OR DELETE ON nm_meeting_user_poll_voted_ids_poll_t FOR EACH ROW EXECUTE FUNCTION log_modified_related_models('meeting_user','meeting_user_id','poll_voted_ids','poll','poll_id','voted_ids'); @@ -5470,10 +5489,12 @@ FOR EACH ROW EXECUTE FUNCTION check_equals_intermediate('meeting_mediafile_id', -CREATE CONSTRAINT TRIGGER equal_meeting_id_on_meeting_user_t_vote_delegated_to_id AFTER INSERT OR UPDATE OF vote_delegated_to_id ON meeting_user_t INITIALLY DEFERRED -FOR EACH ROW EXECUTE FUNCTION check_equals('meeting_user', 'meeting_user', 'vote_delegated_to_id', 'meeting_id', FALSE); +CREATE CONSTRAINT TRIGGER equal_meeting_id_on_meeting_user_t_vote_delegated_to_ids AFTER INSERT ON meeting_user_t INITIALLY DEFERRED +FOR EACH ROW EXECUTE FUNCTION check_equals_multi('nm_meeting_user_vote_delegated_to_ids_meeting_user_t', 'vote_delegations_from_id', 'meeting_user', 'vote_delegated_to_id', 'meeting_user', 'meeting_id', 'vote_delegated_to_ids'); CREATE CONSTRAINT TRIGGER equal_meeting_id_on_meeting_user_t_vote_delegations_from_ids AFTER INSERT ON meeting_user_t INITIALLY DEFERRED -FOR EACH ROW EXECUTE FUNCTION check_equals('meeting_user', 'meeting_user', 'vote_delegated_to_id', 'meeting_id', TRUE); +FOR EACH ROW EXECUTE FUNCTION check_equals_multi('nm_meeting_user_vote_delegated_to_ids_meeting_user_t', 'vote_delegated_to_id', 'meeting_user', 'vote_delegations_from_id', 'meeting_user', 'meeting_id', 'vote_delegations_from_ids'); +CREATE CONSTRAINT TRIGGER equal_meeting_id_on_meeting_user_t_vote_delegated_to_ids68aada4 AFTER INSERT ON nm_meeting_user_vote_delegated_to_ids_meeting_user_t INITIALLY DEFERRED +FOR EACH ROW EXECUTE FUNCTION check_equals_intermediate('vote_delegations_from_id', 'meeting_user', 'vote_delegated_to_id', 'meeting_user', 'meeting_id', 'vote_delegated_to_ids'); CREATE CONSTRAINT TRIGGER equal_meeting_id_on_meeting_user_t_structure_level_ids AFTER INSERT ON meeting_user_t INITIALLY DEFERRED @@ -6060,8 +6081,8 @@ SQL nt:1r => meeting_user/motion_editor_ids:-> motion_editor/meeting_user_id SQL nt:1r => meeting_user/motion_working_group_speaker_ids:-> motion_working_group_speaker/meeting_user_id SQL nt:1r => meeting_user/motion_submitter_ids:-> motion_submitter/meeting_user_id SQL nt:1r => meeting_user/assignment_candidate_ids:-> assignment_candidate/meeting_user_id -FIELD 1r:nt => meeting_user/vote_delegated_to_id:-> meeting_user/vote_delegations_from_ids -SQL nt:1r => meeting_user/vote_delegations_from_ids:-> meeting_user/vote_delegated_to_id +SQL nt:nt => meeting_user/vote_delegated_to_ids:-> meeting_user/vote_delegations_from_ids +SQL nt:nt => meeting_user/vote_delegations_from_ids:-> meeting_user/vote_delegated_to_ids SQL nt:nt => meeting_user/poll_voted_ids:-> poll/voted_ids SQL nr:1r => meeting_user/poll_option_ids:-> poll_option/meeting_user_id SQL nt:1r => meeting_user/acting_ballot_ids:-> poll_ballot/acting_meeting_user_id diff --git a/meta b/meta index ec166875b..de0da2e16 160000 --- a/meta +++ b/meta @@ -1 +1 @@ -Subproject commit ec166875b618c19810cec43e934284f026efb9ed +Subproject commit de0da2e16ad8d5301e1546366af3432b959ad399 diff --git a/metagen/field_def.go b/metagen/field_def.go index 7091a8304..f9cb49d2a 100644 --- a/metagen/field_def.go +++ b/metagen/field_def.go @@ -84,7 +84,6 @@ var RelationFields = map[string]string{ "meeting_mediafile/used_as_logo_web_header_in_meeting_id": "meeting/logo_web_header_id", "meeting_user/meeting_id": "meeting/meeting_user_ids", "meeting_user/user_id": "user/meeting_user_ids", - "meeting_user/vote_delegated_to_id": "meeting_user/vote_delegations_from_ids", "motion/agenda_item_id": "agenda_item/content_object_id", "motion/block_id": "motion_block/motion_ids", "motion/category_id": "motion_category/motion_ids", @@ -302,7 +301,8 @@ var RelationListFields = map[string]string{ "meeting_user/represented_ballot_ids": "poll_ballot/represented_meeting_user_id", "meeting_user/speaker_ids": "speaker/meeting_user_id", "meeting_user/structure_level_ids": "structure_level/meeting_user_ids", - "meeting_user/vote_delegations_from_ids": "meeting_user/vote_delegated_to_id", + "meeting_user/vote_delegated_to_ids": "meeting_user/vote_delegations_from_ids", + "meeting_user/vote_delegations_from_ids": "meeting_user/vote_delegated_to_ids", "motion/all_derived_motion_ids": "motion/all_origin_ids", "motion/all_origin_ids": "motion/all_derived_motion_ids", "motion/amendment_ids": "motion/lead_motion_id", @@ -774,6 +774,7 @@ var RestrictionModes = map[string]string{ "meeting/users_pdf_wlan_encryption": "B", "meeting/users_pdf_wlan_password": "B", "meeting/users_pdf_wlan_ssid": "B", + "meeting/users_vote_delegations_max_amount": "B", "meeting/applause_enable": "C", "meeting/applause_max_amount": "C", "meeting/applause_min_amount": "C", @@ -851,7 +852,7 @@ var RestrictionModes = map[string]string{ "meeting_user/represented_ballot_ids": "A", "meeting_user/speaker_ids": "A", "meeting_user/structure_level_ids": "A", - "meeting_user/vote_delegated_to_id": "A", + "meeting_user/vote_delegated_to_ids": "A", "meeting_user/vote_delegations_from_ids": "A", "meeting_user/vote_weight": "A", "meeting_user/personal_note_ids": "B",