Changes for new vote service

.github/workflows/continuous_integration.yml

@@ -19,7 +19,7 @@ jobs:
         working-directory: dev/
 
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
 
       - name: Set up Python
         uses: actions/setup-python@v6

.github/workflows/create-pr.yml

@@ -24,12 +24,12 @@ jobs:
     name: Create or update PR
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           path: current-meta-repository
           ref: ${{ github.ref_name }}
 
-      - uses: actions/checkout@v6
+      - uses: actions/checkout@v7
         with:
           repository: ${{ github.repository_owner }}/${{ inputs.repository }}
           path: service-repository

.github/workflows/pick-to-staging.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Checkout main
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
         with:
           ref: main
           fetch-depth: 2

.github/workflows/test-sql.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v6
+        uses: actions/checkout@v7
 
       - name: Install psql
         run: |

README.md

@@ -17,6 +17,8 @@ Each collection-file has the following format:
       for which UNIQUE constraints will be generated in the database.
       Difference: for `unique_together` the uniqueness check is skipped if
       value in at least one of the fields is NULL.
+    - `managed_by` can be set to the service the collection is managed by. Default to
+      `backend`. Available options are `backend` or `vote`.
 - Length of names:
     - field name: Their length is limited to 25 characters. There are still some
       fields with longer names, that has to be shortened

collection-meta.yml

@@ -11,19 +11,42 @@ enum_definitions:
   - NUMBER_OF_DELEGATES
   - NUMBER_OF_ALL_PARTICIPANTS
   - CUSTOM_NUMBER
-  poll_backends:
-  - long
-  - fast
   onehundred_percent_bases:
-  - Y
-  - YN
-  - YNA
-  - N
-  - valid
-  - cast
-  - entitled
-  - entitled_present
-  - disabled
+    - no_general
+    - yes_no
+    - valid
+    - cast
+    - entitled
+    - entitled_present
+    - disabled
+  approval_onehundred_percent_bases:
+    - yes_no
+    - valid
+    - cast
+    - entitled
+    - entitled_present
+    - disabled
+  rating_approval_onehundred_percent_bases:
+    - yes_no
+    - valid
+    - cast
+    - entitled
+    - entitled_present
+    - disabled
+  rating_score_onehundred_percent_bases:
+    - yes_no
+    - valid
+    - cast
+    - entitled
+    - entitled_present
+    - disabled
+  selection_onehundred_percent_bases:
+    - no_general
+    - valid
+    - cast
+    - entitled
+    - entitled_present
+    - disabled
 id_field: &id_field
   type: number
   restriction_mode: A

collections/group.yml

@@ -20,12 +20,15 @@ fields:
     items:
       enum:
       - agenda_item.can_manage
+      - agenda_item.can_manage_polls
+      - agenda_item.can_see_polls
       - agenda_item.can_see
       - agenda_item.can_see_internal
       - assignment.can_manage
       - assignment.can_manage_polls
       - assignment.can_nominate_other
       - assignment.can_nominate_self
+      - assignment.can_see_polls
       - assignment.can_see
       - chat.can_manage
       - list_of_speakers.can_be_speaker
@@ -47,11 +50,11 @@ fields:
       - motion.can_manage
       - motion.can_manage_metadata
       - motion.can_manage_polls
+      - motion.can_see_polls
       - motion.can_see
       - motion.can_see_internal
       - motion.can_see_origin
       - motion.can_support
-      - poll.can_manage
       - poll.can_see_progress
       - projector.can_manage
       - projector.can_see

collections/history_entry.yml

@@ -16,15 +16,17 @@ fields:
     type: generic-relation
     to:
       collections:
-      - user
-      - motion
-      - assignment
+        - assignment
+        - motion
+        - poll
+        - user
       field: history_entry_ids
     restriction_mode: A
     reference:
-    - user
-    - motion
-    - assignment
+      - assignment
+      - motion
+      - poll
+      - user
   position_id:
     type: relation
     to: history_position/entry_ids

collections/meeting.yml

@@ -544,26 +544,21 @@ fields:
     restriction_mode: B
   motion_poll_default_type:
     type: string
-    default: pseudoanonymous
+    default: secret
     restriction_mode: B
-  motion_poll_default_method:
-    type: string
-    default: YNA
+  motion_poll_default_allow_abstain:
+    type: boolean
+    default: true
     restriction_mode: B
   motion_poll_default_onehundred_percent_base:
     type: string
-    enum: onehundred_percent_bases
-    default: YNA
+    enum: approval_onehundred_percent_bases
+    default: valid
     restriction_mode: B
   motion_poll_default_group_ids:
     type: relation-list
     to: group/used_as_motion_poll_default_id
     restriction_mode: B
