add query param to show all meter values for a transaction

src/main/java/de/rwth/idsg/steve/repository/TransactionRepository.java

@@ -40,7 +40,7 @@ public interface TransactionRepository {
 
     List<Integer> getActiveTransactionIds(String chargeBoxId);
 
-    TransactionDetails getDetails(int transactionPk);
+    TransactionDetails getDetails(int transactionPk, boolean energyValuesOnly);
 
     Result<TransactionRecord> getStoppedTransactions(@NotNull DateTime from, @NotNull DateTime to);
 }

src/main/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImpl.java

@@ -149,7 +149,7 @@ public List<Integer> getActiveTransactionIds(String chargeBoxId) {
     }
 
     @Override
-    public TransactionDetails getDetails(int transactionPk) {
+    public TransactionDetails getDetails(int transactionPk, boolean energyValuesOnly) {
 
         // -------------------------------------------------------------------------
         // Step 1: Collect general data about transaction
@@ -210,10 +210,6 @@ public TransactionDetails getDetails(int transactionPk) {
             timestampCondition = CONNECTOR_METER_VALUE.VALUE_TIMESTAMP.between(startTimestamp, stopTimestamp);
         }
 
-        // https://github.com/steve-community/steve/issues/1514
-        Condition unitCondition = CONNECTOR_METER_VALUE.UNIT.isNull()
-            .or(CONNECTOR_METER_VALUE.UNIT.in("", UnitOfMeasure.WH.value(), UnitOfMeasure.K_WH.value()));
-
         // Case 1: Ideal and most accurate case. Station sends meter values with transaction id set.
         //
         // Case 2: Fall back to filtering according to time windows. Timestamp fallback only considers rows
@@ -227,10 +223,20 @@ public TransactionDetails getDetails(int transactionPk) {
                 )
             );
 
+        List<Condition> conditions = new ArrayList<>();
+        conditions.add(selectionCriteria);
+
+        if (energyValuesOnly) {
+            // https://github.com/steve-community/steve/issues/1514
+            Condition unitCondition = CONNECTOR_METER_VALUE.UNIT.isNull()
+                .or(CONNECTOR_METER_VALUE.UNIT.in("", UnitOfMeasure.WH.value(), UnitOfMeasure.K_WH.value()));
+
+            conditions.add(unitCondition);
+        }
+
         List<TransactionDetails.MeterValues> values =
                 ctx.selectFrom(CONNECTOR_METER_VALUE)
-                   .where(unitCondition)
-                   .and(selectionCriteria)
+                   .where(conditions)
                    .orderBy(CONNECTOR_METER_VALUE.VALUE_TIMESTAMP)
                    .fetch()
                    .map(r -> TransactionDetails.MeterValues.builder()
@@ -244,7 +250,12 @@ public TransactionDetails getDetails(int transactionPk) {
                                                            .phase(r.getPhase())
                                                            .build())
                    .stream()
-                   .filter(TransactionStopServiceHelper::isEnergyValue)
+                   .filter(v -> {
+                       if (energyValuesOnly) {
+                           return TransactionStopServiceHelper.isEnergyValue(v);
+                       }
+                       return true;
+                   })
                    .toList();
 
         return new TransactionDetails(transaction, values, nextTx);

src/main/java/de/rwth/idsg/steve/service/TransactionService.java

@@ -71,18 +71,18 @@ public void writeTransactionsCSV(TransactionQueryForm form, Writer writer) {
         transactionRepository.writeTransactionsCSV(form, writer);
     }
 
-    public void writeTransactionMeterValuesCSV(int transactionPk, Writer writer) {
+    public void writeTransactionMeterValuesCSV(int transactionPk, boolean energyValuesOnly, Writer writer) {
         try (var seqWriter = csvMapper.writer(schema).writeValues(writer)) {
-            seqWriter.writeAll(getDetails(transactionPk).getValues());
+            seqWriter.writeAll(getDetails(transactionPk, energyValuesOnly).getValues());
         }
     }
 
     public List<Integer> getActiveTransactionIds(String chargeBoxId) {
         return transactionRepository.getActiveTransactionIds(chargeBoxId);
     }
 
-    public TransactionDetails getDetails(int transactionPk) {
-        return transactionRepository.getDetails(transactionPk);
+    public TransactionDetails getDetails(int transactionPk, boolean energyValuesOnly) {
+        return transactionRepository.getDetails(transactionPk, energyValuesOnly);
     }
 
     public Transaction getTransaction(int transactionPk) {
@@ -125,7 +125,7 @@ public void stop(List<Integer> transactionPkList) {
     }
 
     public void stop(Integer transactionPk) {
-        TransactionDetails thisTxDetails = transactionRepository.getDetails(transactionPk);
+        TransactionDetails thisTxDetails = transactionRepository.getDetails(transactionPk, true);
         Transaction thisTx = thisTxDetails.getTransaction();
 
         // early exit, if transaction is already stopped

src/main/java/de/rwth/idsg/steve/web/api/TransactionsRestController.java

@@ -40,6 +40,7 @@
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import jakarta.servlet.http.HttpServletResponse;
@@ -94,8 +95,9 @@
         The details are the intermediate values of the transaction.
         """)
     @GetMapping(value = "/{transactionPk}")
-    public TransactionDetails getTransactionDetails(@PathVariable("transactionPk") int transactionPk) {
-        return transactionService.getDetails(transactionPk);
+    public TransactionDetails getTransactionDetails(@PathVariable("transactionPk") int transactionPk,
+                                                    @RequestParam(value = "energyValuesOnly", defaultValue = "true") boolean energyValuesOnly) {
+        return transactionService.getDetails(transactionPk, energyValuesOnly);
     }
 
     @Operation(description = """

src/main/java/de/rwth/idsg/steve/web/controller/TransactionsReservationsController.java

@@ -34,6 +34,7 @@
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.Valid;
@@ -90,20 +91,24 @@
     }
 
     @RequestMapping(value = TRANSACTIONS_DETAILS_PATH)
-    public String getTransactionDetails(@PathVariable("transactionPk") int transactionPk, Model model) {
-        model.addAttribute("details", transactionService.getDetails(transactionPk));
+    public String getTransactionDetails(@PathVariable("transactionPk") int transactionPk,
+                                        @RequestParam(value = "energyValuesOnly", defaultValue = "true") boolean energyValuesOnly,
+                                        Model model) {
+        model.addAttribute("details", transactionService.getDetails(transactionPk, energyValuesOnly));
+        model.addAttribute("energyValuesOnly", energyValuesOnly);
         return "data-man/transactionDetails";
     }
 
     @RequestMapping(value = TRANSACTIONS_DETAILS_METER_VALUES_CSV_PATH)
     public void getTransactionDetailsMeterValuesCsv(@PathVariable("transactionPk") int transactionPk,
+                                                    @RequestParam(value = "energyValuesOnly", defaultValue = "true") boolean energyValuesOnly,
                                                     HttpServletResponse response) throws IOException {
         String fileName = "transaction_%s_meter_values.csv".formatted(transactionPk);
         String headerKey = "Content-Disposition";
         String headerValue = "attachment; filename=\"%s\"".formatted(fileName);
         response.setContentType("text/csv");
         response.setHeader(headerKey, headerValue);
-        transactionService.writeTransactionMeterValuesCSV(transactionPk, response.getWriter());
+        transactionService.writeTransactionMeterValuesCSV(transactionPk, energyValuesOnly, response.getWriter());
     }
 
     @RequestMapping(value = TRANSACTIONS_QUERY_PATH)

src/main/webapp/WEB-INF/views/data-man/transactionDetails.jsp

@@ -43,9 +43,19 @@
     </center>
     <br>
     <section><span>Intermediate Meter Values</span></section>
-    <form action="${ctxPath}/manager/transactions/details/${details.transaction.id}/meterValues.csv" method="get">
-        <input type="submit" value="Download CSV">
-    </form>
+    <div style="text-align: center;">
+        <form action="${ctxPath}/manager/transactions/details/${details.transaction.id}" method="get" style="display: inline-block;">
+            <select name="energyValuesOnly" style="width: 180px;">
+                <option value="true" <c:if test="${energyValuesOnly}">selected</c:if>>Energy values only</option>
+                <option value="false" <c:if test="${not energyValuesOnly}">selected</c:if>>All meter values</option>
+            </select>
+            <input type="submit" value="Apply">
+        </form>
+        <form action="${ctxPath}/manager/transactions/details/${details.transaction.id}/meterValues.csv" method="get" style="display: inline-block;">
+            <input type="hidden" name="energyValuesOnly" value="${energyValuesOnly}">
+            <input type="submit" value="Download CSV">
+        </form>
+    </div>
     <br>
     <table class="res">
         <thead>

src/test/java/de/rwth/idsg/steve/repository/impl/TransactionRepositoryImplIT.java

@@ -87,7 +87,7 @@ public void getDetails() {
             .fetchOne()
             .getTransactionPk();
 
-        var details = assertNoDatabaseException(() -> repository.getDetails(txId));
+        var details = assertNoDatabaseException(() -> repository.getDetails(txId, true));
         Assertions.assertNotNull(details);
         Assertions.assertEquals(txId, details.getTransaction().getId());
     }
@@ -121,7 +121,7 @@ public void getDetailsForZombieTransactionDoesNotIncludeNextTransactionStartValu
             .set(CONNECTOR_METER_VALUE.UNIT, "Wh")
             .execute();
 
-        var details = assertNoDatabaseException(() -> repository.getDetails(firstTxId));
+        var details = assertNoDatabaseException(() -> repository.getDetails(firstTxId, true));
 
         Assertions.assertEquals(1, details.getValues().size());
         Assertions.assertEquals("150", details.getValues().getFirst().getValue());

src/test/java/de/rwth/idsg/steve/utils/__DatabasePreparer__.java

@@ -133,7 +133,7 @@ public List<ConnectorStatus> getChargePointConnectorStatus() {
 
     public TransactionDetails getDetails(int transactionPk) {
         TransactionRepositoryImpl impl = new TransactionRepositoryImpl(dslContext);
-        return impl.getDetails(transactionPk);
+        return impl.getDetails(transactionPk, true);
     }
 
     public OcppTagActivityRecord getOcppTagRecord(String idTag) {