Feature/add outlet controller tests (USACE#798)

Adding outlet controller and virtual outlet controller integration tests
rma-rripken · Jul 24, 2024 · d209b68 · d209b68
1 parent 9b60d14
commit d209b68
Show file tree

Hide file tree

Showing 9 changed files with 777 additions and 104 deletions.
diff --git a/cwms-data-api/src/main/java/cwms/cda/api/location/kind/OutletController.java b/cwms-data-api/src/main/java/cwms/cda/api/location/kind/OutletController.java
@@ -78,7 +78,7 @@ private Timer.Context markAndTime(String subject) {
             },
             description = "Create CWMS Outlet",
             method = HttpMethod.POST,
-            tags = {OutletController.TAG},
+            tags = {TAG},
             responses = {
                     @OpenApiResponse(status = STATUS_204, description = "Outlet successfully stored to CWMS.")
             }
@@ -113,12 +113,12 @@ public void create(@NotNull Context ctx) {
                     })
             },
             description = "Returns matching CWMS Outlet Data for a Reservoir Project.",
-            tags = {OutletController.TAG}
+            tags = {TAG}
     )
     @Override
     public void getAll(@NotNull Context ctx) {
-        String office = ctx.pathParam(OFFICE);
-        String projectId = ctx.pathParam(PROJECT_ID);
+        String office = requiredParam(ctx, OFFICE);
+        String projectId = requiredParam(ctx, PROJECT_ID);
         try (Timer.Context ignored = markAndTime(GET_ALL)) {
             DSLContext dsl = getDslContext(ctx);
             OutletDao dao = new OutletDao(dsl);

diff --git a/cwms-data-api/src/main/java/cwms/cda/api/location/kind/VirtualOutletCreateController.java b/cwms-data-api/src/main/java/cwms/cda/api/location/kind/VirtualOutletCreateController.java
@@ -73,11 +73,7 @@ public void handle(@NotNull Context ctx) throws Exception {
             boolean failIfExists = queryParamAsClass(ctx, Boolean.class, true, FAIL_IF_EXISTS);
             DSLContext dsl = getDslContext(ctx);
             OutletDao dao = new OutletDao(dsl);
-
-            String officeId = virtualOutlet.getProjectId().getOfficeId();
-            String projectId = virtualOutlet.getProjectId().getName();
-            String virtualOutletId = virtualOutlet.getVirtualOutletId().getName();
-            dao.storeVirtualOutlet(officeId, projectId, virtualOutletId, virtualOutlet.getVirtualRecords(), failIfExists);
+            dao.storeVirtualOutlet(virtualOutlet, failIfExists);
             ctx.status(HttpServletResponse.SC_CREATED).json("Created Outlet");
         }
     }

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
@@ -155,18 +155,24 @@ private VirtualOutlet retrieveVirtualOutlet(Configuration config, String virtual
                                           .build();
     }
 
-    public void storeVirtualOutlet(String officeId, String projectId, String virtualOutletId,
-                                   List<VirtualOutletRecord> records, boolean failIfExists) {
-        List<List<String>> virtualOutlets = records.stream()
-                                                    .map(this::mapVirtualRecords)
-                                                    .collect(Collectors.toList());
+    public void storeVirtualOutlet(VirtualOutlet outlet, boolean failIfExists) {
+        List<List<String>> virtualOutlets = outlet.getVirtualRecords()
+                                                  .stream()
+                                                  .map(this::mapVirtualRecords)
+                                                  .collect(Collectors.toList());
 
         STR_TAB_TAB_T outlets = new STR_TAB_TAB_T(
                 virtualOutlets.stream().map(STR_TAB_T::new).collect(Collectors.toList()));
+
+        CwmsId projectId = outlet.getProjectId();
+        CwmsId outletId = outlet.getVirtualOutletId();
+
         connection(dsl, conn -> {
-            setOffice(conn, officeId);
-            CWMS_OUTLET_PACKAGE.call_STORE_COMPOUND_OUTLET(DSL.using(conn).configuration(), projectId, virtualOutletId,
-                                                           outlets, OracleTypeMap.formatBool(failIfExists), officeId);
+            setOffice(conn, outlet.getProjectId().getOfficeId());
+            CWMS_OUTLET_PACKAGE.call_STORE_COMPOUND_OUTLET(DSL.using(conn).configuration(), projectId.getName(),
+                                                           outletId.getName(), outlets,
+                                                           OracleTypeMap.formatBool(failIfExists),
+                                                           projectId.getOfficeId());
         });
     }