Change in the decision-making process for reservation recognition

Before sending start transaction  the status of the connector must be changed to preparing, and this makes us no longer able to determine from the status whether the connector was reserved or not.

Author: mahdidadashi65

src/chargepoint/reservation/ReservationManager.cpp

@@ -102,7 +102,7 @@ ocpp::types::AuthorizationStatus ReservationManager::isTransactionAllowed(unsign
     if (connector)
     {
         // Check if connector is reserved
-        if (connector->status == ChargePointStatus::Reserved)
+        if (connector->reservation_id_tag.length() > 0)
         {
             // Check if id tag match
             if (id_tag == connector->reservation_id_tag)
@@ -130,7 +130,7 @@ ocpp::types::AuthorizationStatus ReservationManager::isTransactionAllowed(unsign
             {
                 // Check if connector 0 is reserved
                 Connector& charge_point = m_connectors.getChargePointConnector();
-                if (charge_point.status == ChargePointStatus::Reserved)
+                if (charge_point.reservation_id_tag.length() > 0)
                 {
                     // Ensure that the module functions properly even when the gun is inserted first by the user.
                     if (m_connectors.getConnector(connector_id)->status == ChargePointStatus::Preparing)
@@ -180,6 +180,7 @@ bool ReservationManager::handleMessage(const ocpp::messages::ReserveNowReq& requ
 {
     bool ret = false;
 
+    DateTime now = DateTime::now();
     // Get requested connector
     Connector* connector = m_connectors.getConnector(request.connectorId);
     if (connector)
@@ -227,13 +228,20 @@ bool ReservationManager::handleMessage(const ocpp::messages::ReserveNowReq& requ
                     connector->reservation_expiry_date   = request.expiryDate;
                     response.status                      = ReservationStatus::Accepted;
 
+                    if (connector->reservation_expiry_date > now)
+                    {
                     // Update connector status and notify new status
                     m_worker_pool.run<void>(
                         [this, connector]
                         {
                             m_status_manager.updateConnectorStatus(connector->id, ChargePointStatus::Reserved);
                             m_events_handler.reservationStarted(connector->id);
                         });
+                    }
+                    else
+                    {
+                        response.status = ReservationStatus::Rejected;
+                    }
                     break;
                 }
 
@@ -293,7 +301,7 @@ bool ReservationManager::handleMessage(const ocpp::messages::CancelReservationRe
     response.status = CancelReservationStatus::Rejected;
     for (const Connector* connector : m_connectors.getConnectors())
     {
-        if ((connector->status == ChargePointStatus::Reserved) && (connector->reservation_id == request.reservationId))
+        if ((connector->reservation_id_tag.length() > 0) && (connector->reservation_id == request.reservationId))
         {
             // Cancel reservation
             m_worker_pool.run<void>([this, connector_id = connector->id] { endReservation(connector_id, true); });
@@ -316,7 +324,7 @@ void ReservationManager::checkExpiries()
     // Check reservations
     for (const Connector* connector : m_connectors.getConnectors())
     {
-        if ((connector->status == ChargePointStatus::Reserved) && (connector->reservation_expiry_date <= now))
+        if ((connector->reservation_id_tag.length() > 0) && (connector->reservation_expiry_date <= now))
         {
             // End reservation
             m_worker_pool.run<void>(std::bind(&ReservationManager::endReservation, this, connector->id, false));

src/chargepoint/transaction/TransactionManager.cpp

@@ -98,7 +98,7 @@ ocpp::types::AuthorizationStatus TransactionManager::startTransaction(unsigned i
                 start_transaction_req.timestamp  = DateTime::now();
 
                 // Check reservations
-                if (connector->status == ChargePointStatus::Reserved)
+                if (connector->reservation_id_tag.length() > 0)
                 {
                     // Fill reservation id
                     start_transaction_req.reservationId = connector->reservation_id;
@@ -112,7 +112,7 @@ ocpp::types::AuthorizationStatus TransactionManager::startTransaction(unsigned i
                     if (m_ocpp_config.reserveConnectorZeroSupported())
                     {
                         Connector& charge_point = m_connectors.getChargePointConnector();
-                        if (charge_point.status == ChargePointStatus::Reserved)
+                        if (charge_point.reservation_id_tag.length() > 0)
                         {
                             // Check if this transaction can be used for the charge point reservation
                             if (m_reservation_manager.isTransactionAllowed(Connectors::CONNECTOR_ID_CHARGE_POINT, id_tag) ==