Merge pull request #1230 from WildMeOrg/1227_country_list

fix for incorrect country list (in react-based validation)

Author: vkirkl

src/main/java/org/ecocean/Util.java

@@ -4,8 +4,10 @@
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
+import java.util.Locale;
 import java.util.Properties;
 import java.util.UUID;
 
@@ -1216,4 +1218,18 @@ public static String getISO8601Date(final String date) {
         if (iso8601.length() == 16) iso8601 += 'Z';
         return iso8601;
     }
+
+    // from issue #1227, there are a couple ways to derive a list of valid countries (e.g. for validating
+    // bulk import data), including some based on CommonConfiguration. for now we are using a canned list
+    // but might be adjusted later to allow customization
+    public static List<String> getCountries() {
+        List<String> cnames = new ArrayList<String>();
+
+        for (String code : Locale.getISOCountries()) {
+            Locale obj = new Locale("", code);
+            cnames.add(obj.getDisplayCountry());
+        }
+        Collections.sort(cnames);
+        return cnames;
+    }
 }

src/main/java/org/ecocean/api/SiteSettings.java

@@ -90,8 +90,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
                 CommonConfiguration.getIndexedPropertyValues("lifeStage", context));
             settings.put("livingStatus",
                 CommonConfiguration.getIndexedPropertyValues("livingStatus", context));
-            settings.put("country",
-                CommonConfiguration.getIndexedPropertyValues("country", context));
+            settings.put("country", Util.getCountries());
             settings.put("annotationViewpoint", Annotation.getAllValidViewpointsSorted());
             settings.put("patterningCode",
                 CommonConfiguration.getIndexedPropertyValues("patterningCode", context));

src/test/java/org/ecocean/UtilTest.java

@@ -1,6 +1,7 @@
 package org.ecocean;
 
 import java.util.Calendar;
+import java.util.List;
 import org.junit.jupiter.api.Test;
 import static org.junit.Assert.*;
 
@@ -43,4 +44,15 @@ class UtilTest {
         assertTrue(Util.dateIsInFuture(year, month, day + 1));
         assertTrue(Util.dateIsInFuture(year + 1, month, day));
     }
+
+    // some of these assertions may fail if the world collapses
+    // into political chaos
+    @Test void testCountries() {
+        List<String> cs = Util.getCountries();
+
+        assertNotNull(cs);
+        assertTrue(cs.size() > 100);
+        assertTrue(cs.contains("Palestinian Territories"));
+        assertTrue(cs.contains("United States"));
+    }
 }