A free open source IT asset/license management system
fix(api): stable secondary sort on uploaded-files listing
Rod Christiansen9c66339da76b
diff --git a/app/Http/Controllers/Api/UploadedFilesController.php b/app/Http/Controllers/Api/UploadedFilesController.phpindex 5fb1956df9..a1220be9f5 100644--- a/app/Http/Controllers/Api/UploadedFilesController.php+++ b/app/Http/Controllers/Api/UploadedFilesController.php@@ -71,7 +71,10 @@ class UploadedFilesController extends Controller}$total = $uploads->count();- $uploads = $uploads->skip($offset)->take($limit)->orderBy($sort, $order)->get();+ // Secondary sort by id so files uploaded within the same second (a+ // common case in tests and bulk uploads) return in a stable order+ // rather than whatever the engine happens to pick.+ $uploads = $uploads->skip($offset)->take($limit)->orderBy($sort, $order)->orderBy('id', $order)->get();return (new UploadedFilesTransformer)->transformFiles($uploads, $total);}