implement SignedFirmwareStatusNotification

Author: goekay

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

@@ -32,6 +32,8 @@ public interface SecurityRepository {
 
     void insertLogUploadStatus(String chargeBoxIdentity, Integer requestId, String status, DateTime timestamp);
 
+    void insertFirmwareUpdateStatus(String chargeBoxIdentity, Integer requestId, String value, DateTime timestamp);
+
     List<SecurityEvent> getSecurityEvents(String chargeBoxId, Integer limit);
 
     int insertCertificate(String chargeBoxId, String certificateType, String certificateData,

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

@@ -32,6 +32,7 @@
 import java.util.Collections;
 import java.util.List;
 
+import static jooq.steve.db.Tables.CHARGE_BOX_FIRMWARE_UPDATE_STATUS;
 import static jooq.steve.db.Tables.CHARGE_BOX_LOG_UPLOAD_STATUS;
 import static jooq.steve.db.tables.ChargeBox.CHARGE_BOX;
 import static jooq.steve.db.tables.ChargeBoxSecurityEvent.CHARGE_BOX_SECURITY_EVENT;
@@ -78,6 +79,22 @@ public void insertLogUploadStatus(String chargeBoxId, Integer requestId, String
             .execute();
     }
 
+    @Override
+    public void insertFirmwareUpdateStatus(String chargeBoxId, Integer requestId, String status, DateTime timestamp) {
+        var chargeBoxPk = getChargeBoxPk(chargeBoxId);
+        if (chargeBoxPk == null) {
+            log.error("Cannot insert log upload status for unknown chargeBoxId: {}", chargeBoxId);
+            return;
+        }
+
+        ctx.insertInto(CHARGE_BOX_FIRMWARE_UPDATE_STATUS)
+            .set(CHARGE_BOX_FIRMWARE_UPDATE_STATUS.CHARGE_BOX_PK, chargeBoxPk)
+            .set(CHARGE_BOX_FIRMWARE_UPDATE_STATUS.JOB_ID, requestId)
+            .set(CHARGE_BOX_FIRMWARE_UPDATE_STATUS.EVENT_STATUS, status)
+            .set(CHARGE_BOX_FIRMWARE_UPDATE_STATUS.EVENT_TIMESTAMP, timestamp)
+            .execute();
+    }
+
     @Override
     public List<SecurityEvent> getSecurityEvents(String chargeBoxId, Integer limit) {
         return Collections.emptyList();

src/main/java/de/rwth/idsg/steve/service/CentralSystemService16_Service.java

@@ -359,48 +359,45 @@ public SecurityEventNotificationResponse securityEventNotification(SecurityEvent
 
         return new SecurityEventNotificationResponse();
     }
-    public LogStatusNotificationResponse logStatusNotification(LogStatusNotification parameters,
-                                                               String chargeBoxIdentity) {
+
+    public SignedFirmwareStatusNotificationResponse signedFirmwareStatusNotification(SignedFirmwareStatusNotification parameters,
+                                                                                     String chargeBoxIdentity) {
         try {
             if (parameters.getRequestId() == null) {
                 log.warn("No requestId in {}", parameters);
             } else {
-                securityRepository.insertLogUploadStatus(
+                securityRepository.insertFirmwareUpdateStatus(
                     chargeBoxIdentity,
                     parameters.getRequestId(),
                     parameters.getStatus().value(),
                     DateTime.now()
                 );
             }
         } catch (Exception e) {
-            log.error("Error processing log status notification from '{}': {}", chargeBoxIdentity, e.getMessage(), e);
+            log.error("Error processing firmware status notification from '{}': {}", chargeBoxIdentity, e.getMessage(), e);
         }
 
-        return new LogStatusNotificationResponse();
+        return new SignedFirmwareStatusNotificationResponse();
     }
 
-    public SignedFirmwareStatusNotificationResponse signedFirmwareStatusNotification(
-            SignedFirmwareStatusNotification parameters, String chargeBoxIdentity) {
-        var status = parameters.getStatus() != null ? parameters.getStatus().toString() : "Unknown";
-        var requestId = parameters.getRequestId();
-
-        log.info("FirmwareStatus from '{}': status={}, requestId={}", chargeBoxIdentity, status, requestId);
-
+    public LogStatusNotificationResponse logStatusNotification(LogStatusNotification parameters,
+                                                               String chargeBoxIdentity) {
         try {
-            var firmwareUpdate = securityRepository.getCurrentFirmwareUpdate(chargeBoxIdentity);
-
-            if (firmwareUpdate != null) {
-                securityRepository.updateFirmwareUpdateStatus(firmwareUpdate.getFirmwareUpdateId(), status);
-                log.info("Updated firmware status for chargeBox '{}' to '{}'", chargeBoxIdentity, status);
+            if (parameters.getRequestId() == null) {
+                log.warn("No requestId in {}", parameters);
             } else {
-                log.warn("No firmware update found for chargeBox '{}'", chargeBoxIdentity);
+                securityRepository.insertLogUploadStatus(
+                    chargeBoxIdentity,
+                    parameters.getRequestId(),
+                    parameters.getStatus().value(),
+                    DateTime.now()
+                );
             }
         } catch (Exception e) {
-            log.error("Error processing firmware status notification from '{}': {}",
-                    chargeBoxIdentity, e.getMessage(), e);
+            log.error("Error processing log status notification from '{}': {}", chargeBoxIdentity, e.getMessage(), e);
         }
 
-        return new SignedFirmwareStatusNotificationResponse();
+        return new LogStatusNotificationResponse();
     }
 
     // -------------------------------------------------------------------------