Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 19 additions & 0 deletions reading_lists/migrations/0008_fix_order_default.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 6.0.6 on 2026-06-27 21:13

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("reading_lists", "0007_alter_readinglist_unique_together"),
]

operations = [
migrations.AlterField(
model_name="readinglistitem",
name="order",
field=models.PositiveIntegerField(
default=1, help_text="Position of this issue in the reading list"
),
),
]
29 changes: 29 additions & 0 deletions reading_lists/migrations/0009_renumber_order_from_zero.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
from django.db import migrations


def renumber_items_starting_from_zero(apps, schema_editor):
ReadingList = apps.get_model("reading_lists", "ReadingList")
ReadingListItem = apps.get_model("reading_lists", "ReadingListItem")

for reading_list in ReadingList.objects.all():
items = list(
ReadingListItem.objects.filter(reading_list=reading_list).order_by("order", "pk")
)
if items and items[0].order == 0:
for new_order, item in enumerate(items, start=1):
if item.order != new_order:
item.order = new_order
item.save()


class Migration(migrations.Migration):
dependencies = [
("reading_lists", "0008_fix_order_default"),
]

operations = [
migrations.RunPython(
renumber_items_starting_from_zero,
reverse_code=migrations.RunPython.noop,
),
]
2 changes: 1 addition & 1 deletion reading_lists/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ class IssueType(models.TextChoices):
related_name="reading_list_items",
)
order = models.PositiveIntegerField(
default=0,
default=1,
help_text="Position of this issue in the reading list",
)
issue_type = models.CharField(
Expand Down
4 changes: 2 additions & 2 deletions tests/reading_lists/test_models.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,9 @@ def test_issue_cascade_delete(self, reading_list_with_issues, reading_list_issue
assert ReadingList.objects.filter(id=reading_list_with_issues.id).exists()

def test_reading_list_item_default_order(self, public_reading_list, reading_list_issue_1):
"""Test that order defaults to 0."""
"""Test that order defaults to 1."""
item = ReadingListItem.objects.create(
reading_list=public_reading_list,
issue=reading_list_issue_1,
)
assert item.order == 0
assert item.order == 1
Loading