-  motion_poll_default_backend:
-    type: string
-    enum: poll_backends
-    default: fast
-    restriction_mode: B
   motion_poll_projection_name_order_first:
     type: string
     enum:
@@ -578,18 +573,6 @@ fields:
     required: true
     restriction_mode: B
 
-  # poll list election
-  poll_candidate_list_ids:
-    type: relation-list
-    to: poll_candidate_list/meeting_id
-    reference: poll_candidate_list
-    restriction_mode: B
-  poll_candidate_ids:
-    type: relation-list
-    to: poll_candidate/meeting_id
-    reference: poll_candidate
-    restriction_mode: B
-
   # Users
   meeting_user_ids:
     type: relation-list
@@ -710,11 +693,11 @@ fields:
     restriction_mode: B
   assignment_poll_default_type:
     type: string
-    default: pseudoanonymous
+    default: secret
     restriction_mode: B
   assignment_poll_default_method:
     type: string
-    default: Y
+    default: selection
     restriction_mode: B
   assignment_poll_default_onehundred_percent_base:
     type: string
@@ -725,11 +708,6 @@ fields:
     type: relation-list
     to: group/used_as_assignment_poll_default_id
     restriction_mode: B
-  assignment_poll_default_backend:
-    type: string
-    enum: poll_backends
-    default: fast
-    restriction_mode: B
 
   # Polls
   poll_ballot_paper_selection:
@@ -751,22 +729,27 @@ fields:
     restriction_mode: B
   poll_default_onehundred_percent_base:
     type: string
-    enum: onehundred_percent_bases
-    default: YNA
+    enum: selection_onehundred_percent_bases
+    default: valid
     restriction_mode: B
   poll_default_group_ids:
     type: relation-list
     to: group/used_as_poll_default_id
     restriction_mode: B
-  poll_default_backend:
-    type: string
-    enum: poll_backends
-    default: fast
-    restriction_mode: B
   poll_default_live_voting_enabled:
     type: boolean
     default: false
-    description: Defines default 'poll.live_voting_enabled' option suggested to user. Is not used in the validations.
+    description: Defines default 'poll.published' before finished option suggested to user. Is not used in the validations.
+    restriction_mode: B
+  poll_default_allow_invalid:
+    type: boolean
+    default: false
+    description: Defines defaut `poll.allow_invalid` option suggested to user.
+    restriction_mode: B
+  poll_default_allow_vote_split:
+    type: boolean
+    default: false
+    description: Defines defaut `poll.allow_vote_split` option suggested to user.
     restriction_mode: B
   poll_couple_countdown:
     type: boolean
@@ -921,18 +904,6 @@ fields:
     reference: poll
     on_delete: CASCADE
     restriction_mode: B
-  option_ids:
-    type: relation-list
-    to: option/meeting_id
-    reference: option
-    on_delete: CASCADE
-    restriction_mode: B
-  vote_ids:
-    type: relation-list
-    to: vote/meeting_id
-    reference: vote
-    on_delete: CASCADE
-    restriction_mode: B
   assignment_ids:
     type: relation-list
     to: assignment/meeting_id

collections/meeting_user.yml

@@ -1,5 +1,5 @@
 unique_together:
-- meeting_id, user_id
+  - meeting_id, user_id
 
 fields:
   id:
@@ -87,6 +87,24 @@ fields:
     to: meeting_user/vote_delegated_to_id
     equal_fields: meeting_id
     restriction_mode: A
+  poll_voted_ids:
+    type: relation-list
+    to: poll/voted_ids
+    restriction_mode: A
+  poll_option_ids:
+    type: relation-list
+    to: poll_option/meeting_user_id
+    reference: poll_option
+    required: false
+    restriction_mode: A
+  acting_ballot_ids:
+    type: relation-list
+    to: poll_ballot/acting_meeting_user_id
+    restriction_mode: A
+  represented_ballot_ids:
+    type: relation-list
+    to: poll_ballot/represented_meeting_user_id
+    restriction_mode: A
   chat_message_ids:
     type: relation-list
     to: chat_message/meeting_user_id
@@ -103,4 +121,3 @@ fields:
     equal_fields: meeting_id
     restriction_mode: A
     to: structure_level/meeting_user_ids
-

collections/motion.yml

@@ -217,13 +217,6 @@ fields:
     on_delete: CASCADE
     equal_fields: meeting_id
     restriction_mode: C
-  option_ids:
-    type: relation-list
-    to: option/content_object_id
-    reference: option
-    on_delete: CASCADE
-    equal_fields: meeting_id
-    restriction_mode: C
   change_recommendation_ids:
     type: relation-list
     to: motion_change_recommendation/motion_id