fixed language progress map loading too often

Erudika · May 13, 2018 · 2a5c535 · 2a5c535
1 parent 66b90c4
commit 2a5c535
Showing 1 changed file with 19 additions and 6 deletions.
diff --git a/para-server/src/main/java/com/erudika/para/i18n/LanguageUtils.java b/para-server/src/main/java/com/erudika/para/i18n/LanguageUtils.java
@@ -69,6 +69,8 @@ public class LanguageUtils {
 	private static final Map<String, Map<String, String>> LANG_CACHE =
 			new ConcurrentHashMap<String, Map<String, String>>(ALL_LOCALES.size());
 
+	private static Sysprop langProgressCache = new Sysprop();
+
 	private String deflangCode;
 	private final String keyPrefix = "language".concat(Config.SEPARATOR);
 	private final String progressKey = keyPrefix.concat("progress");
@@ -258,7 +260,16 @@ public Map<String, Integer> getTranslationProgressMap(String appid) {
 		if (dao == null) {
 			return Collections.emptyMap();
 		}
-		Sysprop progress = dao.read(appid, progressKey);
+		Sysprop progress;
+		if (langProgressCache.getProperties().isEmpty()) {
+			progress = dao.read(appid, progressKey);
+			if (progress != null) {
+				langProgressCache = progress;
+			}
+		} else {
+			progress = langProgressCache;
+		}
+
 		Map<String, Integer> progressMap = new HashMap<>(ALL_LOCALES.size());
 		boolean isMissing = progress == null;
 		if (isMissing) {
@@ -275,6 +286,7 @@ public Map<String, Integer> getTranslationProgressMap(String appid) {
 		}
 		if (isMissing) {
 			dao.create(appid, progress);
+			langProgressCache = progress;
 		}
 		return progressMap;
 	}
@@ -376,12 +388,13 @@ private void updateTranslationProgressMap(String appid, String langCode, int val
 		} else {
 			progress.put(langCode, (int) ((approved / defsize) * 100));
 		}
+		Sysprop updatedProgress = new Sysprop(progressKey);
+		for (Map.Entry<String, Integer> entry : progress.entrySet()) {
+			updatedProgress.addProperty(entry.getKey(), entry.getValue());
+		}
+		langProgressCache = updatedProgress;
 		if (percent < 100 && !percent.equals(progress.get(langCode))) {
-			Sysprop s = new Sysprop(progressKey);
-			for (Map.Entry<String, Integer> entry : progress.entrySet()) {
-				s.addProperty(entry.getKey(), entry.getValue());
-			}
-			dao.create(appid, s);
+			dao.create(appid, updatedProgress);
 		}
 	}