Fix: Inconsistent pagination

 - include item_hash as a tie-breaker

Author: aliel

src/aleph/db/accessors/files.py

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

src/aleph/db/accessors/messages.py

@@ -144,29 +144,35 @@ def make_matching_messages_query(
             select_stmt = select_stmt.where(
                 select_earliest_confirmation.c.height < end_block
             )
+
+        sort_by = SortBy.TX_TIME
         if sort_by == SortBy.TX_TIME:
             order_by_columns = (
                 (
                     nullsfirst(
                         select_earliest_confirmation.c.earliest_confirmation.desc()
                     ),
                     MessageDb.time.desc(),
+                    MessageDb.item_hash.asc(),
                 )
                 if sort_order == SortOrder.DESCENDING
                 else (
                     nullslast(
                         select_earliest_confirmation.c.earliest_confirmation.asc()
                     ),
                     MessageDb.time.asc(),
+                    MessageDb.item_hash.asc(),
                 )
             )
     else:
         order_by_columns = (
+            MessageDb.time.desc(),
             (
-                MessageDb.time.desc()
+                MessageDb.item_hash.asc()
                 if sort_order == SortOrder.DESCENDING
                 else MessageDb.time.asc()
             ),
+            MessageDb.item_hash.asc(),
         )
 
     select_stmt = select_stmt.order_by(*order_by_columns).offset(
@@ -648,10 +654,19 @@ def make_matching_hashes_query(
     if status:
         select_stmt = select_stmt.where(MessageStatusDb.status == status)
 
-    if sort_order == SortOrder.ASCENDING:
-        select_stmt = select_stmt.order_by(MessageStatusDb.reception_time.asc())
-    else:
-        select_stmt = select_stmt.order_by(MessageStatusDb.reception_time.desc())
+    order_by_columns: Tuple = ()
+
+    order_by_columns = (
+        MessageStatusDb.reception_time.asc(),
+        (
+            MessageStatusDb.item_hash.asc()
+            if sort_order == SortOrder.ASCENDING
+            else MessageStatusDb.reception_time.desc()
+        ),
+        MessageStatusDb.item_hash.asc(),
+    )
+
+    select_stmt = select_stmt.order_by(*order_by_columns)
 
     select_stmt = select_stmt.offset((page - 1) * pagination)
 

src/aleph/db/accessors/posts.py

@@ -262,22 +262,28 @@ def filter_post_select_stmt(
                         select_earliest_confirmation.c.earliest_confirmation.desc()
                     ),
                     select_merged_post_subquery.c.created.desc(),
+                    select_merged_post_subquery.c.item_hash.asc(),
                 )
                 if sort_order == SortOrder.DESCENDING
                 else (
                     nullslast(
                         select_earliest_confirmation.c.earliest_confirmation.asc()
                     ),
                     select_merged_post_subquery.c.created.asc(),
+                    select_merged_post_subquery.c.item_hash.asc(),
                 )
             )
         else:
             order_by_columns = (
                 (
-                    last_updated_column.desc()
-                    if sort_order == SortOrder.DESCENDING
-                    else last_updated_column.asc()
-                ),
+                    last_updated_column.desc(),
+                    select_merged_post_subquery.c.original_item_hash.asc(),
+                )
+                if sort_order == SortOrder.DESCENDING
+                else (
+                    last_updated_column.asc(),
+                    select_merged_post_subquery.c.original_item_hash.asc(),
+                )
             )
         select_stmt = select_stmt.order_by(*order_by_columns)
 

src/aleph/web/controllers/accounts.py

@@ -155,7 +155,7 @@ async def get_account_files(request: web.Request) -> web.Response:
             address=address,
             total_size=total_size,
             files=[
-                GetAccountFilesResponseItem.model_validate(file_pin)
+                GetAccountFilesResponseItem.model_validate(dict(file_pin))
                 for file_pin in file_pins
             ],
             pagination_page=query_params.page,