Skip to content

[rel-DB] Sequential numbers cleanup #3174

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
vkrasnovyd merged 20 commits into from
Nov 13, 2025
Merged

[rel-DB] Sequential numbers cleanup #3174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
43e30bf
Update meta and models
vkrasnovyd Oct 7, 2025
a20eeb6
Remove sequential_number from set_models in tests
vkrasnovyd Oct 7, 2025
3010672
Start of actions cleanup
vkrasnovyd Oct 7, 2025
6c6ed51
Finish cleanup
vkrasnovyd Oct 8, 2025
2780e30
Fix database tests
vkrasnovyd Oct 8, 2025
8fe2099
Merge branch 'feature/relational-db' into rel-db-sequential-numbers-c…
vkrasnovyd Oct 8, 2025
da1114e
Clean merged files
vkrasnovyd Oct 8, 2025
2edd3d3
Adapt backend to meta
vkrasnovyd Oct 9, 2025
b9db8a5
Update meta
vkrasnovyd Oct 9, 2025
49dee81
Test meeting_import with sequential_number
vkrasnovyd Oct 9, 2025
d344293
Fix committee_id in test data
vkrasnovyd Oct 9, 2025
c617b96
Remove sequential_numbers from shared test data
vkrasnovyd Oct 9, 2025
615f6ca
Update sequential_number test
vkrasnovyd Oct 28, 2025
d0dac8b
Fix comments
vkrasnovyd Oct 28, 2025
dcdec4e
Update meta hash
vkrasnovyd Oct 29, 2025
b91faa0
Regenerate models and lint
vkrasnovyd Oct 29, 2025
14b20db
Lint
vkrasnovyd Oct 29, 2025
bbf0a87
Lint
vkrasnovyd Oct 29, 2025
6ff24d6
Minor fixes
vkrasnovyd Nov 10, 2025
ae6c693
Update meta, revert vote changes
vkrasnovyd Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 3 additions & 46 deletions data/example-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
"meeting_ids": [
1
],
"organization_id": 1,
"organization_id": 1,
"committee_ids": [
1
]
Expand Down Expand Up @@ -967,7 +967,6 @@
"list_of_speakers": {
"1": {
"id": 1,
"sequential_number": 1,
"content_object_id": "motion/1",
"closed": false,
"speaker_ids": [
Expand All @@ -979,14 +978,12 @@
},
"2": {
"id": 2,
"sequential_number": 2,
"content_object_id": "motion/2",
"closed": false,
"meeting_id": 1
},
"3": {
"id": 3,
"sequential_number": 3,
"content_object_id": "topic/1",
"closed": false,
"speaker_ids": [
Expand All @@ -997,28 +994,24 @@
},
"4": {
"id": 4,
"sequential_number": 4,
"content_object_id": "topic/2",
"closed": false,
"meeting_id": 1
},
"5": {
"id": 5,
"sequential_number": 5,
"content_object_id": "topic/3",
"closed": false,
"meeting_id": 1
},
"6": {
"id": 6,
"sequential_number": 6,
"content_object_id": "topic/4",
"closed": false,
"meeting_id": 1
},
"7": {
"id": 7,
"sequential_number": 7,
"content_object_id": "topic/5",
"closed": false,
"speaker_ids": [
Expand All @@ -1029,7 +1022,6 @@
},
"8": {
"id": 8,
"sequential_number": 8,
"content_object_id": "topic/6",
"closed": false,
"speaker_ids": [
Expand All @@ -1039,21 +1031,18 @@
},
"9": {
"id": 9,
"sequential_number": 9,
"content_object_id": "topic/7",
"closed": false,
"meeting_id": 1
},
"10": {
"id": 10,
"sequential_number": 10,
"content_object_id": "topic/8",
"closed": false,
"meeting_id": 1
},
"11": {
"id": 11,
"sequential_number": 11,
"content_object_id": "assignment/1",
"closed": false,
"speaker_ids": [
Expand All @@ -1065,21 +1054,18 @@
},
"12": {
"id": 12,
"sequential_number": 12,
"content_object_id": "motion/3",
"closed": false,
"meeting_id": 1
},
"13": {
"id": 13,
"sequential_number": 13,
"content_object_id": "motion/4",
"closed": false,
"meeting_id": 1
},
"14": {
"id": 14,
"sequential_number": 14,
"content_object_id": "assignment/2",
"closed": false,
"speaker_ids": [
Expand All @@ -1090,14 +1076,12 @@
},
"15": {
"id": 15,
"sequential_number": 15,
"content_object_id": "motion_block/1",
"closed": false,
"meeting_id": 1
},
"16": {
"id": 16,
"sequential_number": 16,
"content_object_id": "meeting_mediafile/1",
"closed": false,
"meeting_id": 1
Expand All @@ -1106,7 +1090,7 @@
"speaker": {
"11": {
"id": 11,
"weight": 11,
"weight": 11,
"begin_time": 1584512636,
"end_time": 1584512638,
"list_of_speakers_id": 1,
Expand Down Expand Up @@ -1202,63 +1186,55 @@
"1": {
"id": 1,
"title": "A",
"sequential_number": 1,
"agenda_item_id": 3,
"list_of_speakers_id": 3,
"meeting_id": 1
},
"2": {
"id": 2,
"title": "B",
"sequential_number": 2,
"agenda_item_id": 4,
"list_of_speakers_id": 4,
"meeting_id": 1
},
"3": {
"id": 3,
"title": "C",
"sequential_number": 3,
"agenda_item_id": 5,
"list_of_speakers_id": 5,
"meeting_id": 1
},
"4": {
"id": 4,
"title": "D",
"sequential_number": 4,
"agenda_item_id": 6,
"list_of_speakers_id": 6,
"meeting_id": 1
},
"5": {
"id": 5,
"title": "E",
"sequential_number": 5,
"agenda_item_id": 7,
"list_of_speakers_id": 7,
"meeting_id": 1
},
"6": {
"id": 6,
"title": "F",
"sequential_number": 6,
"agenda_item_id": 8,
"list_of_speakers_id": 8,
"meeting_id": 1
},
"7": {
"id": 7,
"title": "G",
"sequential_number": 7,
"agenda_item_id": 9,
"list_of_speakers_id": 9,
"meeting_id": 1
},
"8": {
"id": 8,
"title": "H",
"sequential_number": 8,
"agenda_item_id": 10,
"list_of_speakers_id": 10,
"meeting_id": 1
Expand All @@ -1269,7 +1245,6 @@
"id": 1,
"number": "A1",
"number_value": 1,
"sequential_number": 1,
"title": "test",
"text": "<ul>\n<li>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis natoque</li>\n<li>penatibus et magnis dis parturient montes, nascetur ridiculus mus. Donec quam felis, ultricies nec, pellentesque eu, pretium quis, sem. Nulla consequat ma</li>\n<li>ssa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, vene<br>\n<br>\nnatis vitae, justo. Null<br>\nam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi.Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibu</li>\n<li>s in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem.Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut</li>\n</ul>",
"modified_final_version": "<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Aenean commodo ligula eget dolor. Aenean massa. Cum sociis, pellentesque eu, pretium quis, sem. Nulla consequat massa quis enim. Donec pede justo, fringilla vel, aliquet nec, vulputate eget, arcu. In enim justo, rhoncus ut, imperdiet a, venenatis vitae, justo. Nullam dictum felis eu pede mollis pretium. Integer tincidunt. Cras dapibus. Vivamus elementum semper nisi.Aenean vulputate eleifend tellus. Aenean leo ligula, porttitor eu, consequat vitae, eleifend ac, enim. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Etiam ultricies nisi vel augue. Curabitur ullamcorper ultricies nisi. Nam eget dui. Etiam rhoncus. Maecenas tempus, tellus eget condimentum rhoncus, sem quam semper libero, sit amet adipiscing sem neque sed ipsum. Nam quam nunc, blandit vel, luctus pulvinar, hendrerit id, lorem.Maecenas nec odio et ante tincidunt tempus. Donec vitae sapien ut libero venenatis faucibus. Nullam quis ante. Etiam sit amet orci eget eros faucibus tincidunt. Duis leo. Sed fringilla mauris sit amet nibh. Donec sodales sagittis magna. Sed consequat, leo eget bibendum sodales, augue velit cursus nunc, quis gravida magna mi a libero. Fusce vulputate eleifend sapien. Vestibulum purus quam, scelerisque ut, mollis sed, nonummy id, metus. Nullam accumsan lorem in dui. Cras ultricies mi eu turpis hendrerit fringilla. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; In ac dui quis mi consectetuer lacinia. Nam pretium turpis et arcu. Duis arcu tortor, suscipit eget, imperdiet nec, imperdiet iaculis, ipsum. Sed aliquam ultrices mauris. Integer ante arcu, accumsan a, consectetuer eget, posuere ut, mauris. Praesent adipiscing. Phasellus ullamcorper ipsum rutrum nunc. Nunc nonummy metus. Vestibulum volutpat pretium libero. Cras id dui. Aenean ut</p>",
Expand Down Expand Up @@ -1306,7 +1281,6 @@
"id": 2,
"number": "1 - 1",
"number_value": 1,
"sequential_number": 2,
"title": "\u00c4nderungsantrag zu 1",
"text": "<p>l&ouml;mk</p>",
"text_hash": "0339e76557663e3a6f03b9e347409f97",
Expand Down Expand Up @@ -1337,7 +1311,6 @@
"id": 3,
"number": "2",
"number_value": 2,
"sequential_number": 3,
"title": "ohne",
"text": "<p>sf</p>",
"text_hash": "60d31eb37595dd44584be5ef363283e3",
Expand Down Expand Up @@ -1369,7 +1342,6 @@
"id": 4,
"number": "3",
"number_value": 3,
"sequential_number": 4,
"title": "komplex",
"text": "<p>sdf sdfpdfkw wef</p>\n\n<p>wepkf&nbsp;</p>\n\n<p>we&uuml;pfk&nbsp;</p>\n\n<p>we&uuml;pfdfg</p>",
"text_hash": "af905e34b34d2b08b60c6af41153f078",
Expand Down Expand Up @@ -1438,7 +1410,6 @@
"id": 1,
"name": "Neu",
"weight": 10000,
"sequential_number": 1,
"comment_ids": [
1
],
Expand All @@ -1460,7 +1431,6 @@
"prefix": "C",
"weight": 2,
"level": 0,
"sequential_number": 1,
"child_ids": [
2
],
Expand All @@ -1475,7 +1445,6 @@
"prefix": "B",
"weight": 4,
"level": 1,
"sequential_number": 2,
"parent_id": 1,
"motion_ids": [
1,
Expand All @@ -1488,7 +1457,6 @@
"1": {
"id": 1,
"title": "BLOCK A",
"sequential_number": 1,
"motion_ids": [
3,
4
Expand Down Expand Up @@ -1648,7 +1616,7 @@
"allow_support": false,
"set_workflow_timestamp": true,
"allow_motion_forwarding": true,
"allow_amendment_forwarding": true,
"allow_amendment_forwarding": true,
"meeting_id": 1
},
"6": {
Expand Down Expand Up @@ -1902,7 +1870,6 @@
"1": {
"id": 1,
"name": "Simple Workflow",
"sequential_number": 1,
"state_ids": [
1,
2,
Expand All @@ -1917,7 +1884,6 @@
"2": {
"id": 2,
"name": "Complex Workflow",
"sequential_number": 2,
"state_ids": [
5,
6,
Expand Down Expand Up @@ -1950,7 +1916,6 @@
"votesvalid": "2.000000",
"votesinvalid": "9.000000",
"votescast": "2.000000",
"sequential_number": 1,
"content_object_id": "motion/1",
"option_ids": [
1
Expand All @@ -1973,7 +1938,6 @@
"max_votes_amount": 1,
"max_votes_per_option": 1,
"onehundred_percent_base": "YNA",
"sequential_number": 2,
"content_object_id": "motion/1",
"option_ids": [
3
Expand All @@ -1999,7 +1963,6 @@
"global_no": true,
"global_abstain": true,
"onehundred_percent_base": "YNA",
"sequential_number": 3,
"content_object_id": "assignment/1",
"option_ids": [
5
Expand All @@ -2025,7 +1988,6 @@
"votesvalid": "9.000000",
"votesinvalid": "2.000000",
"votescast": "16.000000",
"sequential_number": 4,
"content_object_id": "assignment/1",
"option_ids": [
7,
Expand Down Expand Up @@ -2053,7 +2015,6 @@
"votesvalid": "1.000000",
"votesinvalid": "0.000000",
"votescast": "1.000000",
"sequential_number": 5,
"content_object_id": "assignment/2",
"voted_ids": [
1
Expand Down Expand Up @@ -2300,7 +2261,6 @@
"title": "Wahl",
"open_posts": 1,
"phase": "voting",
"sequential_number": 1,
"candidate_ids": [
1,
2,
Expand All @@ -2324,7 +2284,6 @@
"open_posts": 1,
"phase": "search",
"number_poll_candidates": true,
"sequential_number": 2,
"candidate_ids": [
4,
5
Expand Down Expand Up @@ -2428,7 +2387,6 @@
"show_title": true,
"show_logo": true,
"show_clock": true,
"sequential_number": 1,
"current_projection_ids": [
3,
4
Expand Down Expand Up @@ -2474,7 +2432,6 @@
"show_title": true,
"show_logo": true,
"show_clock": true,
"sequential_number": 2,
"used_as_default_projector_for_list_of_speakers_in_meeting_id": 1,
"used_as_default_projector_for_current_los_in_meeting_id": 1,
"meeting_id": 1
Expand Down
3 changes: 1 addition & 2 deletions docs/actions/motion.create.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ There are some fields that need special attention:
- `agenda_*`: See [Agenda](https://github.com/OpenSlides/OpenSlides/wiki/Agenda#additional-fields-during-creation-of-agenda-content-objects).

Other things to do when creating motions:
- Set the field `sequential_number`: It is the `max+1` of `sequential_number` of all motions in the same meeting. If there are no other motions in this meeting (e.g. this is the first one), it gets 1.
- Set timestamps:
- always set `last_modified` and `created` to the current timestamp
- if the state pointed to by `first_state_id` of the given workflow has the flag `set_workflow_timestamp` set, also set `workflow_timestamp`to the current timestamp.
Expand Down Expand Up @@ -98,7 +97,7 @@ This is the procedure to determine what to set for the field `number`:
* Remember: `number` must be unique. If a motion with this number already exists, increment `number_value` by one and go to the last step (the prefix is the same, the number incremented - try again).
* If there is a unique `number`, save it into the motion. Done!
* Note: The complete calculation is restricted to motions and other objects from the same meeting.

### Some examples for determinating the number. First comes the general setup and the test cases are numbered:

`meeting/motions_number_type="manually"`
Expand Down
1 change: 0 additions & 1 deletion docs/actions/motion.create_forwarded.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ The result object for each instance has the format
```
{
id: Id,
sequential_number: int,
non_forwarded_amendment_amount: int, // Number of amendments that couldn't be returned because of forwarding being not allowed in the state
amendment_result_data: [...], // List of result data objects in the same format, for all newly created amendments for the newly created motion
}
Expand Down
2 changes: 1 addition & 1 deletion meta
Open in desktop
Submodule meta updated 12 files
+2 −2 .github/dependabot.yml
+1 −1 .github/workflows/continuous_integration.yml
+8 −8 dev/requirements.txt
+5 −4 dev/sql/base_data.sql
+166 −68 dev/sql/schema_relational.sql
+9 −22 dev/sql/test_data.sql
+74 −17 dev/src/generate_sql_schema.py
+3 −3 dev/src/helper_get_names.py
+11 −0 dev/src/validate.py
+0 −4 dev/tests/base.py
+1 −7 dev/tests/test_generic_relations.py
+54 −58 models.yml
Loading
Loading