split "insertTransaction" into multiple db transactions

Author: aheuvels

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

@@ -3,7 +3,6 @@
 import de.rwth.idsg.steve.repository.dto.InsertReservationParams;
 import de.rwth.idsg.steve.repository.dto.Reservation;
 import de.rwth.idsg.steve.web.dto.ReservationQueryForm;
-import org.jooq.DSLContext;
 import org.jooq.Record1;
 import org.jooq.Select;
 
@@ -32,6 +31,5 @@ public interface ReservationRepository {
 
     void accepted(int reservationId);
     void cancelled(int reservationId);
-    void used(DSLContext ctx, Select<Record1<Integer>> connectorPkSelect, String ocppIdTag,
-              int reservationId, int transactionId);
+    void used(Select<Record1<Integer>> connectorPkSelect, String ocppIdTag, int reservationId, int transactionId);
 }

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

@@ -155,54 +155,50 @@ public void insertMeterValues(String chargeBoxIdentity, List<MeterValue> list, i
 
     @Override
     public Integer insertTransaction(InsertTransactionParams p) {
-        return ctx.transactionResult(configuration -> {
-            DSLContext ctx = DSL.using(configuration);
-
-            insertIgnoreConnector(ctx, p.getChargeBoxId(), p.getConnectorId());
+        insertIgnoreConnector(ctx, p.getChargeBoxId(), p.getConnectorId());
 
-            // it is important to insert idTag before transaction, since the transaction table references it
-            boolean unknownTagInserted = insertIgnoreIdTag(ctx, p);
+        // it is important to insert idTag before transaction, since the transaction table references it
+        boolean unknownTagInserted = insertIgnoreIdTag(ctx, p);
 
-            SelectConditionStep<Record1<Integer>> connectorPkQuery =
-                    DSL.select(CONNECTOR.CONNECTOR_PK)
-                       .from(CONNECTOR)
-                       .where(CONNECTOR.CHARGE_BOX_ID.equal(p.getChargeBoxId()))
-                       .and(CONNECTOR.CONNECTOR_ID.equal(p.getConnectorId()));
-
-            // -------------------------------------------------------------------------
-            // Step 1: Insert transaction
-            // -------------------------------------------------------------------------
+        SelectConditionStep<Record1<Integer>> connectorPkQuery =
+                DSL.select(CONNECTOR.CONNECTOR_PK)
+                   .from(CONNECTOR)
+                   .where(CONNECTOR.CHARGE_BOX_ID.equal(p.getChargeBoxId()))
+                   .and(CONNECTOR.CONNECTOR_ID.equal(p.getConnectorId()));
 
-            int transactionId = ctx.insertInto(TRANSACTION)
-                                   .set(CONNECTOR_STATUS.CONNECTOR_PK, connectorPkQuery)
-                                   .set(TRANSACTION.ID_TAG, p.getIdTag())
-                                   .set(TRANSACTION.START_TIMESTAMP, p.getStartTimestamp())
-                                   .set(TRANSACTION.START_VALUE, p.getStartMeterValue())
-                                   .returning(TRANSACTION.TRANSACTION_PK)
-                                   .fetchOne()
-                                   .getTransactionPk();
+        // -------------------------------------------------------------------------
+        // Step 1: Insert transaction
+        // -------------------------------------------------------------------------
 
-            if (unknownTagInserted) {
-                log.warn("The transaction '{}' contains an unknown idTag '{}' which was inserted into DB "
-                        + "to prevent information loss and has been blocked", transactionId, p.getIdTag());
-            }
+        int transactionId = ctx.insertInto(TRANSACTION)
+                               .set(CONNECTOR_STATUS.CONNECTOR_PK, connectorPkQuery)
+                               .set(TRANSACTION.ID_TAG, p.getIdTag())
+                               .set(TRANSACTION.START_TIMESTAMP, p.getStartTimestamp())
+                               .set(TRANSACTION.START_VALUE, p.getStartMeterValue())
+                               .returning(TRANSACTION.TRANSACTION_PK)
+                               .fetchOne()
+                               .getTransactionPk();
+
+        if (unknownTagInserted) {
+            log.warn("The transaction '{}' contains an unknown idTag '{}' which was inserted into DB "
+                    + "to prevent information loss and has been blocked", transactionId, p.getIdTag());
+        }
 
-            // -------------------------------------------------------------------------
-            // Step 2 for OCPP 1.5: A startTransaction may be related to a reservation
-            // -------------------------------------------------------------------------
+        // -------------------------------------------------------------------------
+        // Step 2 for OCPP 1.5: A startTransaction may be related to a reservation
+        // -------------------------------------------------------------------------
 
-            if (p.isSetReservationId()) {
-                reservationRepository.used(ctx, connectorPkQuery, p.getIdTag(), p.getReservationId(), transactionId);
-            }
+        if (p.isSetReservationId()) {
+            reservationRepository.used(connectorPkQuery, p.getIdTag(), p.getReservationId(), transactionId);
+        }
 
-            // -------------------------------------------------------------------------
-            // Step 3: Set connector status to "Occupied"
-            // -------------------------------------------------------------------------
+        // -------------------------------------------------------------------------
+        // Step 3: Set connector status to "Occupied"
+        // -------------------------------------------------------------------------
 
-            insertConnectorStatus(ctx, connectorPkQuery, p.getStartTimestamp(), p.getStatusUpdate());
+        insertConnectorStatus(ctx, connectorPkQuery, p.getStartTimestamp(), p.getStatusUpdate());
 
-            return transactionId;
-        });
+        return transactionId;
     }
 
     @Override

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

@@ -143,8 +143,7 @@ public void cancelled(int reservationId) {
     }
 
     @Override
-    public void used(DSLContext ctx, Select<Record1<Integer>> connectorPkSelect, String ocppIdTag,
-                     int reservationId, int transactionId) {
+    public void used(Select<Record1<Integer>> connectorPkSelect, String ocppIdTag, int reservationId, int transactionId) {
         int count = ctx.update(RESERVATION)
                        .set(RESERVATION.STATUS, ReservationStatus.USED.name())
                        .set(RESERVATION.TRANSACTION_PK, transactionId)