161sh/CatgirlIntelligenceAgency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(control) Fix result ordering in the file storage listing view

Browse Source 
In some scenarios, such as when restoring storage items from json-manifest on db failure, the file storage view would present the items in a non-chronological order.  Added a sort() operation to mitigate this.
This commit is contained in:
Viktor Lofgren 2024-01-17 10:56:16 +01:00
parent 7fd4c092e3
commit 304d4c9acf
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
code/services-core/control-service/src/main/java/nu/marginalia/control/node/svc/ControlNodeService.java
View File

@ -360,22 +360,29 @@ public class ControlNodeService {
}
private List<FileStorageBaseWithStorage> makeFileStorageBaseWithStorage(List<FileStorageId> storageIds) throws SQLException {
Map<FileStorageBaseId, FileStorageBase> fileStorageBaseByBaseId = new HashMap<>();
Map<FileStorageBaseId, List<FileStorageWithActions>> fileStoragByBaseId = new HashMap<>();
Map<FileStorageBaseId, List<FileStorageWithActions>> fileStorageByBaseId = new HashMap<>();
for (var id : storageIds) {
var storage = fileStorageService.getStorage(id);
fileStorageBaseByBaseId.computeIfAbsent(storage.base().id(), k -> storage.base());
fileStoragByBaseId.computeIfAbsent(storage.base().id(), k -> new ArrayList<>()).add(new FileStorageWithActions(storage));
fileStorageByBaseId.computeIfAbsent(storage.base().id(), k -> new ArrayList<>()).add(new FileStorageWithActions(storage));
}
List<FileStorageBaseWithStorage> result = new ArrayList<>();
for (var baseId : fileStorageBaseByBaseId.keySet()) {
result.add(new FileStorageBaseWithStorage(fileStorageBaseByBaseId.get(baseId),
fileStoragByBaseId.get(baseId)
));
for (var baseId : fileStorageBaseByBaseId.keySet()) {
var base = fileStorageBaseByBaseId.get(baseId);
var items = fileStorageByBaseId.get(baseId);
// Sort by timestamp, then by relPath
// this ensures that the newest file is listed last
items.sort(Comparator
.comparing(FileStorageWithActions::getTimestamp)
.thenComparing(FileStorageWithActions::getRelPath)
);
result.add(new FileStorageBaseWithStorage(base, items));
}
return result;