categories are not unique - use heb title for translation

Author: Andrew Pikler

oref-integration/src/main/java/com/github/pyckle/oref/integration/translationstores/AlertCategoryStore.java

@@ -0,0 +1,56 @@
+package com.github.pyckle.oref.integration.translationstores;
+
+import com.github.pyckle.oref.integration.dto.AlertTranslation;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
+import static java.util.Objects.requireNonNullElse;
+
+public class AlertCategoryStore
+{
+	private final CategoryType categoryType;
+	private final int id;
+	private final Map<String, AlertTranslation> hebTitle2Alert;
+
+	private AlertCategoryStore(CategoryType categoryType, int id, Map<String, AlertTranslation> hebTitle2Alert)
+	{
+		this.categoryType = categoryType;
+		this.id = id;
+		this.hebTitle2Alert = Map.copyOf(hebTitle2Alert);
+	}
+
+	public AlertTranslation getAlertTranslation(String hebTitle)
+	{
+		if (hebTitle2Alert.size() == 1)
+		{
+			return hebTitle2Alert.values().iterator().next();
+		}
+		return hebTitle2Alert.get(hebTitle);
+	}
+
+	public static class Builder
+	{
+		private final CategoryType categoryType;
+		private final int id;
+		private final HashMap<String, AlertTranslation> map = new HashMap<>();
+
+		public Builder(CategoryType categoryType, int id)
+		{
+			this.categoryType = categoryType;
+			this.id = id;
+		}
+
+		public void addAlertTranslation(AlertTranslation alertTranslation)
+		{
+			map.put(requireNonNullElse(alertTranslation.hebTitle(), requireNonNullElse(alertTranslation.heb(), "")),
+					alertTranslation);
+		}
+
+		AlertCategoryStore build()
+		{
+			return new AlertCategoryStore(categoryType, id, map);
+		}
+	}
+}

oref-integration/src/main/java/com/github/pyckle/oref/integration/translationstores/CategoryDescriptionStore.java

@@ -6,46 +6,68 @@
 import java.util.List;
 import java.util.Map;
 
-public class CategoryDescriptionStore {
-    private final Map<Integer, AlertTranslation> catIdToDescription;
-    private final Map<Integer, AlertTranslation> matIdToDescription;
-
-    public CategoryDescriptionStore(List<AlertTranslation> alertDescriptionList) {
-        catIdToDescription = new HashMap<>();
-        matIdToDescription = new HashMap<>();
-        for (AlertTranslation alertTranslation : alertDescriptionList) {
-            catIdToDescription.put(alertTranslation.catId(), alertTranslation);
-            matIdToDescription.put(alertTranslation.matrixCatId(), alertTranslation);
+import static com.github.pyckle.oref.integration.translationstores.CategoryType.CATEGORY;
+import static com.github.pyckle.oref.integration.translationstores.CategoryType.MATRIX;
+
+public class CategoryDescriptionStore
+{
+    private final Map<CategoryKey, AlertCategoryStore> matIdToDescription;
+
+    public CategoryDescriptionStore(List<AlertTranslation> alertDescriptionList)
+    {
+        Map<CategoryKey, AlertCategoryStore.Builder> builders = new HashMap<>();
+        for (AlertTranslation alertTranslation : alertDescriptionList)
+        {
+            builders.computeIfAbsent(new CategoryKey(CATEGORY, alertTranslation.catId()),
+                            k -> new AlertCategoryStore.Builder(k.categoryType(), k.id()))
+                    .addAlertTranslation(alertTranslation);
+            builders.computeIfAbsent(new CategoryKey(MATRIX, alertTranslation.matrixCatId()),
+                            k -> new AlertCategoryStore.Builder(k.categoryType(), k.id()))
+                    .addAlertTranslation(alertTranslation);
         }
+        matIdToDescription = Map.ofEntries(
+                builders.entrySet().stream().map(e -> Map.entry(e.getKey(), e.getValue().build()))
+                        .toArray(Map.Entry[]::new));
     }
 
-    public String getAlertStringFromCatId(String lang, int cat, String defaultVal) {
-        return labelOrDefault(lang, defaultVal, catIdToDescription.get(cat));
+    public String getAlertStringFromCatId(String lang, int cat, String defaultVal)
+    {
+        return labelOrDefault(lang, defaultVal, matIdToDescription.get(new CategoryKey(CATEGORY, cat)));
     }
 
-    public String getAlertStringFromMatId(String lang, String cat, String defaultVal) {
+    public String getAlertStringFromMatId(String lang, String cat, String defaultVal)
+    {
         if (isValidInteger(cat))
             return defaultVal;
         return getAlertStringFromMatId(lang, Integer.parseInt(cat), defaultVal);
     }
 
-    private static boolean isValidInteger(String cat) {
+    private static boolean isValidInteger(String cat)
+    {
         if (cat.length() > 8)
             return true;
-        for (int i = 0; i < cat.length(); i++) {
+        for (int i = 0; i < cat.length(); i++)
+        {
             if (cat.charAt(i) < '0' || cat.charAt(i) > '9')
                 return true;
         }
         return false;
     }
 
-    public String getAlertStringFromMatId(String lang, int cat, String defaultVal) {
-        return labelOrDefault(lang, defaultVal, matIdToDescription.get(cat));
+    public String getAlertStringFromMatId(String lang, int cat, String defaultVal)
+    {
+        return labelOrDefault(lang, defaultVal, matIdToDescription.get(new CategoryKey(MATRIX, cat)));
     }
 
-    private static String labelOrDefault(String lang, String defaultVal, AlertTranslation alertTranslation) {
+    private static String labelOrDefault(String lang, String defaultVal, AlertCategoryStore alertCategoryStore)
+    {
+        var alertTranslation = alertCategoryStore == null ? null : alertCategoryStore.getAlertTranslation(defaultVal);
         if (alertTranslation == null)
             return defaultVal;
         return alertTranslation.title(lang, defaultVal);
     }
+
+    record CategoryKey(CategoryType categoryType, int id)
+    {
+    }
 }

oref-integration/src/main/java/com/github/pyckle/oref/integration/translationstores/CategoryType.java

@@ -0,0 +1,6 @@
+package com.github.pyckle.oref.integration.translationstores;
+
+enum CategoryType
+{
+    CATEGORY, MATRIX
+}