fix: update after CodeRabbit review

Author: juherr

steve-core/src/main/java/de/rwth/idsg/steve/repository/dto/UpdateTransactionParams.java

@@ -38,6 +38,7 @@ public class UpdateTransactionParams {
     private final String stopMeterValue;
     private final String stopReason;
 
+    @Builder.Default
     private final TransactionStatusUpdate statusUpdate = TransactionStatusUpdate.AfterStop;
 
     // these two came after splitting transaction table into two tables (start and stop)

steve-core/src/main/java/de/rwth/idsg/steve/utils/DateTimeUtils.java

@@ -105,10 +105,18 @@ public static String timeElapsed(LocalDateTime from, LocalDateTime to) {
         var seconds = duration.getSeconds();
 
         var sb = new StringBuilder();
-        if (days > 0) sb.append(days).append(days == 1 ? " day" : " days").append(" ");
-        if (hours > 0) sb.append(hours).append(hours == 1 ? " hour" : " hours").append(" ");
-        if (minutes > 0) sb.append(minutes).append(minutes == 1 ? " minute" : " minutes").append(" ");
-        if (seconds > 0 || sb.isEmpty()) sb.append(seconds).append(seconds == 1 ? " second" : " seconds");
+        if (days > 0) {
+            sb.append(days).append(days == 1 ? " day" : " days").append(" ");
+        }
+        if (hours > 0) {
+            sb.append(hours).append(hours == 1 ? " hour" : " hours").append(" ");
+        }
+        if (minutes > 0) {
+            sb.append(minutes).append(minutes == 1 ? " minute" : " minutes").append(" ");
+        }
+        if (seconds > 0 || sb.isEmpty()) {
+            sb.append(seconds).append(seconds == 1 ? " second" : " seconds");
+        }
 
         return sb.toString().trim();
     }

steve-ocpp-websocket/src/main/java/de/rwth/idsg/steve/config/OcppWebSocketConfiguration.java

@@ -44,7 +44,9 @@
 import java.util.EnumMap;
 import java.util.Map;
 
-import static de.rwth.idsg.steve.ocpp.OcppVersion.*;
+import static de.rwth.idsg.steve.ocpp.OcppVersion.V_12;
+import static de.rwth.idsg.steve.ocpp.OcppVersion.V_15;
+import static de.rwth.idsg.steve.ocpp.OcppVersion.V_16;
 
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>

steve-ocpp/src/main/java/de/rwth/idsg/ocpp/DateTimeUtils.java

@@ -28,7 +28,6 @@
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeFormatterBuilder;
 import java.time.temporal.ChronoField;
-import java.time.temporal.TemporalAccessor;
 
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public final class DateTimeUtils {
@@ -92,7 +91,8 @@ public static String toString(OffsetDateTime dateTime, ZoneId zoneId) {
             // between Central Systems and Charge Points.
             dateTime = dateTime.withOffsetSameInstant(ZoneOffset.UTC);
         } else {
-            dateTime = dateTime.withOffsetSameInstant(zoneId.getRules().getOffset(dateTime.toLocalDateTime()));
+            var targetOffset = zoneId.getRules().getOffset(dateTime.toInstant());
+            dateTime = dateTime.withOffsetSameInstant(targetOffset);
         }
         return OCPP_DATETIME_FORMATTER.format(dateTime);
     }

steve-ui-jsp/src/main/resources/webapp/WEB-INF/views/connectorStatus.jsp

@@ -93,7 +93,7 @@ Connector Status
                     </c:if>
 				</td>
 				<td>${cs.connectorId}</td>
-				<td data-sort-value="${f:toMillis(cs.statusTimestamp)}">${cs.timeStamp}</td>
+				<td data-sort-value="${f:offsetToMillis(cs.statusTimestamp)}">${cs.timeStamp}</td>
 				<td><encode:forHtml value="${cs.status}" /></td>
 				<td><encode:forHtml value="${cs.errorCode}" /></td>
 			</tr>

steve-ui-jsp/src/main/resources/webapp/WEB-INF/views/data-man/ocppTags.jsp

@@ -154,7 +154,7 @@
                             <a href="${ctxPath}/manager/ocppTags/details/${item.parentOcppTagPk}">${item.parentIdTag}</a>
                         </c:if>
                     </td>
-                    <td data-sort-value="${f:toMillis(item.expiryDate)}">${item.expiryDateFormatted}</td>
+                    <td data-sort-value="${f:offsetToMillis(item.expiryDate)}">${item.expiryDateFormatted}</td>
                     <td>${item.inTransaction}</td>
                     <td>${item.blocked}</td>
                     <td>

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

@@ -59,7 +59,7 @@
         <tbody>
         <c:forEach items="${details.values}" var="v">
             <tr>
-                <td data-sort-value="${f:toMillis(v.valueTimestamp)}">${v.valueTimestamp}</td>
+                <td data-sort-value="${f:offsetToMillis(v.valueTimestamp)}">${v.valueTimestamp}</td>
                 <td><encode:forHtml value="${v.value}" /></td>
                 <td><encode:forHtml value="${v.readingContext}" /></td>
                 <td><encode:forHtml value="${v.format}" /></td>

steve-ui-jsp/src/main/resources/webapp/WEB-INF/views/data-man/transactions.jsp

@@ -120,9 +120,9 @@ Transactions
                 <td><a href="${ctxPath}/manager/chargepoints/details/${ta.chargeBoxPk}">${ta.chargeBoxId}</a></td>
                 <td>${ta.connectorId}</td>
                 <td><a href="${ctxPath}/manager/ocppTags/details/${ta.ocppTagPk}">${ta.ocppIdTag}</a></td>
-                <td data-sort-value="${f:toMillis(ta.startTimestamp)}">${ta.startTimestampFormatted}</td>
+                <td data-sort-value="${f:offsetToMillis(ta.startTimestamp)}">${ta.startTimestampFormatted}</td>
                 <td>${ta.startValue}</td>
-                <td data-sort-value="${f:toMillis(ta.stopTimestamp)}">${ta.stopTimestampFormatted}</td>
+                <td data-sort-value="${f:offsetToMillis(ta.stopTimestamp)}">${ta.stopTimestampFormatted}</td>
                 <td>${ta.stopValue}</td>
                 <td><encode:forHtml value="${ta.stopReason}" /></td>
                 <td>

steve/src/test/java/de/rwth/idsg/steve/issues/Issue1219.java

@@ -98,7 +98,7 @@ private void realTest() {
         List<OcppTag.OcppTagOverview> values = repository.getOverview(new OcppTagQueryForm());
         var stop = Instant.now();
 
-        System.out.println("took " + Duration.between(stop, start).toMillis());
+        System.out.println("took " + Duration.between(start, stop).toMillis() + " ms");
     }
 
     private List<Integer> insertStopTransactions(List<Integer> insertedTransactionIds) {

steve/src/test/java/de/rwth/idsg/steve/issues/Issue81.java

@@ -29,6 +29,7 @@
 import ocpp.cs._2015._10.StartTransactionRequest;
 
 import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static de.rwth.idsg.steve.utils.Helpers.getForOcpp16;
@@ -72,10 +73,10 @@ public void beforeRepeat() {
                 assertThat(boot.getStatus()).isEqualTo(RegistrationStatus.ACCEPTED);
 
                 var req = new StartTransactionRequest()
-                        .withConnectorId(ThreadLocalRandom.current().nextInt())
+                        .withConnectorId(ThreadLocalRandom.current().nextInt(1, 8))
                         .withIdTag(Helpers.getRandomString())
-                        .withTimestamp(OffsetDateTime.now())
-                        .withMeterStart(ThreadLocalRandom.current().nextInt());
+                        .withTimestamp(OffsetDateTime.now(ZoneOffset.UTC))
+                        .withMeterStart(ThreadLocalRandom.current().nextInt(0, 1_000_000));
                 txRequest.set(req);
 
                 Integer t1 = sendStartTx(client.get(), txRequest.get(), chargeBoxId.get());