bug fixes found testing REGI against SWT db export (#1527)

adamkorynta · web-flow · commit b9dd09288c02 · 2026-01-08T12:13:38.000-08:00
- fix openapi for location kind endpoint return type
- fix issues where parameterized connection was getting the office id
session set, but then a separate configuration was used for the jOOQ
call (I tried to do an audit and catch as many errors as I could)
- add null checks for outlet/turbine child location retrieval objects
- fix null pointers on water contract effective/expiration dates
- null check and ignore "CWMS" office ids for session variables
- fix time series vert datum retrieval trying to convert units to "SI"
or "EN"
diff --git a/cwms-data-api/src/main/java/cwms/cda/api/LocationKindController.java b/cwms-data-api/src/main/java/cwms/cda/api/LocationKindController.java
@@ -84,7 +84,7 @@ public LocationKindController(MetricRegistry metrics) {
         responses = {
             @OpenApiResponse(status = STATUS_200,
                 content = {
-                    @OpenApiContent(isArray = true, type = Formats.JSONV2, from = Location.class),
+                    @OpenApiContent(isArray = true, type = Formats.JSONV1, from = CwmsIdLocationKind.class),
                 })
         },
         description = "Returns CWMS Location Data.  The Catalog end-point is also capable of "
@@ -103,9 +103,9 @@ public void handle(@NotNull Context ctx) {
         String kindRegexMask = ctx.queryParam(LOCATION_KIND_LIKE);
         String office = ctx.queryParam(OFFICE);
 
-        String formatParm = ctx.queryParamAsClass(Formats.JSONV2, String.class).getOrDefault("");
+        String formatParm = ctx.queryParamAsClass(Formats.JSONV1, String.class).getOrDefault("");
         String formatHeader = ctx.header(Header.ACCEPT);
-        ContentType contentType = Formats.parseHeaderAndQueryParm(formatHeader, formatParm, Location.class);
+        ContentType contentType = Formats.parseHeaderAndQueryParm(formatHeader, formatParm, CwmsIdLocationKind.class);
 
         String results;
 
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dao/Dao.java b/cwms-data-api/src/main/java/cwms/cda/data/dao/Dao.java
@@ -102,14 +102,18 @@ public static int versionAsInteger(String version) {
      * Sets session office on specific connection.
      * @param c opened connection
      * @param object Data containing a valid CWMS office
-     * @throws SQLException if the underlying database throws an exception
      */
-    protected void setOffice(Connection c, CwmsDTO object) throws SQLException {
-        this.setOffice(c,object.getOfficeId());
+    protected void setOffice(Connection c, CwmsDTO object) {
+        setOffice(c,object.getOfficeId());
     }
 
-    protected void setOffice(Connection c, String office) throws SQLException {
-        CWMS_ENV_PACKAGE.call_SET_SESSION_OFFICE_ID(DSL.using(c).configuration(), office);
+    protected static void setOffice(Connection c, String office) {
+        //null office id is invalid for the session office, the client may send null if looking for data across all offices
+        //CWMS is not a valid session office id and maybe be parameterized from the client when
+        //searching for CWMS-owned data.
+        if(office != null && !"CWMS".equals(office)) {
+            CWMS_ENV_PACKAGE.call_SET_SESSION_OFFICE_ID(DSL.using(c).configuration(), office);
+        }
     }
 
     public abstract Optional<T> getByUniqueName(String uniqueName, String office);
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dao/JooqDao.java b/cwms-data-api/src/main/java/cwms/cda/data/dao/JooqDao.java
@@ -176,8 +176,7 @@ public static DSLContext getDslContext(Connection connection, String officeId) {
         // This method should probably be called from within a connection{  } block and jOOQ
         // code within the block should use the returned DSLContext or the connection.
         DSLContext dsl = DSL.using(connection, SQLDialect.ORACLE18C);
-        CWMS_ENV_PACKAGE.call_SET_SESSION_OFFICE_ID(dsl.configuration(), officeId);
-
+        setOffice(connection, officeId);
         return dsl;
     }
 
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dao/TimeSeriesDaoImpl.java b/cwms-data-api/src/main/java/cwms/cda/data/dao/TimeSeriesDaoImpl.java
@@ -554,9 +554,15 @@ private boolean shouldFetchVerticalDatum(String parmPart) {
     private VerticalDatumInfo fetchVerticalDatumInfoSeparately(String locPart, String units, String office) {
 
         return connectionResult(dsl, conn -> {
+            String datumUnits = units;
+            if ("SI".equalsIgnoreCase(datumUnits)) {
+                datumUnits = "m";
+            } else if ("EN".equalsIgnoreCase(datumUnits)) {
+                datumUnits = "ft";
+            }
             DSLContext dslContext = getDslContext(conn, office);
             String result = CWMS_LOC_PACKAGE.call_GET_VERTICAL_DATUM_INFO_F__2(dslContext.configuration(),
-                    locPart, units, office);
+                    locPart, datumUnits, office);
             return parseVerticalDatumInfo(result);
         });
     }
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dao/basinconnectivity/StreamDao.java b/cwms-data-api/src/main/java/cwms/cda/data/dao/basinconnectivity/StreamDao.java
@@ -28,7 +28,8 @@ public Stream getStream(String streamId, String unitSystem, String officeId) {
                 Unit.KILOMETER.getValue();
 
         return connectionResult(dsl, c -> {
-            RETRIEVE_STREAM stream = CWMS_STREAM_PACKAGE.call_RETRIEVE_STREAM(dsl.configuration(), streamId, pStationUnit, officeId);
+            var configuration = getDslContext(c, officeId).configuration();
+            RETRIEVE_STREAM stream = CWMS_STREAM_PACKAGE.call_RETRIEVE_STREAM(configuration, streamId, pStationUnit, officeId);
             return new Stream.Builder(streamId, parseBool(stream.getP_STATIONING_STARTS_DS()),
                     stream.getP_LENGTH(), officeId)
                     .withDivertingStreamId(stream.getP_DIVERTS_FROM_STREAM())
@@ -62,7 +63,8 @@ private Set<Stream> getTributaries(String streamId, String unitSystem, String of
         return connectionResult(dsl, c -> {
             String pStationUnit = UnitSystem.EN.value().equals(unitSystem)
                     ? Unit.MILE.getValue() : Unit.KILOMETER.getValue();
-            Result<Record> rs = CWMS_STREAM_PACKAGE.call_CAT_STREAMS(dsl.configuration(), null, pStationUnit, null, null,
+            var configuration = getDslContext(c, officeId).configuration();
+            Result<Record> rs = CWMS_STREAM_PACKAGE.call_CAT_STREAMS(configuration, null, pStationUnit, null, null,
                 null, null, null, null, null, null, null,
                 null, null, null, null, null, officeId);
             return buildStreamsFromResultSet(rs.intoResultSet(), streamId, unitSystem);
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dao/basinconnectivity/StreamLocationDao.java b/cwms-data-api/src/main/java/cwms/cda/data/dao/basinconnectivity/StreamLocationDao.java
@@ -34,7 +34,8 @@ public Set<StreamLocation> getStreamLocations(String streamId, String unitSystem
                 ? Unit.SQUARE_MILES.getValue() : Unit.SQUARE_KILOMETERS.getValue();
 
         return connectionResult(dsl, c -> {
-            Result<Record> rs = CWMS_STREAM_PACKAGE.call_CAT_STREAM_LOCATIONS(dsl.configuration(), pStreamIdMaskIn,
+            var configuration = getDslContext(c, officeId).configuration();
+            Result<Record> rs = CWMS_STREAM_PACKAGE.call_CAT_STREAM_LOCATIONS(configuration, pStreamIdMaskIn,
                     pLocationIdMaskIn, pStationUnitIn, pStageUnitIn, pAreaUnitIn, officeId);
             return buildStreamLocations(rs.intoResultSet());
         });
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dao/basinconnectivity/StreamReachDao.java b/cwms-data-api/src/main/java/cwms/cda/data/dao/basinconnectivity/StreamReachDao.java
@@ -22,7 +22,8 @@ public Set<StreamReach> getReachesOnStream(String streamId, String officeId) {
         String pStationUnitIn = Unit.KILOMETER.getValue();
 
         return connectionResult(dsl, c -> {
-            Result<Record> rs = CWMS_STREAM_PACKAGE.call_CAT_STREAM_REACHES(dsl.configuration(), streamId,
+            var configuration = getDslContext(c, officeId).configuration();
+            Result<Record> rs = CWMS_STREAM_PACKAGE.call_CAT_STREAM_REACHES(configuration, streamId,
                 null, null, null, pStationUnitIn, officeId);
             return buildReachesFromResultSet(rs.intoResultSet());
         });
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dao/location/kind/LockDao.java b/cwms-data-api/src/main/java/cwms/cda/data/dao/location/kind/LockDao.java
@@ -55,23 +55,23 @@ public LockDao(DSLContext dsl) {
 
     public List<Lock> retrieveLockCatalog(CwmsId projectId) {
         return connectionResult(dsl, c -> {
-            setOffice(c, projectId.getOfficeId());
-            Result<Record> catalogResults = CWMS_LOCK_PACKAGE.call_CAT_LOCK(dsl.configuration(),
+            var configuration = getDslContext(c, projectId.getOfficeId()).configuration();
+            Result<Record> catalogResults = CWMS_LOCK_PACKAGE.call_CAT_LOCK(configuration,
                     projectId.getName(), projectId.getOfficeId());
             return catalogResults.stream().map(LockDao::catMap).collect(toList());
         });
     }
 
     public Lock retrieveLock(CwmsId lockId, UnitSystem unitSystem) {
         return connectionResult(dsl, c -> {
-            setOffice(c, lockId.getOfficeId());
+            var configuration = getDslContext(c, lockId.getOfficeId()).configuration();
             LOCATION_REF_T locationRef = getLocationRef(CwmsId.buildCwmsId(lockId.getOfficeId(),
                     lockId.getName()));
             Lock retVal;
             if (unitSystem.equals(UnitSystem.EN)) {
-                retVal = unitConvertToEN(map(CWMS_LOCK_PACKAGE.call_RETRIEVE_LOCK(dsl.configuration(), locationRef)));
+                retVal = unitConvertToEN(map(CWMS_LOCK_PACKAGE.call_RETRIEVE_LOCK(configuration, locationRef)));
             } else {
-                retVal = map(CWMS_LOCK_PACKAGE.call_RETRIEVE_LOCK(dsl.configuration(), locationRef));
+                retVal = map(CWMS_LOCK_PACKAGE.call_RETRIEVE_LOCK(configuration, locationRef));
             }
             if (retVal == null) {
                 throw new NotFoundException("Lock not found: " + lockId);
@@ -228,44 +228,43 @@ static String mapToLockRef(String office, String locationName) {
 
     Lock unitConvertToEN(Lock lock) {
         return connectionResult(dsl, c -> {
-            setOffice(c, lock.getLocation().getOfficeId());
-
-            String length = CWMS_UTIL_PACKAGE.call_GET_DEFAULT_UNITS(dsl.configuration(), "Length", "EN");
-            String volume = CWMS_UTIL_PACKAGE.call_GET_DEFAULT_UNITS(dsl.configuration(), "Volume", "EN");
+            var configuration = getDslContext(c, lock.getLocation().getOfficeId()).configuration();
+            String length = CWMS_UTIL_PACKAGE.call_GET_DEFAULT_UNITS(configuration, "Length", "EN");
+            String volume = CWMS_UTIL_PACKAGE.call_GET_DEFAULT_UNITS(configuration, "Volume", "EN");
             return new Lock.Builder()
                 .withElevationUnits(length)
                 .withVolumeUnits(volume)
                 .withLengthUnits(length)
                 .withLocation(lock.getLocation())
                 .withProjectId(lock.getProjectId())
-                .withLockWidth(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(dsl.configuration(), lock.getLockWidth(),
+                .withLockWidth(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(configuration, lock.getLockWidth(),
                         lock.getLengthUnits(), length))
-                .withLockLength(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(dsl.configuration(), lock.getLockLength(),
+                .withLockLength(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(configuration, lock.getLockLength(),
                         lock.getLengthUnits(), length))
-                .withNormalLockLift(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(dsl.configuration(), lock.getNormalLockLift(),
+                .withNormalLockLift(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(configuration, lock.getNormalLockLift(),
                         lock.getLengthUnits(), length))
-                .withVolumePerLockage(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(dsl.configuration(),
+                .withVolumePerLockage(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(configuration,
                         lock.getVolumePerLockage(), lock.getVolumeUnits(), volume))
-                .withMinimumDraft(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(dsl.configuration(), lock.getMinimumDraft(),
+                .withMinimumDraft(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(configuration, lock.getMinimumDraft(),
                         lock.getElevationUnits(), length))
-                .withHighWaterLowerPoolWarningLevel(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(dsl.configuration(),
+                .withHighWaterLowerPoolWarningLevel(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(configuration,
                         lock.getHighWaterLowerPoolWarningLevel(), lock.getElevationUnits(), length))
-                .withHighWaterUpperPoolWarningLevel(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(dsl.configuration(),
+                .withHighWaterUpperPoolWarningLevel(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(configuration,
                         lock.getHighWaterUpperPoolWarningLevel(), lock.getElevationUnits(), length))
                 .withChamberType(lock.getChamberType())
                 .withHighWaterLowerPoolLocationLevel(new LockLocationLevelRef(lock.getHighWaterLowerPoolLocationLevel().getLevelLink(),
-                        CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(dsl.configuration(), lock.getHighWaterLowerPoolLocationLevel().getLevelValue(),
+                        CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(configuration, lock.getHighWaterLowerPoolLocationLevel().getLevelValue(),
                                 lock.getElevationUnits(), length)))
                 .withHighWaterUpperPoolLocationLevel(new LockLocationLevelRef(lock.getHighWaterUpperPoolLocationLevel().getLevelLink(),
-                        CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(dsl.configuration(), lock.getHighWaterUpperPoolLocationLevel().getLevelValue(),
+                        CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(configuration, lock.getHighWaterUpperPoolLocationLevel().getLevelValue(),
                                 lock.getElevationUnits(), length)))
                 .withLowWaterLowerPoolLocationLevel(new LockLocationLevelRef(lock.getLowWaterLowerPoolLocationLevel().getLevelLink(),
-                        CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(dsl.configuration(), lock.getLowWaterLowerPoolLocationLevel().getLevelValue(),
+                        CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(configuration, lock.getLowWaterLowerPoolLocationLevel().getLevelValue(),
                                 lock.getElevationUnits(), length)))
                 .withLowWaterUpperPoolLocationLevel(new LockLocationLevelRef(lock.getLowWaterUpperPoolLocationLevel().getLevelLink(),
-                        CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(dsl.configuration(), lock.getLowWaterUpperPoolLocationLevel().getLevelValue(),
+                        CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(configuration, lock.getLowWaterUpperPoolLocationLevel().getLevelValue(),
                                 lock.getElevationUnits(), length)))
-                .withMaximumLockLift(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(dsl.configuration(), lock.getMaximumLockLift(),
+                .withMaximumLockLift(CWMS_UTIL_PACKAGE.call_CONVERT_UNITS(configuration, lock.getMaximumLockLift(),
                         lock.getElevationUnits(), length))
                 .build();
         });
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dao/location/kind/OutletDao.java b/cwms-data-api/src/main/java/cwms/cda/data/dao/location/kind/OutletDao.java
@@ -76,12 +76,15 @@ public List<Outlet> retrieveOutletsForProject(String officeId, String projectId)
 
             LocationGroupDao locGroupDao = new LocationGroupDao(dsl);
             List<LocationGroup> groups = locGroupDao.getLocationGroups(config, null, officeId,
-                    null, Outlet.RATING_LOC_GROUP_CATEGORY, projectId);
-
-            return CWMS_OUTLET_PACKAGE.call_RETRIEVE_OUTLETS(config, locRef)
-                                      .stream()
-                                      .map(struct -> mapToOutlet(struct, groups))
-                                      .collect(Collectors.toList());
+                null, Outlet.RATING_LOC_GROUP_CATEGORY, projectId);
+            var outlets = CWMS_OUTLET_PACKAGE.call_RETRIEVE_OUTLETS(config, locRef);
+            if(outlets == null)
+            {
+                return List.of();
+            }
+            return outlets.stream()
+                .map(struct -> mapToOutlet(struct, groups))
+                .collect(Collectors.toList());
         });
     }
 
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dao/location/kind/TurbineDao.java b/cwms-data-api/src/main/java/cwms/cda/data/dao/location/kind/TurbineDao.java
@@ -62,8 +62,13 @@ public TurbineDao(DSLContext dsl) {
     public List<Turbine> retrieveTurbines(String projectLocationId, String officeId) {
         return connectionResult(dsl, conn -> {
             LOCATION_REF_T locationRefT = getLocationRef(projectLocationId, officeId);
-            return CWMS_TURBINE_PACKAGE.call_RETRIEVE_TURBINES(DSL.using(conn).configuration(), locationRefT)
-                .stream()
+            var configuration = DSL.using(conn).configuration();
+            var projectStructureObjTs = CWMS_TURBINE_PACKAGE.call_RETRIEVE_TURBINES(configuration, locationRefT);
+            if(projectStructureObjTs == null)
+            {
+                return List.of();
+            }
+            return projectStructureObjTs.stream()
                 .map(TurbineDao::map)
                 .collect(toList());
         });
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dao/project/ProjectLockDao.java b/cwms-data-api/src/main/java/cwms/cda/data/dao/project/ProjectLockDao.java
@@ -67,7 +67,6 @@ public String requestLock(ProjectLock request, boolean revokeExisting, int revok
         String office = request.getOfficeId();
         return connectionResult(dsl, c -> {
             Configuration configuration = getDslContext(c, office).configuration();
-            setOffice(c, office);
             return CWMS_PROJECT_PACKAGE.call_REQUEST_LOCK(configuration, request.getProjectId(),
                 request.getApplicationId(), formatBool(revokeExisting), BigInteger.valueOf(revokeTimeout),
                 office, request.getSessionUser(), request.getOsUser(), request.getSessionProgram(),
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dao/watersupply/WaterSupplyUtils.java b/cwms-data-api/src/main/java/cwms/cda/data/dao/watersupply/WaterSupplyUtils.java
@@ -70,13 +70,21 @@ private WaterSupplyUtils() {
     }
 
     static WaterUserContract toWaterContract(WATER_USER_CONTRACT_OBJ_T contract) {
+        Instant effectiveDate = null;
+        if(contract.getWS_CONTRACT_EFFECTIVE_DATE() != null) {
+            effectiveDate = contract.getWS_CONTRACT_EFFECTIVE_DATE().toInstant();
+        }
+        Instant expirationDate = null;
+        if(contract.getWS_CONTRACT_EXPIRATION_DATE() != null) {
+            expirationDate = contract.getWS_CONTRACT_EXPIRATION_DATE().toInstant();
+        }
         return new WaterUserContract.Builder().withContractedStorage(contract.getCONTRACTED_STORAGE())
                 .withTotalAllocPercentActivated(contract.getTOTAL_ALLOC_PERCENT_ACTIVATED())
                 .withContractType(LocationUtil.getLookupType(contract.getWATER_SUPPLY_CONTRACT_TYPE()))
-                .withContractEffectiveDate(contract.getWS_CONTRACT_EFFECTIVE_DATE().toInstant())
+                .withContractEffectiveDate(effectiveDate)
                 .withOfficeId(contract.getWATER_SUPPLY_CONTRACT_TYPE().getOFFICE_ID())
                 .withStorageUnitsId(contract.getSTORAGE_UNITS_ID())
-                .withContractExpirationDate(contract.getWS_CONTRACT_EXPIRATION_DATE().toInstant())
+                .withContractExpirationDate(expirationDate)
                 .withWaterUser(toWaterUser(contract.getWATER_USER_CONTRACT_REF().getWATER_USER()))
                 .withContractId(new CwmsId.Builder().withOfficeId(contract.getWATER_SUPPLY_CONTRACT_TYPE()
                                 .getOFFICE_ID()).withName(contract.getWATER_USER_CONTRACT_REF()
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/CwmsIdLocationKind.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/CwmsIdLocationKind.java
@@ -32,9 +32,10 @@
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import cwms.cda.formatters.Formats;
 import cwms.cda.formatters.annotations.FormattableWith;
+import cwms.cda.formatters.json.JsonV1;
 import cwms.cda.formatters.json.JsonV2;
 
-@FormattableWith(contentType = Formats.JSONV2, formatter = JsonV2.class,
+@FormattableWith(contentType = Formats.JSONV1, formatter = JsonV1.class,
     aliases = {Formats.JSON, Formats.DEFAULT})
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonDeserialize(builder = CwmsIdLocationKind.Builder.class)
diff --git a/cwms-data-api/src/main/java/cwms/cda/data/dto/locationlevel/SeasonalLocationLevel.java b/cwms-data-api/src/main/java/cwms/cda/data/dto/locationlevel/SeasonalLocationLevel.java
@@ -87,7 +87,6 @@ private SeasonalLocationLevel(SeasonalLocationLevel.Builder builder) {
 		intervalOrigin = builder.intervalOrigin;
 		intervalMonths = builder.intervalMonths;
 		intervalMinutes = builder.intervalMinutes;
-		validate();
 	}
 
 	public List<SeasonalValueBean> getSeasonalValues() {
diff --git a/cwms-data-api/src/main/java/cwms/cda/helpers/ZoneIdHelper.java b/cwms-data-api/src/main/java/cwms/cda/helpers/ZoneIdHelper.java
@@ -147,8 +147,7 @@ public static Map<String, String> buildResourceAliases() {
      * @throws DateTimeException if the zone ID has an invalid format or the zone ID is not available
      */
     public static ZoneId parseZoneIdWithAliases(String zoneId) {
-
-        return ZoneId.of(zoneId, tzAliases);
+        return zoneId == null ? null : ZoneId.of(zoneId, tzAliases);
     }
     
     /**
diff --git a/cwms-data-api/src/test/java/cwms/cda/api/LocationKindControllerIT.java b/cwms-data-api/src/test/java/cwms/cda/api/LocationKindControllerIT.java
diff --git a/cwms-data-api/src/test/java/cwms/cda/data/dto/CwmsIdLocationKindTest.java b/cwms-data-api/src/test/java/cwms/cda/data/dto/CwmsIdLocationKindTest.java
diff --git a/cwms-data-api/src/test/java/cwms/cda/data/dto/LocationLevelTest.java b/cwms-data-api/src/test/java/cwms/cda/data/dto/LocationLevelTest.java

Original file line number	Diff line number	Diff line change
`@@ -176,8 +176,7 @@ public static DSLContext getDslContext(Connection connection, String officeId) {`
`176`	`176`	`// This method should probably be called from within a connection{ } block and jOOQ`
`177`	`177`	`// code within the block should use the returned DSLContext or the connection.`
`178`	`178`	`DSLContext dsl = DSL.using(connection, SQLDialect.ORACLE18C);`
`179`		`- CWMS_ENV_PACKAGE.call_SET_SESSION_OFFICE_ID(dsl.configuration(), officeId);`
`180`		`-`
	`179`	`+ setOffice(connection, officeId);`
`181`	`180`	`return dsl;`
`182`	`181`	`}`
`183`	`182`