8000 Do not change source object order when coping by pawel-kordowski · Pull Request #313 · django-ordered-model/django-ordered-model · GitHub
[go: up one dir, main page]
Skip to content

Do not change source object order when coping #313

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Do not change source object order when coping #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0224ee1
Do not change object order when coping
pawmarkor Jan 27, 2024
2a84901
add CHANGES and comments
shuckc Jan 29, 2024
99f4a05
fix: upstream black change to formatting rules
shuckc Jan 29, 2024
9fb8dc6
problem: bad case
shuckc Jan 29, 2024
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
1 change: 1 addition & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Unreleased
----------
- Fix `post_delete` signal triggered upshuffles to do a potentially expensive full reordering of the owrt group (#307)
- Support passing custom `--batch_size` to `reorder_model` management command (#303)
- Support Django model instance copy protocol (ie. clearing pk and saving) (#313)


3.7.4 - 2023-03-17
Expand Down
16 changes: 10 additions & 6 deletions ordered_model/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,11 @@ def move_view(self, request, object_id, direction):
redir_path = "%s%s%s" % (
mangled,
"/" if not mangled.endswith("/") else "",
("?" + iri_to_uri(request.META.get("QUERY_STRING", "")))
if request.META.get("QUERY_STRING", "")
else "",
(
("?" + iri_to_uri(request.META.get("QUERY_STRING", "")))
if request.META.get("QUERY_STRING", "")
else ""
),
)

return HttpResponseRedirect(redir_path)
Expand Down Expand Up @@ -196,9 +198,11 @@ def move_view(self, request, admin_id, object_id, direction):
redir_path = "%s%s%s" % (
mangled,
"/" if not mangled.endswith("/") else "",
("?" + iri_to_uri(request.META.get("QUERY_STRING", "")))
if request.META.get("QUERY_STRING", "")
else "",
(
("?" + iri_to_uri(request.META.get("QUERY_STRING", "")))
if request.META.get("QUERY_STRING", "")
else ""
),
)

return HttpResponseRedirect(redir_path)
Expand Down
5 changes: 4 additions & 1 deletion ordered_model/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,10 @@ def next(self):

def save(self, *args, **kwargs):
order_field_name = self.order_field_name
wrt_changed = self._wrt_map() != self._original_wrt_map
# support model-instance copy protocol, by detaching from _original_wrt_map
# https://docs.djangoproject.com/en/4.2/topics/db/queries/#copying-model-instances
adding = self.pk is None or self._state.adding
wrt_changed = not adding and self._wrt_map() != self._original_wrt_map

if wrt_changed and getattr(self, order_field_name) is not None:
# do delete-like upshuffle using original_wrt values!
Expand Down
61 changes: 61 additions & 0 deletions tests/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,44 @@ def setUp(self):
with assertNumQueries(self, 1):
Answer.objects.get(id=self.q1_a1.id)

def test_copy(self):
q3 = Question.objects.create()
old_q1_a1_pk = self.q1_a1.pk
# make a copy by clearing pk
self.q1_a1.pk = None
self.q1_a1.question = q3
self.q1_a1.save()
self.assertNotEqual(old_q1_a1_pk, self.q1_a1.pk)
self.assertSequenceEqual(
Answer.objects.values_list("pk", "order"),
[
(old_q1_a1_pk, 0),
(self.q1_a2.pk, 1),
(self.q2_a1.pk, 0),
(self.q2_a2.pk, 1),
(self.q1_a1.pk, 0), # now q3
],
)

# copy q2_a2 -> q2_a3
self.q2_a2_pk = self.q2_a2.pk
self.q2_a3 = self.q2_a2
self.q2_a3.pk = None
self.q2_a3.save()
self.assertNotEqual(self.q2_a3.pk, self.q2_a2_pk)
self.assertSequenceEqual(
Answer.objects.values_list("pk", "order"),
[
(old_q1_a1_pk, 0),
(self.q1_a2.pk, 1),
(self.q2_a1.pk, 0),
(self.q2_a2_pk, 1),
(self.q2_a3.pk, 2),
(self.q1_a1.pk, 0), # now q3
],
)


def test_saved_order(self):
self.assertSequenceEqual(
Answer.objects.values_list("pk", "order"),
Expand Down Expand Up @@ -300,6 +338,29 @@ def test_bottom(self):
)


class OrderWithRespectToCustomPKTest(TestCase):
def setUp(self):
group = CustomPKGroup.objects.create(name="g1")
self.item = CustomPKGroupItem.objects.create(name="g1 i1", group=group)
CustomPKGroupItem.objects.create(name="g1 i2", group=group)

def test_copy(self):
group = CustomPKGroup.objects.create(name="g2")
self.item.name = "g2 i1"
# make a copy by setting adding flag
self.item._state.adding = True
self.item.group = group
self.item.save()
self.assertSequenceEqual(
CustomPKGroupItem.objects.order_by("name").values_list("name", "order"),
[
("g1 i1", 0),
("g1 i2", 1),
("g2 i1", 0),
],
)


class OrderWithRespectToReorderTests(TestCase):
def setUp(self):
q1 = Question.objects.create()
Expand Down
0