shift mail "subject" construction after early exits

reason: dont do if not needed.

Author: goekay

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

@@ -58,11 +58,6 @@ public class NotificationServiceForUser {
     public void ocppStationStatusFailure(OcppStationStatusFailure event) {
         log.debug("Processing: {}", event);
 
-        String subject = format("Connector '%s' of charging station '%s' is FAULTED",
-                event.getConnectorId(),
-                event.getChargeBoxId()
-        );
-
         var transaction = transactionService.getActiveTransaction(event.getChargeBoxId(), event.getConnectorId());
         if (transaction == null) {
             return;
@@ -73,6 +68,11 @@ public void ocppStationStatusFailure(OcppStationStatusFailure event) {
             return;
         }
 
+        String subject = format("Connector '%s' of charging station '%s' is FAULTED",
+            event.getConnectorId(),
+            event.getChargeBoxId()
+        );
+
         // send email if user with eMail address found
         String bodyUserMail =
                 format("User: %s \n\n Connector %d of charging station %s notifies FAULTED! \n\n Error code: %s",
@@ -81,6 +81,7 @@ public void ocppStationStatusFailure(OcppStationStatusFailure event) {
                         event.getChargeBoxId(),
                         event.getErrorCode()
                 );
+
         mailService.send(subject, addTimestamp(bodyUserMail), List.of(user.getEmail()));
     }
 
@@ -89,17 +90,17 @@ public void ocppStationStatusFailure(OcppStationStatusFailure event) {
     public void ocppTransactionStarted(OcppTransactionStarted event) {
         log.debug("Processing: {}", event);
 
-        String subject = format("Transaction '%s' has started on charging station '%s' on connector '%s'",
-                event.getTransactionId(),
-                event.getParams().getChargeBoxId(),
-                event.getParams().getConnectorId()
-        );
-
         var user = getUserForMail(event.getParams().getIdTag(), NotificationFeature.OcppTransactionStarted);
         if (user == null) {
             return;
         }
 
+        String subject = format("Transaction '%s' has started on charging station '%s' on connector '%s'",
+            event.getTransactionId(),
+            event.getParams().getChargeBoxId(),
+            event.getParams().getConnectorId()
+        );
+
         // send email if user with eMail address found
         String bodyUserMail =
                 format("User: %s started transaction '%d' on connector '%s' of charging station '%s'",
@@ -108,6 +109,7 @@ public void ocppTransactionStarted(OcppTransactionStarted event) {
                         event.getParams().getConnectorId(),
                         event.getParams().getChargeBoxId()
                 );
+
         mailService.send(subject, addTimestamp(bodyUserMail), List.of(user.getEmail()));
     }
 
@@ -116,11 +118,6 @@ public void ocppTransactionStarted(OcppTransactionStarted event) {
     public void ocppStationStatusSuspendedEV(OcppStationStatusSuspendedEV event) {
         log.debug("Processing: {}", event);
 
-        String subject = format("EV stopped charging at charging station %s, Connector %d",
-                    event.getChargeBoxId(),
-                    event.getConnectorId()
-        );
-
         var transaction = transactionService.getActiveTransaction(event.getChargeBoxId(), event.getConnectorId());
         if (transaction == null) {
             return;
@@ -131,13 +128,19 @@ public void ocppStationStatusSuspendedEV(OcppStationStatusSuspendedEV event) {
             return;
         }
 
+        String subject = format("EV stopped charging at charging station %s, Connector %d",
+            event.getChargeBoxId(),
+            event.getConnectorId()
+        );
+
         // send email if user with eMail address found
         String bodyUserMail =
                 format("User: %s \n\n Connector %d of charging station %s notifies Suspended_EV",
                         user.getName(),
                         event.getConnectorId(),
                         event.getChargeBoxId()
                 );
+
         mailService.send(subject, addTimestamp(bodyUserMail), List.of(user.getEmail()));
     }
 
@@ -146,18 +149,18 @@ public void ocppStationStatusSuspendedEV(OcppStationStatusSuspendedEV event) {
     public void ocppTransactionEnded(OcppTransactionEnded event) {
         log.debug("Processing: {}", event);
 
-        String subject = format("Transaction '%s' has ended on charging station '%s'",
-                event.getParams().getTransactionId(),
-                event.getParams().getChargeBoxId()
-        );
-
         var transaction = transactionService.getTransaction(event.getParams().getTransactionId());
 
         var user = getUserForMail(transaction.getOcppIdTag(), NotificationFeature.OcppTransactionEnded);
         if (user == null) {
             return;
         }
 
+        String subject = format("Transaction '%s' has ended on charging station '%s'",
+            event.getParams().getTransactionId(),
+            event.getParams().getChargeBoxId()
+        );
+
         mailService.send(subject, addTimestamp(createContent(transaction, user)), List.of(user.getEmail()));
     }