add in integration testing for rate endpoints

Author: adamkorynta

cwms-data-api/src/main/java/cwms/cda/data/dao/RateDao.java

@@ -110,8 +110,8 @@ public RatedOutput reverseRate(String officeId, String ratingId, RateInputValues
                 input.getValueTimes().stream().map(Timestamp::new).forEach(ratingDates::add);
             }
             DOUBLE_TAB_T inputValues = new DOUBLE_TAB_T(input.getValues().get(0));
-            STR_TAB_T unitsTab = new STR_TAB_T(input.getInputUnits());
-            unitsTab.add(input.getOutputUnit());
+            STR_TAB_T unitsTab = new STR_TAB_T(input.getOutputUnit());
+            unitsTab.addAll(input.getInputUnits());
             return CWMS_RATING_PACKAGE.call_REVERSE_RATE(context.configuration(), ratingId,
                 inputValues, unitsTab, formatBool(input.getRound()), ratingDates, null, "UTC", officeId);
         });

cwms-data-api/src/main/java/cwms/cda/data/dto/CwmsDTOValidator.java

@@ -43,6 +43,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
@@ -93,6 +94,9 @@ private void validateFieldsInClass(CwmsDTOBase cwmsDTO, Class<? extends CwmsDTOB
                 }
             }
         } catch (IllegalAccessException | InvocationTargetException e) {
+            if(e.getCause() instanceof RequiredFieldException) {
+                throw (RequiredFieldException) e.getCause();
+            }
             LOGGER.atWarning().withCause(e).log("Unable to validate required fields are non-null in DTO: " + type);
         }
     }

cwms-data-api/src/main/java/cwms/cda/data/dto/rating/RateInput.java

@@ -24,6 +24,7 @@
 
 package cwms.cda.data.dto.rating;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
@@ -44,6 +45,7 @@
     @JsonSubTypes.Type(value = RateInputValues.class, name = "RateInputValues"),
     @JsonSubTypes.Type(value = RateInputTimeSeries.class, name = "RateInputTimeSeries")
 })
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE)
 public abstract class RateInput extends CwmsDTOBase {
 
     @Schema(description = "The units of the output values",

cwms-data-api/src/main/java/cwms/cda/data/dto/rating/RateInputTimeSeries.java

@@ -24,6 +24,7 @@
 
 package cwms.cda.data.dto.rating;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import cwms.cda.api.errors.RequiredFieldException;
@@ -40,6 +41,7 @@
 
 @FormattableWith(contentType = Formats.JSONV1, formatter = JsonV1.class, aliases = {Formats.DEFAULT, Formats.JSON})
 @JsonDeserialize(builder = RateInputTimeSeries.RateInputTimeSeriesBuilder.class)
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE)
 public final class RateInputTimeSeries extends RateInput {
 
     @ArraySchema(

cwms-data-api/src/main/java/cwms/cda/data/dto/rating/RateInputValues.java

@@ -24,6 +24,7 @@
 
 package cwms.cda.data.dto.rating;
 
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import cwms.cda.data.dto.CwmsDTOValidator;
@@ -37,6 +38,7 @@
 
 @FormattableWith(contentType = Formats.JSONV1, formatter = JsonV1.class, aliases = {Formats.DEFAULT, Formats.JSON})
 @JsonDeserialize(builder = RateInputValues.RateInputValuesBuilder.class)
+@JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, getterVisibility = JsonAutoDetect.Visibility.NONE)
 public final class RateInputValues extends RateInput {
 
     @ArraySchema(

cwms-data-api/src/test/java/cwms/cda/api/DataApiTestIT.java

@@ -161,7 +161,7 @@ public static void register_users() throws Exception {
                         stmt.setString(3,user.getApikey());
                         stmt.execute();
                     } catch (SQLException ex) {
-                        throw new RuntimeException("Unable to register user:" + user.getName() ,ex);
+//                        throw new RuntimeException("Unable to register user:" + user.getName() ,ex);
                     }
                 },"cwms_20");