From dba87907e84c8e0c8c11b6adc0549c7c058ca0c6 Mon Sep 17 00:00:00 2001
From: Matija Obreza <matija.obreza@croptrust.org>
Date: Tue, 30 Oct 2018 11:05:29 +0100
Subject: [PATCH] Fix: Repository services require sort

---
 .../org/genesys2/server/api/v1/RepositoryController.java    | 4 ++--
 src/main/java/org/genesys2/server/mvc/WiewsController.java  | 6 +++---
 .../org/genesys2/server/mvc/admin/RepositoryController.java | 4 ++--
 .../java/org/genesys2/spring/config/ApplicationStartup.java | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/genesys2/server/api/v1/RepositoryController.java b/src/main/java/org/genesys2/server/api/v1/RepositoryController.java
index 11813c408..7f304b248 100644
--- a/src/main/java/org/genesys2/server/api/v1/RepositoryController.java
+++ b/src/main/java/org/genesys2/server/api/v1/RepositoryController.java
@@ -283,11 +283,11 @@ public class RepositoryController {
 	private FolderDetails folderDetails(final Path path) throws InvalidRepositoryPathException {
 		FolderDetails fd = new FolderDetails();
 		fd.folder = repositoryService.getFolder(path);
-		fd.subFolders = repositoryService.getFolders(path);
+		fd.subFolders = repositoryService.getFolders(path, RepositoryFolder.DEFAULT_SORT);
 		if (fd.folder == null && !path.toAbsolutePath().toString().equals("/")) {
 			throw new ResourceNotFoundException("No such folder");
 		}
-		fd.files = repositoryService.getFiles(path);
+		fd.files = repositoryService.getFiles(path, RepositoryFile.DEFAULT_SORT);
 		fd.gallery = imagegalleryService.loadImageGallery(path);
 		return fd;
 	}
diff --git a/src/main/java/org/genesys2/server/mvc/WiewsController.java b/src/main/java/org/genesys2/server/mvc/WiewsController.java
index f66e4f2b2..5a8294c29 100644
--- a/src/main/java/org/genesys2/server/mvc/WiewsController.java
+++ b/src/main/java/org/genesys2/server/mvc/WiewsController.java
@@ -558,13 +558,13 @@ public class WiewsController extends BaseController {
 		}
 
 		List<String> subPaths = new ArrayList<>();
-		for (RepositoryFolder subPath : repositoryService.listPaths(repositoryPath)) {
+		for (RepositoryFolder subPath : repositoryService.listPathsRecursively(repositoryPath)) {
 			if (!subPath.getFolderPath().equals(repositoryPath)) {
 				subPaths.add(institutePath.relativize(subPath.getFolderPath()).toString());
 			}
 		}
 
-		model.addAttribute("fileList", repositoryService.getFiles(repositoryPath));
+		model.addAttribute("fileList", repositoryService.getFiles(repositoryPath, RepositoryFile.DEFAULT_SORT));
 		model.addAttribute("currentPath", repositoryPath);
 		model.addAttribute("subPaths", subPaths);
 		model.addAttribute("imageGallery", imageGalleryService.loadImageGallery(repositoryPath));
@@ -745,7 +745,7 @@ public class WiewsController extends BaseController {
 		response.setContentType("text/csv;charset=UTF-16LE");
 		response.setHeader("Content-Disposition", "attachment; filename=" + wiewsCode + "_files_metadata.csv ");
 
-		Stream<RepositoryFile> files = repositoryService.streamFiles(wiewsPath);
+		Stream<RepositoryFile> files = repositoryService.streamFiles(wiewsPath, RepositoryFile.DEFAULT_SORT);
 		filesMetadataInfo.downloadMetadata(files, response, '\t', '"', '\\', "\n", "UTF-16LE");
 	}
 
diff --git a/src/main/java/org/genesys2/server/mvc/admin/RepositoryController.java b/src/main/java/org/genesys2/server/mvc/admin/RepositoryController.java
index b999e90b2..e2dd88da4 100644
--- a/src/main/java/org/genesys2/server/mvc/admin/RepositoryController.java
+++ b/src/main/java/org/genesys2/server/mvc/admin/RepositoryController.java
@@ -115,11 +115,11 @@ public class RepositoryController extends BaseController {
 		}
 
 		RepositoryFolder currentFolder = repositoryService.getFolder(path);
-		List<RepositoryFile> fileList = repositoryService.getFiles(path);
+		List<RepositoryFile> fileList = repositoryService.getFiles(path, RepositoryFile.DEFAULT_SORT);
 		model.addAttribute("fileList", fileList);
 		model.addAttribute("currentPath", path);
 		model.addAttribute("currentFolder", currentFolder);
-		model.addAttribute("subPaths", repositoryService.getFolders(path));
+		model.addAttribute("subPaths", repositoryService.getFolders(path, RepositoryFolder.DEFAULT_SORT));
 
 		model.addAttribute("imageGallery", imageGalleryService.loadImageGallery(path));
 
diff --git a/src/main/java/org/genesys2/spring/config/ApplicationStartup.java b/src/main/java/org/genesys2/spring/config/ApplicationStartup.java
index b0e8ad051..9655f489c 100644
--- a/src/main/java/org/genesys2/spring/config/ApplicationStartup.java
+++ b/src/main/java/org/genesys2/spring/config/ApplicationStartup.java
@@ -262,7 +262,7 @@ public class ApplicationStartup implements InitializingBean, ApplicationListener
 	private void ensureInsituteFolders() throws Exception {
 
 		asAdminInvoker.invoke(() -> {
-			List<RepositoryFolder> wiewsFolders = repositoryService.getFolders(Paths.get("/wiews"));
+			List<RepositoryFolder> wiewsFolders = repositoryService.getFolders(Paths.get("/wiews"), RepositoryFolder.DEFAULT_SORT);
 			for (RepositoryFolder instFolder: wiewsFolders) {
 				LOG.warn("Ensuring inheritance for {}", instFolder.getFolderPath());
 				FaoInstitute institute = instituteRepository.findByCode(instFolder.getName());
-- 
GitLab