Fix: posts tests messages with pagination

Author: aliel

src/aleph/db/accessors/files.py

@@ -170,15 +170,17 @@ def get_address_files_for_api(
     if pagination:
         select_stmt = select_stmt.limit(pagination).offset((page - 1) * pagination)
 
-    order_by_columns = (
-        MessageFilePinDb.created.desc(),
-        (
-            MessageFilePinDb.item_hash.asc()
-            if sort_order == SortOrder.DESCENDING
-            else MessageFilePinDb.created.asc()
-        ),
-        MessageFilePinDb.item_hash.asc(),
-    )
+    if sort_order == SortOrder.DESCENDING:
+        order_by_columns = (
+            MessageFilePinDb.created.desc(),
+            MessageFilePinDb.item_hash.asc(),
+        )
+    else:  # ASCENDING
+        order_by_columns = (
+            MessageFilePinDb.item_hash.asc(),
+            MessageFilePinDb.item_hash.asc(),
+        )
+
     select_stmt = select_stmt.order_by(*order_by_columns)
 
     return session.execute(select_stmt).all()

src/aleph/db/accessors/messages.py

@@ -165,15 +165,16 @@ def make_matching_messages_query(
                 )
             )
     else:
-        order_by_columns = (
-            MessageDb.time.desc(),
-            (
-                MessageDb.item_hash.asc()
-                if sort_order == SortOrder.DESCENDING
-                else MessageDb.time.asc()
-            ),
-            MessageDb.item_hash.asc(),
-        )
+        if sort_order == SortOrder.DESCENDING:
+            order_by_columns = (
+                MessageDb.time.desc(),
+                MessageDb.item_hash.asc(),
+            )
+        else:  # ASCENDING
+            order_by_columns = (
+                MessageDb.time.asc(),
+                MessageDb.item_hash.asc(),
+            )
 
     select_stmt = select_stmt.order_by(*order_by_columns).offset(
         (page - 1) * pagination

tests/api/test_list_messages.py

@@ -395,7 +395,22 @@ async def fetch_messages_with_pagination_expect_success(
 
 @pytest.mark.asyncio()
 async def test_pagination(fixture_messages, ccn_api_client):
-    sorted_messages_by_time = sorted(fixture_messages, key=lambda msg: msg["time"])
+    forgotten_messages = list(
+        filter(lambda msg: msg["type"] == "FORGET", fixture_messages)
+    )
+    forgotten_hashes = list(
+        itertools.chain.from_iterable(
+            [msg["content"]["hashes"] for msg in forgotten_messages]
+        )
+    )
+
+    messages_without_forgotten = list(
+        filter(lambda msg: msg["item_hash"] not in forgotten_hashes, fixture_messages)
+    )
+
+    sorted_messages_by_time = sorted(
+        messages_without_forgotten, key=lambda msg: msg["time"]
+    )
 
     # More messages than available
     messages = await fetch_messages_with_pagination_expect_success(
@@ -427,10 +442,11 @@ async def test_pagination(fixture_messages, ccn_api_client):
     )
     assert_messages_equal(messages, sorted_messages_by_time[-1:])
 
-    # Some messages, reverse sort order
+    # Some messages, ascending sort order
     messages = await fetch_messages_with_pagination_expect_success(
         ccn_api_client, page=1, pagination=3, sort_order=1
     )
+
     assert_messages_equal(messages, sorted_messages_by_time[:3])
 
     # Several pages too far