From f44fe4a00f03d9eda06b34aa8497664211609abb Mon Sep 17 00:00:00 2001
From: Peter Hormanns <peter.hormanns@jalin.de>
Date: Fri, 13 Aug 2021 19:14:10 +0200
Subject: [PATCH] sort pacs and users

---
 hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java | 4 ++--
 hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java     | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
index 30e9546..16cddbe 100644
--- a/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
+++ b/hsarback/src/de/hsadmin/mods/pac/PacProcessorFactory.java
@@ -235,7 +235,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
 	}
 
 	private Processor createSetQuotaProc(Pac pac) {
-		int quota = 128;
+		int quota = 1024;
 		Set<PacComponent> pacComponents = pac.getPacComponents();
 		for (PacComponent pacComponent : pacComponents) {
 			BaseComponent baseComponent = pacComponent.getBaseComponent();
@@ -247,7 +247,7 @@ public class PacProcessorFactory implements EntityProcessorFactory {
 		int blocksSoft = ((Double) (quota * QuotaLimit.BLOCK_QUOTA_FACTOR)).intValue();
 		int blocksHard = ((Double) (quota * QuotaLimit.BLOCK_LIMIT_FACTOR)).intValue();
 		int inodesSoft = ((Double) (quota * QuotaLimit.FILE_QUOTA_FACTOR)).intValue();
-		int inodesHard = ((Double) (quota * QuotaLimit.FILE_QUOTA_FACTOR)).intValue();
+		int inodesHard = ((Double) (quota * QuotaLimit.FILE_LIMIT_FACTOR)).intValue();
 		return new ShellProcessor("setquota -g " + pac.getName() + " "
 				+ blocksSoft + " " + blocksHard + " "
 				+ inodesSoft + " " + inodesHard + " "
diff --git a/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java b/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java
index 6f342b6..1182604 100644
--- a/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java
+++ b/hsarback/src/de/hsadmin/pillar/JsonPillarServlet.java
@@ -7,6 +7,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.TreeMap;
 
 import javax.persistence.EntityManager;
 import javax.persistence.Query;
@@ -58,7 +59,7 @@ public class JsonPillarServlet extends HttpServlet {
 		final Object hiveResult = hiveQuery.getSingleResult();
 		final Hive hive = (Hive) hiveResult;
 		final Map<String, Boolean> dnsZones = new HashMap<>();
-		final Query pacsQuery = em.createQuery("SELECT p FROM Pacs p WHERE p.hive.name = :hive AND p.basepac.name = 'PAC/WEB'");
+		final Query pacsQuery = em.createQuery("SELECT p FROM Pacs p WHERE p.hive.name = :hive AND p.basepac.name = 'PAC/WEB' ORDER BY p.name");
 		pacsQuery.setParameter("hive", hiveName);
 		final List<?> pacsResult = pacsQuery.getResultList();
 		resp.setContentType("text/plain");
@@ -114,7 +115,12 @@ public class JsonPillarServlet extends HttpServlet {
 			writer.println("      , \"users\": [");
 			boolean firstLoopUsers = true;
 			final Set<UnixUser> users = pac.getUnixUser();
+			final TreeMap<String, UnixUser> sortedUsersMap = new TreeMap<>();
 			for (UnixUser user: users) {
+				sortedUsersMap.put(user.getName(), user);
+			}
+			for (String nextName: sortedUsersMap.keySet()) {
+				final UnixUser user = sortedUsersMap.get(nextName);
 				if (firstLoopUsers) {
 					firstLoopUsers = false;
 					writer.println("        {");