refactor

Author: goekay

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

@@ -30,10 +30,6 @@
  * @since 19.08.2014
  */
 public interface TransactionRepository {
-    Transaction getTransaction(int transactionPk);
-
-    Transaction getActiveTransaction(String chargeBoxId, Integer connectorId);
-
     List<Transaction> getTransactions(TransactionQueryForm form);
 
     void writeTransactionsCSV(TransactionQueryForm form, Writer writer);

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

@@ -63,34 +63,6 @@ public class TransactionRepositoryImpl implements TransactionRepository {
 
     private final DSLContext ctx;
 
-    @Override
-    public Transaction getTransaction(int transactionPk) {
-        TransactionQueryForm form = new TransactionQueryForm();
-        form.setTransactionPk(transactionPk);
-        form.setReturnCSV(false);
-        form.setType(TransactionQueryForm.QueryType.ALL);
-        return getInternal(form).fetch()
-                                .map(new TransactionMapper()).get(0);
-    }
-
-    @Override
-    public Transaction getActiveTransaction(String chargeBoxId, Integer connectorId) {
-        Transaction retVal = null;
-        TransactionQueryForm form = new TransactionQueryForm();
-        form.setChargeBoxId(chargeBoxId);
-        form.setConnectorId(connectorId);
-        form.setReturnCSV(false);
-        form.setType(TransactionQueryForm.QueryType.ACTIVE);
-        Record12<Integer, String, Integer, String, DateTime, String,
-                DateTime, String, String, Integer, Integer, TransactionStopEventActor>
-                transactionRecord = getInternal(form).fetchAny();
-        if (transactionRecord != null) {
-            TransactionMapper mapper = new TransactionMapper();
-            retVal = mapper.map(transactionRecord);
-        }
-        return retVal;
-    }
-
     @Override
     public List<Transaction> getTransactions(TransactionQueryForm form) {
         return getInternal(form).fetch()
@@ -309,7 +281,7 @@ private SelectQuery addConditions(SelectQuery selectQuery, TransactionQueryForm
             selectQuery.addConditions(CONNECTOR.CHARGE_BOX_ID.eq(form.getChargeBoxId()));
         }
 
-        if (form.isConnectorId()) {
+        if (form.isConnectorIdSet()) {
             selectQuery.addConditions(CONNECTOR.CONNECTOR_ID.eq(form.getConnectorId()));
         }
 

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

@@ -64,7 +64,7 @@
 public class NotificationService {
 
     private final MailService mailService;
-    private final TransactionRepository transactionRepository;
+    private final TransactionService transactionService;
     private final UserRepository userRepository;
     private final DelegatingTaskExecutor asyncTaskExecutor;
 
@@ -136,7 +136,7 @@ public void ocppStationStatusFailure(OcppStationStatusFailure notification) {
 
     private void userNotificationOcppStationStatusFailure(OcppStationStatusFailure notification, String subject) {
 
-         Transaction transaction = transactionRepository.getActiveTransaction(notification.getChargeBoxId(),
+         Transaction transaction = transactionService.getActiveTransaction(notification.getChargeBoxId(),
                 notification.getConnectorId());
         if (transaction == null) {
             return;
@@ -267,7 +267,7 @@ public void ocppStationStatusSuspendedEV(OcppStationStatusSuspendedEV notificati
 
     private void userNotificationActionSuspendedEV(OcppStationStatusSuspendedEV notification, String subject) {
 
-        Transaction transaction = transactionRepository.getActiveTransaction(notification.getChargeBoxId(),
+        Transaction transaction = transactionService.getActiveTransaction(notification.getChargeBoxId(),
                 notification.getConnectorId());
         if (transaction == null) {
             return;
@@ -338,7 +338,7 @@ private void userNotificationActionTransactionEnded(OcppTransactionEnded notific
         String eMailAddress = null;
         UserRecord userRecord = new UserRecord();
 
-        Transaction transActParams = transactionRepository.getTransaction(notification.getParams().getTransactionId());
+        Transaction transActParams = transactionService.getTransaction(notification.getParams().getTransactionId());
 
         // if the Transactionstop is received within the first Minute don't send an E-Mail
         if (!transActParams.getStopTimestamp().isAfter(transActParams.getStartTimestamp().plusMinutes(1))) {

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

@@ -0,0 +1,64 @@
+/*
+ * SteVe - SteckdosenVerwaltung - https://github.com/steve-community/steve
+ * Copyright (C) 2013-2025 SteVe Community Team
+ * All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package de.rwth.idsg.steve.service;
+
+import de.rwth.idsg.steve.repository.TransactionRepository;
+import de.rwth.idsg.steve.repository.dto.Transaction;
+import de.rwth.idsg.steve.web.dto.TransactionQueryForm;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author Sevket Goekay <[email protected]>
+ * @since 02.10.2025
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class TransactionService {
+
+    private final TransactionRepository transactionRepository;
+
+    public Transaction getTransaction(int transactionPk) {
+        TransactionQueryForm form = new TransactionQueryForm();
+        form.setTransactionPk(transactionPk);
+        form.setReturnCSV(false);
+        form.setType(TransactionQueryForm.QueryType.ALL);
+
+        return transactionRepository.getTransactions(form).getFirst();
+    }
+
+    public Transaction getActiveTransaction(String chargeBoxId, Integer connectorId) {
+        TransactionQueryForm form = new TransactionQueryForm();
+        form.setChargeBoxId(chargeBoxId);
+        form.setConnectorId(connectorId);
+        form.setReturnCSV(false);
+        form.setType(TransactionQueryForm.QueryType.ACTIVE);
+
+        var transactions = transactionRepository.getTransactions(form);
+        if (transactions.isEmpty()) {
+            return null;
+        } else if (transactions.size() == 1) {
+            return transactions.get(0);
+        } else {
+            throw new IllegalStateException("There are multiple active transactions with the same charge box id and connector id");
+        }
+    }
+}

src/main/java/de/rwth/idsg/steve/web/dto/TransactionQueryForm.java

@@ -41,7 +41,7 @@ public class TransactionQueryForm extends QueryForm {
     private Integer transactionPk;
 
     @Schema(description = "ID of the connector")
-    Integer connectorId;
+    private Integer connectorId;
 
     @Schema(description = "Disabled for the Web APIs. Do not use and set", hidden = true)
     private boolean returnCSV = false;
@@ -64,7 +64,7 @@ public boolean isTransactionPkSet() {
     }
 
     @Schema(hidden = true)
-    public boolean isConnectorId() {
+    public boolean isConnectorIdSet() {
         return connectorId != null;
     }