Merge pull request #102 from c-jimenez/fix/local_list_change_availability

Fix local list version management and change availability management when connector id = 0

Author: c-jimenez

src/chargepoint/authent/AuthentLocalList.cpp

@@ -124,8 +124,7 @@ bool AuthentLocalList::handleMessage(const ocpp::messages::SendLocalListReq& req
     // Check local list activation
     if (m_ocpp_config.localAuthListEnabled())
     {
-        // Check local list version
-        if (request.listVersion > m_local_list_version)
+        if (request.listVersion > 0)
         {
             // Check update list size
             if (request.localAuthorizationList.size() <= m_ocpp_config.sendLocalListMaxLength())
@@ -135,25 +134,48 @@ bool AuthentLocalList::handleMessage(const ocpp::messages::SendLocalListReq& req
                 if (request.updateType == UpdateType::Full)
                 {
                     success = performFullUpdate(request.localAuthorizationList);
-                }
-                else
-                {
-                    success = performPartialUpdate(request.localAuthorizationList);
-                }
-                if (success)
-                {
-                    response.status = UpdateStatus::Accepted;
+                    if (success)
+                    {
+                        response.status = UpdateStatus::Accepted;
 
-                    // Update local list version
-                    m_local_list_version = request.listVersion;
-                    if (!m_internal_config.setKey(LOCAL_LIST_VERSION_KEY, std::to_string(m_local_list_version)))
+                        // Update local list version
+                        m_local_list_version = request.listVersion;
+                        if (!m_internal_config.setKey(LOCAL_LIST_VERSION_KEY, std::to_string(m_local_list_version)))
+                        {
+                            LOG_ERROR << "Unable to save authent local list version";
+                        }
+                    }
+                    else
                     {
-                        LOG_ERROR << "Unable to save authent local list version";
+                        response.status = UpdateStatus::Failed;
                     }
                 }
                 else
                 {
-                    response.status = UpdateStatus::Failed;
+                    // Check local list version
+                    if (request.listVersion > m_local_list_version)
+                    {
+                        success = performPartialUpdate(request.localAuthorizationList);
+                        if (success)
+                        {
+                            response.status = UpdateStatus::Accepted;
+
+                            // Update local list version
+                            m_local_list_version = request.listVersion;
+                            if (!m_internal_config.setKey(LOCAL_LIST_VERSION_KEY, std::to_string(m_local_list_version)))
+                            {
+                                LOG_ERROR << "Unable to save authent local list version";
+                            }
+                        }
+                        else
+                        {
+                            response.status = UpdateStatus::Failed;
+                        }
+                    }
+                    else
+                    {
+                        response.status = UpdateStatus::VersionMismatch;
+                    }
                 }
             }
             else
@@ -163,7 +185,7 @@ bool AuthentLocalList::handleMessage(const ocpp::messages::SendLocalListReq& req
         }
         else
         {
-            response.status = UpdateStatus::VersionMismatch;
+            response.status = UpdateStatus::Failed;
         }
     }
     else

src/chargepoint/status/StatusManager.cpp

@@ -373,10 +373,23 @@ bool StatusManager::handleMessage(const ocpp::messages::ChangeAvailabilityReq& r
             {
                 status = ChargePointStatus::Available;
             }
-            m_worker_pool.run<void>([this, connector_id, status] { updateConnectorStatus(connector_id, status); });
+
+            // In the case the ChangeAvailability.req contains ConnectorId = 0, the status change applies to the Charge Point and all Connectors.
+            if (connector_id == 0)
+            {
+                for (unsigned int i = 0; i <= m_connectors.getCount(); i++)
+                {
+                    m_worker_pool.run<void>([this, i, status] { updateConnectorStatus(i, status); });
+                }
+            }
+            else
+            {
+                m_worker_pool.run<void>([this, connector_id, status] { updateConnectorStatus(connector_id, status); });
+            }
         }
 
         LOG_INFO << "Change availability " << AvailabilityStatusHelper.toString(response.status);
+
         ret = true;
     }
     else