Merge pull request #99 from mahdidadashi65/develop_dadashi

Develop dadashi

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,26 +134,50 @@ 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 +186,8 @@ bool AuthentLocalList::handleMessage(const ocpp::messages::SendLocalListReq& req
         }
         else
         {
-            response.status = UpdateStatus::VersionMismatch;
+            response.status = UpdateStatus::Failed;
+
         }
     }
     else

src/chargepoint/status/StatusManager.cpp

@@ -363,20 +363,43 @@ bool StatusManager::handleMessage(const ocpp::messages::ChangeAvailabilityReq& r
     unsigned int connector_id = request.connectorId;
     if (m_connectors.isValid(connector_id))
     {
-        // Notify request
-        response.status = m_events_handler.changeAvailabilityRequested(connector_id, request.type);
-        if (response.status == AvailabilityStatus::Accepted)
-        {
-            // Update status
-            ChargePointStatus status = ChargePointStatus::Unavailable;
-            if (request.type == AvailabilityType::Operative)
+        //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++)
             {
-                status = ChargePointStatus::Available;
+                response.status = m_events_handler.changeAvailabilityRequested(i, request.type);
+                if (response.status == AvailabilityStatus::Accepted)
+                {
+                    // Update status
+                    ChargePointStatus status = ChargePointStatus::Unavailable;
+                    if (request.type == AvailabilityType::Operative)
+                    {
+                        status = ChargePointStatus::Available;
+                    }
+                    m_worker_pool.run<void>([this, i, status] { updateConnectorStatus(i, status); });
+                }
+
+                LOG_INFO << "Change availability " << AvailabilityStatusHelper.toString(response.status);
             }
-            m_worker_pool.run<void>([this, connector_id, status] { updateConnectorStatus(connector_id, status); });
         }
+        else
+        {
+            // Notify request
+            response.status = m_events_handler.changeAvailabilityRequested(connector_id, request.type);
+            if (response.status == AvailabilityStatus::Accepted)
+            {
+                // Update status
+                ChargePointStatus status = ChargePointStatus::Unavailable;
+                if (request.type == AvailabilityType::Operative)
+                {
+                    status = ChargePointStatus::Available;
+                }
+                m_worker_pool.run<void>([this, connector_id, status] { updateConnectorStatus(connector_id, status); });
+            }
 
-        LOG_INFO << "Change availability " << AvailabilityStatusHelper.toString(response.status);
+            LOG_INFO << "Change availability " << AvailabilityStatusHelper.toString(response.status);
+        }
         ret = true;
     }
     else