CWDB-225 - Added a override property for checking for existing measur…

…ements for bulk update
USACE · Oct 17, 2024 · 4f75f87 · 4f75f87
1 parent 561e3a0
commit 4f75f87
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dao/MeasurementDao.java b/cwms-data-api/src/main/java/cwms/cda/data/dao/MeasurementDao.java
@@ -59,7 +59,6 @@
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.TimeZone;
 import java.util.stream.Collectors;
@@ -78,6 +77,7 @@
 
 public final class MeasurementDao extends JooqDao<Measurement> {
     static final XmlMapper XML_MAPPER = buildXmlMapper();
+    public static final String IGNORE_EXISTING_CHECK_FOR_BULK_UPDATE_PROPERTY = "measurement.ignoreExistingCheckForBulkUpdate";
 
     public MeasurementDao(DSLContext dsl) {
         super(dsl);
@@ -251,11 +251,14 @@ private void verifyMeasurementsExists(Connection conn, String officeId, String l
                 .collect(Collectors.toList());
 
         // Retrieve existing measurements from the database
-        List<String> existingNumbers = getExistingMeasurementNumbers(conn, officeId, locationId, measurementNumbers);
-
-        // Find missing numbers
-        List<String> missingNumbers = new ArrayList<>(measurementNumbers);
-        missingNumbers.removeAll(existingNumbers);
+        List<String> missingNumbers = new ArrayList<>();
+        if(!Boolean.getBoolean(IGNORE_EXISTING_CHECK_FOR_BULK_UPDATE_PROPERTY))
+        {
+            List<String> existingNumbers = getExistingMeasurementNumbers(conn, officeId, locationId, measurementNumbers);
+            missingNumbers = new ArrayList<>(measurementNumbers);
+            // Find missing numbers
+            missingNumbers.removeAll(existingNumbers);
+        }
 
         if (!missingNumbers.isEmpty()) {
             throw new NotFoundException("Could not find measurements " + String.join(",", missingNumbers) +

diff --git a/cwms-data-api/src/test/java/cwms/cda/api/MeasurementControllerTestIT.java b/cwms-data-api/src/test/java/cwms/cda/api/MeasurementControllerTestIT.java
@@ -96,6 +96,7 @@ static void createAndStoreTestStream(String testLoc) throws SQLException {
 
     @AfterAll
     public static void tearDown() {
+        System.clearProperty(MeasurementDao.IGNORE_EXISTING_CHECK_FOR_BULK_UPDATE_PROPERTY);
         for (Stream stream : TEST_STREAMS) {
             try {
                 CwmsDatabaseContainer<?> db = CwmsDataApiSetupCallback.getDatabaseLink();
@@ -336,6 +337,7 @@ void test_create_retrieve_delete_measurement() throws IOException {
     @Test
     @MinimumSchema(MINIMUM_SCHEMA)
     void test_create_retrieve_delete_measurement_multiple() throws IOException {
+        System.setProperty(MeasurementDao.IGNORE_EXISTING_CHECK_FOR_BULK_UPDATE_PROPERTY, String.valueOf(true));
         InputStream resource = this.getClass().getResourceAsStream("/cwms/cda/api/measurements.json");
         assertNotNull(resource);
         String json = IOUtils.toString(resource, StandardCharsets.UTF_8);
@@ -612,6 +614,7 @@ void test_create_retrieve_delete_measurement_multiple() throws IOException {
     @Test
     @MinimumSchema(MINIMUM_SCHEMA)
     void test_update_does_not_exist() throws Exception {
+        System.clearProperty(MeasurementDao.IGNORE_EXISTING_CHECK_FOR_BULK_UPDATE_PROPERTY);
         TestAccounts.KeyUser user = TestAccounts.KeyUser.SPK_NORMAL;
 
         InputStream resourceUpdated = this.getClass().getResourceAsStream("/cwms/cda/api/measurements_updated.json");

diff --git a/cwms-data-api/src/test/java/cwms/cda/data/dao/MeasurementDaoTestIT.java b/cwms-data-api/src/test/java/cwms/cda/data/dao/MeasurementDaoTestIT.java
@@ -184,6 +184,7 @@ void testRoundTripMultipleStore() throws Exception {
             StreamLocation streamLocation2 = StreamLocationDaoTestIT.buildTestStreamLocation("TEST_STREAM_123", streamLocId2, OFFICE_ID,11.0, Bank.RIGHT);
 
             try {
+                System.setProperty(MeasurementDao.IGNORE_EXISTING_CHECK_FOR_BULK_UPDATE_PROPERTY, String.valueOf(true));
                 //store stream locations
                 streamLocationDao.storeStreamLocation(streamLocation, false);
                 streamLocationDao.storeStreamLocation(streamLocation2, false);
@@ -231,6 +232,8 @@ void testRoundTripMultipleStore() throws Exception {
                 updatedMeasurements.add(meas1B);
                 measurementDao.updateMeasurements(updatedMeasurements);
 
+                System.clearProperty(MeasurementDao.IGNORE_EXISTING_CHECK_FOR_BULK_UPDATE_PROPERTY);
+
                 retrievedMeasurements = measurementDao.retrieveMeasurements(OFFICE_ID, streamLocId, null, null, UnitSystem.EN.getValue(),
                         null, null, null, null, null, null, null, null);
 
@@ -264,6 +267,7 @@ void testRoundTripMultipleStore() throws Exception {
                 assertThrows(NotFoundException.class, () -> measurementDao.retrieveMeasurements(meas2F.getId().getOfficeId(), meas2F.getId().getName(),
                         null, null, UnitSystem.EN.getValue(), null, null, null, null, null, null, null, null));
             } finally {
+                System.clearProperty(MeasurementDao.IGNORE_EXISTING_CHECK_FOR_BULK_UPDATE_PROPERTY);
                 //delete stream locations
                 streamLocationDao.deleteStreamLocation(
                         streamLocation.getStreamLocationNode().getId().getOfficeId(),