Skip to content

Commit c74ceb5

Browse files
committed
Fix comments
1 parent 35f4330 commit c74ceb5

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

packages/postgres-database/src/simcore_postgres_database/models/funcapi_function_job_collections_to_function_jobs_table.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"order",
4040
sa.Integer,
4141
nullable=False,
42-
doc="Order of the function job in the collection",
42+
doc="Order of the function job in the collection (1-based)",
4343
),
4444
column_created_datetime(),
4545
column_modified_datetime(),

services/web/server/src/simcore_service_webserver/functions/_function_job_collections_repository.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,10 @@ async def list_function_job_collections(
234234
function_job_collections_to_function_jobs_table.c.function_job_collection_uuid
235235
== row.uuid
236236
)
237-
.order_by(function_job_collections_to_function_jobs_table.c.order)
237+
.order_by(
238+
function_job_collections_to_function_jobs_table.c.order,
239+
function_job_collections_to_function_jobs_table.c.function_job_uuid,
240+
)
238241
)
239242
]
240243
collections.append((collection, job_ids))
@@ -286,7 +289,10 @@ async def get_function_job_collection(
286289
function_job_collections_to_function_jobs_table.c.function_job_collection_uuid
287290
== row.uuid
288291
)
289-
.order_by(function_job_collections_to_function_jobs_table.c.order)
292+
.order_by(
293+
function_job_collections_to_function_jobs_table.c.order,
294+
function_job_collections_to_function_jobs_table.c.function_job_uuid,
295+
)
290296
)
291297
]
292298

services/web/server/src/simcore_service_webserver/functions/_function_jobs_repository.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,10 @@ async def list_function_jobs_with_status(
209209
function_job_collections_to_function_jobs_table.c.function_job_collection_uuid
210210
== filter_by_function_job_collection_id
211211
)
212-
.order_by(function_job_collections_to_function_jobs_table.c.order)
212+
.order_by(
213+
function_job_collections_to_function_jobs_table.c.order,
214+
function_job_collections_to_function_jobs_table.c.function_job_uuid,
215+
)
213216
)
214217
filter_conditions = sqlalchemy.and_(
215218
filter_conditions,

0 commit comments

Comments
 (0)