Pump accounting DAO (#815)

Implements water supply pump accounting DAO.

cwms-data-api/src/main/java/cwms/cda/data/dao/watersupply/WaterContractDao.java

@@ -150,7 +150,7 @@ public void renameWaterContract(WaterUser waterUser, String oldContractName,
             String newContractName) {
         connection(dsl, c -> {
             setOffice(c, waterUser.getProjectId().getOfficeId());
-            WATER_USER_OBJ_T waterUserT = WaterSupplyUtils.toWaterUser(waterUser);
+            WATER_USER_OBJ_T waterUserT = WaterSupplyUtils.toWaterUserObjT(waterUser);
             WATER_USER_CONTRACT_REF_T waterUserContract = new WATER_USER_CONTRACT_REF_T(waterUserT, oldContractName);
             CWMS_WATER_SUPPLY_PACKAGE.call_RENAME_CONTRACT(DSL.using(c).configuration(), waterUserContract,
                     oldContractName, newContractName);
@@ -169,7 +169,7 @@ public void deleteWaterUser(CwmsId location, String entityName, DeleteMethod del
     public void deleteWaterContract(WaterUserContract contract, DeleteMethod deleteAction) {
         connection(dsl, c -> {
             setOffice(c, contract.getOfficeId());
-            WATER_USER_OBJ_T waterUserT = WaterSupplyUtils.toWaterUser(contract.getWaterUser());
+            WATER_USER_OBJ_T waterUserT = WaterSupplyUtils.toWaterUserObjT(contract.getWaterUser());
             String contractName = contract.getContractId().getName();
             WATER_USER_CONTRACT_REF_T waterUserContract = new WATER_USER_CONTRACT_REF_T(waterUserT, contractName);
             CWMS_WATER_SUPPLY_PACKAGE.call_DELETE_CONTRACT(DSL.using(c).configuration(), waterUserContract,

cwms-data-api/src/main/java/cwms/cda/data/dao/watersupply/WaterSupplyAccountingDao.java

@@ -0,0 +1,99 @@
+/*
+ *
+ * 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 cwms.cda.data.dao.watersupply;
+
+import cwms.cda.data.dao.JooqDao;
+import cwms.cda.data.dto.CwmsId;
+import cwms.cda.data.dto.watersupply.WaterSupplyAccounting;
+import cwms.cda.data.dto.watersupply.WaterUser;
+import hec.lang.Const;
+import java.math.BigInteger;
+import java.sql.Timestamp;
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+import org.jooq.DSLContext;
+import org.jooq.impl.DSL;
+import usace.cwms.db.jooq.codegen.packages.CWMS_WATER_SUPPLY_PACKAGE;
+import usace.cwms.db.jooq.codegen.udt.records.LOC_REF_TIME_WINDOW_TAB_T;
+import usace.cwms.db.jooq.codegen.udt.records.WATER_USER_CONTRACT_REF_T;
+import usace.cwms.db.jooq.codegen.udt.records.WAT_USR_CONTRACT_ACCT_TAB_T;
+
+
+public class WaterSupplyAccountingDao extends JooqDao<WaterSupplyAccounting> {
+
+    public WaterSupplyAccountingDao(DSLContext dsl) {
+        super(dsl);
+    }
+
+    public void storeAccounting(WaterSupplyAccounting accounting) {
+        String volumeUnitId = null;
+        String storeRule = Const.Delete_Insert;
+        boolean overrideProtection = false;
+
+        connection(dsl, c -> {
+            setOffice(c, accounting.getWaterUser().getProjectId().getOfficeId());
+
+            WAT_USR_CONTRACT_ACCT_TAB_T accountingTab = WaterSupplyUtils.toWaterUserContractAcctTs(accounting);
+            WATER_USER_CONTRACT_REF_T contractRefT = WaterSupplyUtils
+                    .toContractRef(accounting.getWaterUser(), accounting.getContractName());
+            LOC_REF_TIME_WINDOW_TAB_T pumpTimeWindowTab = WaterSupplyUtils.toTimeWindowTabT(accounting);
+            String timeZoneId = "UTC";
+            String overrideProt = formatBool(overrideProtection);
+            CWMS_WATER_SUPPLY_PACKAGE.call_STORE_ACCOUNTING_SET(DSL.using(c).configuration(), accountingTab,
+                    contractRefT, pumpTimeWindowTab, timeZoneId, volumeUnitId, storeRule, overrideProt);
+        });
+    }
+
+    public List<WaterSupplyAccounting> retrieveAccounting(String contractName, WaterUser waterUser,
+            CwmsId projectLocation, String units, Instant startTime, Instant endTime,
+            boolean startInclusive, boolean endInclusive, boolean ascendingFlag, int rowLimit) {
+
+        String transferType = null;
+        WATER_USER_CONTRACT_REF_T contractRefT = WaterSupplyUtils.toContractRef(waterUser, contractName);
+        Timestamp startTimestamp = Timestamp.from(startTime);
+        Timestamp endTimestamp = Timestamp.from(endTime);
+        String timeZoneId = "UTC";
+        String startInclusiveFlag = formatBool(startInclusive);
+        String endInclusiveFlag = formatBool(endInclusive);
+        String ascendingFlagStr = formatBool(ascendingFlag);
+        BigInteger rowLimitBigInt = BigInteger.valueOf(rowLimit);
+
+        return connectionResult(dsl, c -> {
+            setOffice(c, projectLocation.getOfficeId());
+            WAT_USR_CONTRACT_ACCT_TAB_T watUsrContractAcctObjTs
+                    = CWMS_WATER_SUPPLY_PACKAGE.call_RETRIEVE_ACCOUNTING_SET(DSL.using(c).configuration(),
+                    contractRefT, units, startTimestamp, endTimestamp, timeZoneId, startInclusiveFlag,
+                    endInclusiveFlag, ascendingFlagStr, rowLimitBigInt, transferType);
+            if (!watUsrContractAcctObjTs.isEmpty()) {
+                return WaterSupplyUtils.toWaterSupplyAccountingList(c, watUsrContractAcctObjTs);
+            } else {
+                return new ArrayList<>();
+            }
+        });
+    }
+}