dev change sort user all files

2026-04-13 18:03:03 +07:00
parent 28ddf49af1
commit e089d370cf
1 changed files with 7 additions and 4 deletions
@@ -234,10 +234,13 @@ public class FileEntityHandler implements RequestHandler {
            int page = fileRequest.getPage() != null ? fileRequest.getPage() : 1;
            int pageSize = fileRequest.getPageSize() != null ? fileRequest.getPageSize() : 20;
            String sortBy = fileRequest.getSortBy() != null ? fileRequest.getSortBy() : "createdAt";
-            String sortOrder = fileRequest.getSortOrder().equalsIgnoreCase("desc") ? "desc" :
-                    "asc";
-            Sort sort = Sort.by(fileRequest.getSortOrder().equalsIgnoreCase("desc") ? Sort.Direction.DESC :
-                    Sort.Direction.ASC, sortBy);
+
+            String sortOrder = fileRequest.getSortOrder();
+            Sort.Direction direction = (sortOrder != null && sortOrder.equalsIgnoreCase("desc"))
+                    ? Sort.Direction.DESC
+                    : Sort.Direction.ASC;
+            Sort sort = Sort.by(direction, sortBy);
+
            Pageable pageable = PageRequest.of(page, pageSize, sort);
            FileResponse userFiles = fileEntityService.getUserFiles(userId, pageable, request.getVersion());