From d84592c40895e6bdaf1c6cdc849c8e67390d4504 Mon Sep 17 00:00:00 2001 From: Joy A Date: Thu, 26 Sep 2024 10:11:26 +0530 Subject: [PATCH] avniproject/avni-webapp#1350 | Ignore example row in upload location edit csv --- .../server/importer/batch/csv/writer/BulkLocationEditor.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/avni-server-api/src/main/java/org/avni/server/importer/batch/csv/writer/BulkLocationEditor.java b/avni-server-api/src/main/java/org/avni/server/importer/batch/csv/writer/BulkLocationEditor.java index cc7270f99..658d040f7 100644 --- a/avni-server-api/src/main/java/org/avni/server/importer/batch/csv/writer/BulkLocationEditor.java +++ b/avni-server-api/src/main/java/org/avni/server/importer/batch/csv/writer/BulkLocationEditor.java @@ -29,7 +29,9 @@ public BulkLocationEditor(LocationRepository locationRepository, ObservationCrea public void editLocation(Row row, List allErrorMsgs) { String existingLocationTitleLineage = row.get(ImportLocationsConstants.COLUMN_NAME_LOCATION_WITH_FULL_HIERARCHY); - if (existingLocationTitleLineage.equalsIgnoreCase(ImportLocationsConstants.LOCATION_WITH_FULL_HIERARCHY_DESCRIPTION)) return; + if (existingLocationTitleLineage.equalsIgnoreCase(ImportLocationsConstants.LOCATION_WITH_FULL_HIERARCHY_DESCRIPTION) + || existingLocationTitleLineage.equalsIgnoreCase(ImportLocationsConstants.LOCATION_WITH_FULL_HIERARCHY_EXAMPLE) + ) return; String newLocationParentTitleLineage = row.get(ImportLocationsConstants.COLUMN_NAME_PARENT_LOCATION_WITH_FULL_HIERARCHY); Optional existingLocationAddressLevel = locationRepository.findByTitleLineageIgnoreCase(existingLocationTitleLineage);