Merge pull request #241 from c-jimenez/fix/get_diagnostics

[chargepoint] Make filename field of GetDiagnostics request optional

Author: c-jimenez

src/centralsystem/chargepoint/ChargePointProxy.cpp

@@ -448,8 +448,9 @@ bool ChargePointProxy::getDiagnostics(const std::string&
     if (res == CallResult::Ok)
     {
         ret                = true;
-        diagnotic_filename = resp.fileName;
-        LOG_INFO << "[" << m_identifier << "] - Get diagnostics : filename = " << resp.fileName.str();
+        diagnotic_filename = resp.fileName.value();
+        LOG_INFO << "[" << m_identifier << "] - Get diagnostics : filename = "
+                 << (resp.fileName.isSet() ? resp.fileName.value().str() : "no diagnostic available");
     }
     else
     {

src/chargepoint/maintenance/MaintenanceManager.cpp

@@ -329,7 +329,7 @@ bool MaintenanceManager::handleMessage(const ocpp::messages::GetDiagnosticsReq&
         {
             // Extract filename for the response
             std::filesystem::path diag_file(local_diagnostic_file);
-            response.fileName.assign(diag_file.filename().string());
+            response.fileName.value().assign(diag_file.filename().string());
 
             // Create a separate thread since the operation can be time consuming
             m_diagnostics_thread = new std::thread(std::bind(&MaintenanceManager::processGetDiagnostics,

src/chargepoint/requestfifo/RequestFifoManager.cpp

@@ -100,7 +100,7 @@ void RequestFifoManager::requestQueued()
 void RequestFifoManager::processFifoRequest()
 {
     std::lock_guard lock(m_process_mutex);
-  
+
     // Check the connection state
     if (m_msg_sender.isConnected())
     {

src/chargepoint/status/StatusManager.cpp

@@ -434,15 +434,15 @@ void StatusManager::bootNotificationProcess()
 
                 // Configure hearbeat
                 std::chrono::seconds interval(boot_conf.interval);
-                if(boot_conf.interval == 0)
+                if (boot_conf.interval == 0)
                 {
                     interval = m_ocpp_config.heartbeatInterval();
                 }
                 else
                 {
                     m_ocpp_config.heartbeatInterval(interval);
                 }
-                
+
                 m_heartbeat_timer.start(std::chrono::milliseconds(interval));
             }
             else
@@ -559,15 +559,15 @@ void StatusManager::sendBootNotification()
 
         // Restart hearbeat timer
         std::chrono::seconds interval(boot_conf.interval);
-        if(boot_conf.interval == 0)
+        if (boot_conf.interval == 0)
         {
             interval = m_ocpp_config.heartbeatInterval();
         }
         else
         {
             m_ocpp_config.heartbeatInterval(interval);
         }
-        
+
         m_heartbeat_timer.restart(std::chrono::milliseconds(interval));
 
         // Save registration status

src/messages/GetDiagnostics.h

@@ -61,7 +61,7 @@ struct GetDiagnosticsConf
     /** @brief Optional. This contains the name of the file with diagnostic information that will
                be uploaded. This field is not present when no diagnostic information is
                available. */
-    ocpp::types::CiStringType<255> fileName;
+    ocpp::types::Optional<ocpp::types::CiStringType<255>> fileName;
 };
 
 // Message converters