Merge pull request #1247 from WildMeOrg/1227_country_api_bugfix

fix for bulk import country-checking logic

Author: JasonWildMe

src/main/java/org/ecocean/api/bulk/BulkValidator.java

@@ -385,8 +385,7 @@ public static Object validateValue(String fieldName, Object value, Shepherd mySh
             return value;
 
         case "Encounter.country":
-            if ((value != null) && !CommonConfiguration.getIndexedPropertyValues("country",
-                myShepherd.getContext()).contains(value))
+            if ((value != null) && !Util.getCountries().contains(value))
                 throw new BulkValidatorException("invalid country value: " + value,
                         ApiException.ERROR_RETURN_CODE_INVALID);
             return value;

src/test/java/org/ecocean/api/bulk/BulkApiPostTest.java

@@ -500,6 +500,9 @@ private boolean hasError(JSONObject rtnJson, int rowNumber, String fieldName) {
         Occurrence occ = mock(Occurrence.class);
         String requestBody = getValidPayloadArrays();
 
+        // test a valid country while we are at it
+        requestBody = addToRows(requestBody, "Encounter.country", "Germany");
+
         when(mockRequest.getRequestURI()).thenReturn("/api/v3/bulk-import");
         when(mockRequest.getReader()).thenReturn(new BufferedReader(new StringReader(requestBody)));
 
@@ -605,4 +608,36 @@ private boolean hasError(JSONObject rtnJson, int rowNumber, String fieldName) {
             }
         }
     }
+
+    @Test void apiPostInvalidCountry()
+    throws ServletException, IOException {
+        User user = mock(User.class);
+        String requestBody = getValidPayloadArrays();
+
+        requestBody = addToRows(requestBody, "Encounter.country", "fail-country");
+
+        when(mockRequest.getRequestURI()).thenReturn("/api/v3/bulk-import");
+        when(mockRequest.getReader()).thenReturn(new BufferedReader(new StringReader(requestBody)));
+
+        try (MockedConstruction<Shepherd> mockShepherd = mockConstruction(Shepherd.class,
+                (mock, context) -> {
+            when(mock.getUser(any(HttpServletRequest.class))).thenReturn(user);
+        })) {
+            try (MockedStatic<UploadedFiles> mockUF = mockStatic(UploadedFiles.class)) {
+                mockUF.when(() -> UploadedFiles.findFiles(any(HttpServletRequest.class),
+                    any(String.class))).thenReturn(emptyFiles);
+                try (MockedStatic<ShepherdPMF> mockService = mockStatic(ShepherdPMF.class)) {
+                    mockService.when(() -> ShepherdPMF.getPMF(any(String.class))).thenReturn(
+                        mockPMF);
+                    apiServlet.doPost(mockRequest, mockResponse);
+                    responseOut.flush();
+                    JSONObject jout = new JSONObject(responseOut.toString());
+                    verify(mockResponse).setStatus(400);
+                    assertFalse(jout.getBoolean("success"));
+                    assertTrue(hasError(jout, 0, "Encounter.country"));
+                }
+            }
+        }
+    }
+
 }