Updated AssignedTimeSeries DTO (#245)

Author: zack-rma

cwms-radar-model/cwms-radar-swagger.yaml

@@ -3590,13 +3590,15 @@ paths:
             type: boolean
         - name: start
           in: query
-          description: The start of the time series profile instance. Default is the year 1800
+          description: The start of the time series profile instance.
+          required: true
           schema:
             type: string
             format: date-time
         - name: end
           in: query
-          description: The end of the time series profile instance. Default is the year 3000
+          description: The end of the time series profile instance.
+          required: true
           schema:
             type: string
             format: date-time
@@ -16463,10 +16465,10 @@ components:
     PoolNameType:
       type: object
       properties:
-        officeId:
-          type: string
         poolName:
           type: string
+        officeId:
+          type: string
     pools:
       type: object
       properties:

cwms-radar-model/src/main/java/mil/army/usace/hec/cwms/radar/client/model/AssignedTimeSeries.java

@@ -1,43 +1,21 @@
-/*
- * MIT License
- *
- * Copyright (c) 2024 Hydrologic Engineering Center
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package mil.army.usace.hec.cwms.radar.client.model;
 
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import jakarta.annotation.Generated;
-import jakarta.validation.Valid;
-
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import java.math.BigDecimal;
 import java.util.Objects;
 
 /**
  * AssignedTimeSeries
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
-@Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen", date = "2022-08-09T09:29:33.859-07:00[America/Los_Angeles]")
+@jakarta.annotation.Generated(value = "io.swagger.codegen.v3.generators.java.SpringCodegen",
+        date = "2024-12-06T12:43:40.669367400-08:00[America/Los_Angeles]")
 public class AssignedTimeSeries {
+
+    @JsonProperty("office-id")
+    private String officeId = null;
+
     @JsonProperty("timeseries-id")
     private String timeseriesId = null;
 
@@ -47,23 +25,30 @@ public class AssignedTimeSeries {
     @JsonProperty("alias-id")
     private String aliasId = null;
 
-    @JsonProperty("ref-ts-id")
+    @JsonProperty("refTs-id")
     private String refTsId = null;
 
     @JsonProperty("attribute")
     private Integer attribute = null;
 
+    public AssignedTimeSeries officeId(String officeId) {
+        this.officeId = officeId;
+        return this;
+    }
+
+    public String getOfficeId() {
+        return officeId;
+    }
+
+    public void setOfficeId(String officeId) {
+        this.officeId = officeId;
+    }
+
     public AssignedTimeSeries timeseriesId(String timeseriesId) {
         this.timeseriesId = timeseriesId;
         return this;
     }
 
-    /**
-     * Get timeseriesId
-     *
-     * @return timeseriesId
-     **/
-
     public String getTimeseriesId() {
         return timeseriesId;
     }
@@ -77,13 +62,6 @@ public AssignedTimeSeries tsCode(BigDecimal tsCode) {
         return this;
     }
 
-    /**
-     * Get tsCode
-     *
-     * @return tsCode
-     **/
-
-    @Valid
     public BigDecimal getTsCode() {
         return tsCode;
     }
@@ -97,12 +75,6 @@ public AssignedTimeSeries aliasId(String aliasId) {
         return this;
     }
 
-    /**
-     * Get aliasId
-     *
-     * @return aliasId
-     **/
-
     public String getAliasId() {
         return aliasId;
     }
@@ -116,12 +88,6 @@ public AssignedTimeSeries refTsId(String refTsId) {
         return this;
     }
 
-    /**
-     * Get refTsId
-     *
-     * @return refTsId
-     **/
-
     public String getRefTsId() {
         return refTsId;
     }
@@ -135,12 +101,6 @@ public AssignedTimeSeries attribute(Integer attribute) {
         return this;
     }
 
-    /**
-     * Get attribute
-     *
-     * @return attribute
-     **/
-
     public Integer getAttribute() {
         return attribute;
     }
@@ -149,36 +109,46 @@ public void setAttribute(Integer attribute) {
         this.attribute = attribute;
     }
 
-
     @Override
-    public boolean equals(Object o) {
+    public boolean equals(java.lang.Object o) {
         if (this == o) {
             return true;
         }
         if (o == null || getClass() != o.getClass()) {
             return false;
         }
         AssignedTimeSeries assignedTimeSeries = (AssignedTimeSeries) o;
-        return this.timeseriesId == null || assignedTimeSeries.timeseriesId == null ?
-            Objects.equals(this.timeseriesId, assignedTimeSeries.timeseriesId) :
-            this.timeseriesId.equalsIgnoreCase(assignedTimeSeries.timeseriesId) && Objects.equals(this.tsCode, assignedTimeSeries.tsCode) &&
-                this.aliasId == null || assignedTimeSeries.aliasId == null ? Objects.equals(this.aliasId, assignedTimeSeries.aliasId) :
-                this.aliasId.equalsIgnoreCase(assignedTimeSeries.aliasId) && this.refTsId == null || assignedTimeSeries.refTsId == null ?
-                    Objects.equals(this.refTsId, assignedTimeSeries.refTsId) :
-                    this.refTsId.equalsIgnoreCase(assignedTimeSeries.refTsId) && Objects.equals(this.attribute, assignedTimeSeries.attribute);
+        return this.officeId == null || assignedTimeSeries.officeId == null
+                ? Objects.equals(this.officeId, assignedTimeSeries.officeId)
+                : this.officeId.equalsIgnoreCase(assignedTimeSeries.officeId)
+                && this.timeseriesId == null || assignedTimeSeries.timeseriesId == null
+                ? Objects.equals(this.timeseriesId, assignedTimeSeries.timeseriesId)
+                : this.timeseriesId.equalsIgnoreCase(assignedTimeSeries.timeseriesId)
+                && Objects.equals(this.tsCode, assignedTimeSeries.tsCode)
+                && this.aliasId == null || assignedTimeSeries.aliasId == null
+                ? Objects.equals(this.aliasId, assignedTimeSeries.aliasId)
+                : this.aliasId.equalsIgnoreCase(assignedTimeSeries.aliasId)
+                && this.refTsId == null || assignedTimeSeries.refTsId == null
+                ? Objects.equals(this.refTsId, assignedTimeSeries.refTsId)
+                : this.refTsId.equalsIgnoreCase(assignedTimeSeries.refTsId)
+                && Objects.equals(this.attribute, assignedTimeSeries.attribute)
+                ;
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(timeseriesId == null ? 0 : timeseriesId.toLowerCase(), tsCode, aliasId == null ? 0 : aliasId.toLowerCase(),
-            refTsId == null ? 0 : refTsId.toLowerCase(), attribute);
+        return Objects.hash(officeId == null ? 0 : officeId.toLowerCase(),
+                timeseriesId == null ? 0 : timeseriesId.toLowerCase(), tsCode,
+                aliasId == null ? 0 : aliasId.toLowerCase(),
+                refTsId == null ? 0 : refTsId.toLowerCase(), attribute);
     }
 
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("class AssignedTimeSeries {\n");
 
+        sb.append("    officeId: ").append(toIndentedString(officeId)).append("\n");
         sb.append("    timeseriesId: ").append(toIndentedString(timeseriesId)).append("\n");
         sb.append("    tsCode: ").append(toIndentedString(tsCode)).append("\n");
         sb.append("    aliasId: ").append(toIndentedString(aliasId)).append("\n");