Merge pull request #1416 from steve-community/1414-and-1415

handle "0" ids same as "null"

Author: goekay

src/main/java/de/rwth/idsg/steve/repository/dto/InsertTransactionParams.java

@@ -43,8 +43,11 @@ public class InsertTransactionParams {
     // this came after splitting transaction table into two tables (start and stop)
     private final DateTime eventTimestamp;
 
+    /**
+     * https://github.com/steve-community/steve/issues/1414
+     */
     public boolean isSetReservationId() {
-        return reservationId != null;
+        return reservationId != null && reservationId != 0;
     }
 
 }

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

@@ -151,11 +151,13 @@ public StatusNotificationResponse statusNotification(
     }
 
     public MeterValuesResponse meterValues(MeterValuesRequest parameters, String chargeBoxIdentity) {
+        Integer transactionId = getTransactionId(parameters);
+
         ocppServerRepository.insertMeterValues(
                 chargeBoxIdentity,
                 parameters.getMeterValue(),
                 parameters.getConnectorId(),
-                parameters.getTransactionId()
+                transactionId
         );
 
         return new MeterValuesResponse();
@@ -261,4 +263,19 @@ public DataTransferResponse dataTransfer(DataTransferRequest parameters, String
         // https://github.com/steve-community/steve/pull/36
         return new DataTransferResponse().withStatus(DataTransferStatus.ACCEPTED);
     }
+
+    // -------------------------------------------------------------------------
+    // Helpers
+    // -------------------------------------------------------------------------
+
+    /**
+     * https://github.com/steve-community/steve/issues/1415
+     */
+    private Integer getTransactionId(MeterValuesRequest parameters) {
+        Integer transactionId = parameters.getTransactionId();
+        if (transactionId == null || transactionId == 0) {
+            return null;
+        }
+        return transactionId;
+    }
 }