avniproject/avni-webapp#1214 - use comma as user group separator. err…

…or message change.
avniproject · May 23, 2024 · f990b30 · f990b30
1 parent a18b4d9
commit f990b30
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/avni-server-api/src/main/java/org/avni/server/importer/batch/csv/writer/LocationWriter.java b/avni-server-api/src/main/java/org/avni/server/importer/batch/csv/writer/LocationWriter.java
@@ -73,7 +73,7 @@ public void write(List<? extends Row> rows) throws Exception {
     private void strictWriter(Row row, List<String> allErrorMsgs) throws Exception {
         Map<String, String> nonEmptyLocations = new LinkedHashMap<>();
         for (String header : row.getHeaders()) {
-            if(this.locationTypeNames.contains(header) && !S.isEmpty(row.get(header))) {
+            if (this.locationTypeNames.contains(header) && !S.isEmpty(row.get(header))) {
                 nonEmptyLocations.put(header, row.get(header));
             }
         }

diff --git a/...r-api/src/main/java/org/avni/server/importer/batch/csv/writer/UserAndCatchmentWriter.java b/...r-api/src/main/java/org/avni/server/importer/batch/csv/writer/UserAndCatchmentWriter.java
@@ -77,7 +77,7 @@ private void write(Row row) throws Exception {
 
         AddressLevel location = locationRepository.findByTitleLineageIgnoreCase(fullAddress)
                 .orElseThrow(() -> new Exception(format(
-                        "Provided Location does not exist. Please check for spelling mistakes '%s'", fullAddress)));
+                        "Provided Location does not exist in Avni. Please add it or check for spelling mistakes '%s'", fullAddress)));
 
         Catchment catchment = catchmentService.createOrUpdate(catchmentName, location);
         Organisation organisation = UserContextHolder.getUserContext().getOrganisation();

diff --git a/avni-server-api/src/main/java/org/avni/server/service/UserService.java b/avni-server-api/src/main/java/org/avni/server/service/UserService.java
@@ -137,7 +137,7 @@ public void addToGroups(User user, String groupsSpecified) {
             return;
         }
 
-        String[] groupNames = Strings.split(groupsSpecified, '|');
+        String[] groupNames = Strings.split(groupsSpecified, ',');
         Arrays.stream(groupNames).distinct().forEach(groupName -> {
             if (!StringUtils.hasLength(groupName.trim())) return;
 

diff --git a/avni-server-api/src/test/java/org/avni/server/util/PhoneNumberUtilTest.java b/avni-server-api/src/test/java/org/avni/server/util/PhoneNumberUtilTest.java
@@ -39,5 +39,6 @@ public void isValid() {
     public void getInvalidMessage() {
         assertEquals("Invalid phone number. CountryCode:91, NationalNumber:11111111", PhoneNumberUtil.getInvalidMessage("+9111111111"));
         assertEquals("Invalid phone number. CountryCode:91, NationalNumber:2829", PhoneNumberUtil.getInvalidMessage("+91 2829"));
+        assertEquals("The string supplied did not seem to be a phone number.", PhoneNumberUtil.getInvalidMessage(""));
     }
 }