tighten the constraints of accepting reservations

reason: check whether the reservation details sent by the
charging station match the details in the database. and prevent
overwriting/reusing reservations (status check).

Author: aheuvels

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

@@ -4,6 +4,8 @@
 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;
 
 import java.util.List;
 
@@ -30,5 +32,6 @@ public interface ReservationRepository {
 
     void accepted(int reservationId);
     void cancelled(int reservationId);
-    void used(DSLContext ctx, int reservationId, int transactionId);
+    void used(DSLContext ctx, Select<Record1<Integer>> connectorPkSelect, String ocppIdTag,
+              int reservationId, int transactionId);
 }

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

@@ -202,7 +202,7 @@ public Integer insertTransaction(InsertTransactionParams p) {
             // -------------------------------------------------------------------------
 
             if (p.isSetReservationId()) {
-                reservationRepository.used(ctx, p.getReservationId(), transactionId);
+                reservationRepository.used(ctx, connectorPkQuery, p.getIdTag(), p.getReservationId(), transactionId);
             }
 
             // -------------------------------------------------------------------------

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

@@ -14,6 +14,7 @@
 import org.jooq.Record1;
 import org.jooq.Record10;
 import org.jooq.RecordMapper;
+import org.jooq.Select;
 import org.jooq.SelectConditionStep;
 import org.jooq.SelectQuery;
 import org.jooq.exception.DataAccessException;
@@ -137,12 +138,21 @@ public void cancelled(int reservationId) {
     }
 
     @Override
-    public void used(DSLContext ctx, int reservationId, int transactionId) {
-        ctx.update(RESERVATION)
-           .set(RESERVATION.STATUS, ReservationStatus.USED.name())
-           .set(RESERVATION.TRANSACTION_PK, transactionId)
-           .where(RESERVATION.RESERVATION_PK.equal(reservationId))
-           .execute();
+    public void used(DSLContext ctx, 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)
+                       .where(RESERVATION.RESERVATION_PK.equal(reservationId))
+                       .and(RESERVATION.ID_TAG.equal(ocppIdTag))
+                       .and(RESERVATION.CONNECTOR_PK.equal(connectorPkSelect))
+                       .and(RESERVATION.STATUS.eq(ReservationStatus.ACCEPTED.name()))
+                       .execute();
+
+        if (count != 1) {
+            log.warn("Could not mark the reservation '{}' as used: Problems occurred due to sent reservation id, " +
+                    "charge box connector, user id tag or the reservation was used already.", reservationId);
+        }
     }
 
     // -------------------------------------------------------------------------