fix default sortering

Author: matusdrobuliak66

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/licensed_items_checkouts_db.py

@@ -111,12 +111,19 @@ async def list_(
     # Ordering and pagination
     if order_by.direction == OrderDirection.ASC:
         list_query = base_query.order_by(
-            sa.asc(getattr(resource_tracker_licensed_items_checkouts.c, order_by.field))
+            sa.asc(
+                getattr(resource_tracker_licensed_items_checkouts.c, order_by.field)
+            ),
+            resource_tracker_licensed_items_checkouts.c.licensed_item_checkout_id,
         )
     else:
         list_query = base_query.order_by(
             sa.desc(
-                getattr(resource_tracker_licensed_items_checkouts.c, order_by.field)
+                getattr(
+                    resource_tracker_licensed_items_checkouts.c,
+                    order_by.field,
+                    resource_tracker_licensed_items_checkouts.c.licensed_item_checkout_id,
+                )
             )
         )
     list_query = list_query.offset(offset).limit(limit)

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/licensed_items_purchases_db.py

@@ -110,13 +110,17 @@ async def list_(
     # Ordering and pagination
     if order_by.direction == OrderDirection.ASC:
         list_query = base_query.order_by(
-            sa.asc(getattr(resource_tracker_licensed_items_purchases.c, order_by.field))
+            sa.asc(
+                getattr(resource_tracker_licensed_items_purchases.c, order_by.field)
+            ),
+            resource_tracker_licensed_items_purchases.c.licensed_item_purchase_id,
         )
     else:
         list_query = base_query.order_by(
             sa.desc(
                 getattr(resource_tracker_licensed_items_purchases.c, order_by.field)
-            )
+            ),
+            resource_tracker_licensed_items_purchases.c.licensed_item_purchase_id,
         )
     list_query = list_query.offset(offset).limit(limit)
 

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/pricing_plans_db.py

@@ -208,7 +208,10 @@ async def list_pricing_plans_by_product(
         count_query = sa.select(sa.func.count()).select_from(subquery)
 
         # Default ordering
-        list_query = base_query.order_by(resource_tracker_pricing_plans.c.created.asc())
+        list_query = base_query.order_by(
+            resource_tracker_pricing_plans.c.created.asc(),
+            resource_tracker_pricing_plans.c.pricing_plan_id,
+        )
 
         total_count = await conn.scalar(count_query)
         if total_count is None:

services/resource-usage-tracker/src/simcore_service_resource_usage_tracker/services/modules/db/service_runs_db.py

@@ -424,7 +424,10 @@ async def get_osparc_credits_aggregated_by_service(
 
         # Default ordering and pagination
         list_query = (
-            base_query.order_by(resource_tracker_service_runs.c.service_key.asc())
+            base_query.order_by(
+                resource_tracker_service_runs.c.service_key.asc(),
+                resource_tracker_service_runs.c.service_run_id,
+            )
             .offset(offset)
             .limit(limit)
         )

services/resource-usage-tracker/tests/unit/with_dbs/test_licensed_items_checkouts_db.py

@@ -71,6 +71,8 @@ async def test_licensed_items_checkouts_db__force_release_license_seats_by_run_i
     # SETUP
     _create_license_item_checkout_db_1 = CreateLicensedItemCheckoutDB(
         licensed_item_id="beb16d18-d57d-44aa-a638-9727fa4a72ef",
+        key="Duke",
+        version="1.0.0",
         wallet_id=_WALLET_ID,
         user_id=_USER_ID_1,
         user_email="[email protected]",

services/web/server/src/simcore_service_webserver/licenses/_licensed_items_repository.py

@@ -315,10 +315,14 @@ async def list_licensed_items(
 
     # Ordering and pagination
     if order_by.direction == OrderDirection.ASC:
-        list_query = base_query.order_by(asc(getattr(licensed_items.c, order_by.field)))
+        list_query = base_query.order_by(
+            asc(getattr(licensed_items.c, order_by.field)),
+            licensed_items.c.licensed_item_id,
+        )
     else:
         list_query = base_query.order_by(
-            desc(getattr(licensed_items.c, order_by.field))
+            desc(getattr(licensed_items.c, order_by.field)),
+            licensed_items.c.licensed_item_id,
         )
     list_query = list_query.offset(offset).limit(limit)