Sort published_codelists in the same order as all_codelists

Author: tomodwyer

opencodelists/tests/views/test_user.py

@@ -184,3 +184,49 @@ def test_user_codelists_case_insensitive_sort_with_user_first_for_same_name(
         if codelist["codelist"].name.casefold() == "alpha list"
     ]
     assert [codelist.owner for codelist in matching_codelists] == [user, organisation]
+
+
+def test_published_codelists_sorted_in_same_order_as_all_codelists(
+    client,
+    user,
+    user_codelist,
+    user_codelist_from_scratch,
+):
+    update_codelist(
+        codelist=user_codelist,
+        owner=user,
+        name="zeta list",
+        slug="zeta-list",
+        description=user_codelist.description,
+        methodology=user_codelist.methodology,
+        references={},
+        signoffs={},
+    )
+    update_codelist(
+        codelist=user_codelist_from_scratch,
+        owner=user,
+        name="ALPHA LIST",
+        slug="alpha-list",
+        description=user_codelist_from_scratch.description,
+        methodology=user_codelist_from_scratch.methodology,
+        references={},
+        signoffs={},
+    )
+    save_for_review(draft=user_codelist_from_scratch.versions.first())
+    publish_version(version=user_codelist_from_scratch.versions.last())
+
+    client.force_login(user)
+    response = client.get(reverse("user", args=(user.username,)))
+
+    codelist_ids = {user_codelist.id, user_codelist_from_scratch.id}
+    all_codelist_ids = [
+        codelist["codelist"].id
+        for codelist in response.context["all_codelists"]
+        if codelist["codelist"].id in codelist_ids
+    ]
+    published_codelist_ids = [
+        version.codelist.id
+        for version in response.context["published_codelists"]
+        if version.codelist.id in codelist_ids
+    ]
+    assert published_codelist_ids == all_codelist_ids

opencodelists/views/user.py

@@ -8,6 +8,14 @@
 def user(request, username):
     user = get_object_or_404(User, username=username)
 
+    def codelist_sort_key(codelist):
+        return (
+            codelist.name.casefold(),
+            codelist.owner != user,
+            str(codelist.owner).casefold(),
+            codelist.updated_at,
+        )
+
     # Find all of the codelists owned (in their current version) by this user with at least one published version.
     owned_codelists = user.codelists.filter(
         versions__status=Status.PUBLISHED
@@ -38,15 +46,7 @@ def user(request, username):
                 else []
             ),
         }
-        for codelist in sorted(
-            codelists_to_display,
-            key=lambda x: (
-                x.name.casefold(),
-                x.owner != user,
-                str(x.owner).casefold(),
-                x.updated_at,
-            ),
-        )
+        for codelist in sorted(codelists_to_display, key=codelist_sort_key)
         # We sort by name, then owner, then date (all case-insensitive where applicable),
         # while making sure the current user's codelists appear before organisation ones
         # when names are the same.
@@ -59,10 +59,8 @@ def user(request, username):
         "user": user,
         "published_codelists": [
             codelist.latest_published_version()
-            for codelist in owned_codelists.order_by("handles__name")
+            for codelist in sorted(owned_codelists, key=codelist_sort_key)
         ],
-        # note that name is a property on a codelist, not an attribute, and it comes from the current handle.
-        # If we want to order codelists or versions by codelist name, we actually need to order them by handle name.
         "all_codelists": all_codelists,
     }
 

templates/opencodelists/that_user.html

@@ -24,7 +24,7 @@ <h2 class="text-2xl/tight font-bold text-slate-900">Published codelists</h2>
             aria-label="Search for codelists published by {{ user.name }}"
             class="block w-full rounded-md border border-slate-300 bg-white px-4 py-3 text-base text-slate-900 placeholder:text-slate-400 focus:border-blue-600 focus:ring-2 focus:ring-blue-600/20 focus:outline-none"
             id="codelist-search"
-            placeholder="Filter by name or coding system"
+            placeholder="Search codelists by name or coding system"
             type="search"
           />
         </div>