Mail user on TransactionStop and SuspendedEV event

src/main/java/de/rwth/idsg/steve/NotificationFeature.java

@@ -35,6 +35,7 @@ public enum NotificationFeature {
     OcppStationWebSocketConnected(" a JSON charging station connects"),
     OcppStationWebSocketDisconnected(" a JSON charging station disconnects"),
     OcppTransactionStarted(" a charging station starts a transaction"),
+    OcppStationStatusSuspendedEV(" a EV suspended charging"),
     OcppTransactionEnded(" a charging station ends a transaction");
 
 

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

@@ -30,11 +30,14 @@
  * @since 19.08.2014
  */
 public interface TransactionRepository {
+    Transaction getTransaction(int transactionPk);
+
     List<Transaction> getTransactions(TransactionQueryForm form);
 
     void writeTransactionsCSV(TransactionQueryForm form, Writer writer);
 
     List<Integer> getActiveTransactionIds(String chargeBoxId);
+    Integer getActiveTransactionId(String chargeBoxId, Integer connectorId);
 
     TransactionDetails getDetails(int transactionPk);
 }

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

@@ -31,6 +31,7 @@
 public interface UserRepository {
     List<User.Overview> getOverview(UserQueryForm form);
     User.Details getDetails(int userPk);
+    User.Details getDetails(String ocppTag);
 
     void add(UserForm form);
     void update(UserForm form);

src/main/java/de/rwth/idsg/steve/repository/dto/User.java

@@ -17,7 +17,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package de.rwth.idsg.steve.repository.dto;
-
+import java.util.List;
 import jooq.steve.db.tables.records.AddressRecord;
 import jooq.steve.db.tables.records.UserRecord;
 import lombok.Builder;
@@ -36,13 +36,14 @@ public class User {
     public static final class Overview {
         private final Integer userPk, ocppTagPk;
         private final String ocppIdTag, name, phone, email;
+        private final List<UserNotificationFeature> enabledFeatures;
     }
 
     @Getter
     @Builder
     public static final class Details {
         private final UserRecord userRecord;
         private final AddressRecord address;
-        private Optional<String> ocppIdTag;
+        private final Optional<String> ocppIdTag;
     }
 }

src/main/java/de/rwth/idsg/steve/repository/dto/UserNotificationFeature.java

@@ -0,0 +1,72 @@
+/*
+ * SteVe - SteckdosenVerwaltung - https://github.com/steve-community/steve
+ * Copyright (C) 2013-2024 SteVe Community Team
+ * All Rights Reserved.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package de.rwth.idsg.steve.repository.dto;
+
+//import static de.rwth.idsg.steve.utils.StringUtils.joinByComma;
+//import static de.rwth.idsg.steve.utils.StringUtils.splitByComma;
+//import java.util.List;
+//import java.util.stream.Collectors;
+import static de.rwth.idsg.steve.utils.StringUtils.joinByComma;
+import static de.rwth.idsg.steve.utils.StringUtils.splitByComma;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ *
+ * @author fnkbsi
+ */
+@RequiredArgsConstructor
+public enum UserNotificationFeature {
+
+    // Ocpp related
+    //
+    //OcppStationBooted(" a charging station sends a boot notification (Note: This activates notifications about failed connection attempts for unregistered JSON stations, as well)"),
+    OcppStationStatusFailure(" a connector gets faulted"),
+    //OcppStationWebSocketConnected(" a JSON charging station connects"),
+    //OcppStationWebSocketDisconnected(" a JSON charging station disconnects"),
+    OcppTransactionStarted(" a charging station starts a transaction"),
+    OcppStationStatusSuspendedEV(" a EV suspended charging"),
+    OcppTransactionEnded(" a charging station ends a transaction");
+
+
+    @Getter
+    private final String text;
+
+    public static UserNotificationFeature fromName(String v) {
+        for (UserNotificationFeature c: UserNotificationFeature.values()) {
+            if (c.name().equalsIgnoreCase(v)) {
+                return c;
+            }
+        }
+        throw new IllegalArgumentException(v);
+    }
+
+    public static List<UserNotificationFeature> splitFeatures(String str) {
+        return splitByComma(str).stream()
+                                .map(UserNotificationFeature::fromName)
+                                .collect(Collectors.toList());
+    }
+
+    public static String joinFeatures(List<UserNotificationFeature> enablesFeatures) {
+        return joinByComma(enablesFeatures);
+    }
+}

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

@@ -66,6 +66,16 @@ public TransactionRepositoryImpl(DSLContext ctx) {
         this.ctx = ctx;
     }
 
+    @Override
+    public Transaction getTransaction(int transactionPk) {
+        TransactionQueryForm form = new TransactionQueryForm();
+        form.setTransactionPk(transactionPk);
+        form.setReturnCSV(false);
+        form.setType(TransactionQueryForm.QueryType.ALL);
+        return getInternal(form).fetch()
+                                .map(new TransactionMapper()).get(0);
+    }
+
     @Override
     public List<Transaction> getTransactions(TransactionQueryForm form) {
         return getInternal(form).fetch()
@@ -89,6 +99,19 @@ public List<Integer> getActiveTransactionIds(String chargeBoxId) {
                   .fetch(TRANSACTION.TRANSACTION_PK);
     }
 
+    @Override
+    public Integer getActiveTransactionId(String chargeBoxId, Integer connectorId) {
+        return ctx.select(TRANSACTION.TRANSACTION_PK)
+                  .from(TRANSACTION)
+                  .join(CONNECTOR)
+                    .on(TRANSACTION.CONNECTOR_PK.equal(CONNECTOR.CONNECTOR_PK))
+                    .and(CONNECTOR.CHARGE_BOX_ID.equal(chargeBoxId))
+                  .where(TRANSACTION.STOP_TIMESTAMP.isNull())
+                    .and(CONNECTOR.CONNECTOR_ID.equal(connectorId))
+                  .orderBy(TRANSACTION.TRANSACTION_PK.desc()) // to avoid fetching ghost transactions, fetch the latest
+                  .fetchAny(TRANSACTION.TRANSACTION_PK);
+    }
+
     @Override
     public TransactionDetails getDetails(int transactionPk) {
 

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

@@ -22,6 +22,7 @@
 import de.rwth.idsg.steve.repository.AddressRepository;
 import de.rwth.idsg.steve.repository.UserRepository;
 import de.rwth.idsg.steve.repository.dto.User;
+import de.rwth.idsg.steve.repository.dto.UserNotificationFeature;
 import de.rwth.idsg.steve.web.dto.UserForm;
 import de.rwth.idsg.steve.web.dto.UserQueryForm;
 import jooq.steve.db.tables.records.AddressRecord;
@@ -31,7 +32,7 @@
 import org.jooq.Field;
 import org.jooq.JoinType;
 import org.jooq.Record1;
-import org.jooq.Record7;
+import org.jooq.Record8;
 import org.jooq.Result;
 import org.jooq.SelectConditionStep;
 import org.jooq.SelectQuery;
@@ -68,6 +69,7 @@ public List<User.Overview> getOverview(UserQueryForm form) {
                                        .name(r.value4() + " " + r.value5())
                                        .phone(r.value6())
                                        .email(r.value7())
+                                       .enabledFeatures(UserNotificationFeature.splitFeatures(r.value8()))
                                        .build()
                 );
     }
@@ -116,6 +118,42 @@ public User.Details getDetails(int userPk) {
                            .build();
     }
 
+    @Override
+    public User.Details getDetails(String ocppIdTag) {
+        Integer ocppPk = ctx.select(OCPP_TAG.OCPP_TAG_PK)
+                                        .from(OCPP_TAG)
+                                        .where(OCPP_TAG.ID_TAG.eq(ocppIdTag))
+                                        .fetchOne(OCPP_TAG.OCPP_TAG_PK);
+
+        if (ocppPk == null) {
+            throw new SteveException("There is no OCPP_Tag: '%s'", ocppIdTag);
+        }
+
+        // -------------------------------------------------------------------------
+        // 1. user table
+        // -------------------------------------------------------------------------
+
+        UserRecord ur = ctx.selectFrom(USER)
+                           .where(USER.OCPP_TAG_PK.equal(ocppPk))
+                           .fetchOne();
+
+        if (ur == null) {
+            throw new SteveException("There is no user with OCPP_TAG '%s'", ocppIdTag);
+        }
+
+        // -------------------------------------------------------------------------
+        // 2. address table
+        // -------------------------------------------------------------------------
+
+        AddressRecord ar = addressRepository.get(ctx, ur.getAddressPk());
+
+        return User.Details.builder()
+                           .userRecord(ur)
+                           .address(ar)
+                           .ocppIdTag(Optional.ofNullable(ocppIdTag))
+                           .build();
+    }
+
     @Override
     public void add(UserForm form) {
         ctx.transaction(configuration -> {
@@ -163,7 +201,9 @@ public void delete(int userPk) {
     // -------------------------------------------------------------------------
 
     @SuppressWarnings("unchecked")
-    private Result<Record7<Integer, Integer, String, String, String, String, String>> getOverviewInternal(UserQueryForm form) {
+    private Result<Record8<Integer, Integer, String, String, String, String, String, String>>
+                getOverviewInternal(UserQueryForm form) {
+
         SelectQuery selectQuery = ctx.selectQuery();
         selectQuery.addFrom(USER);
         selectQuery.addJoin(OCPP_TAG, JoinType.LEFT_OUTER_JOIN, USER.OCPP_TAG_PK.eq(OCPP_TAG.OCPP_TAG_PK));
@@ -174,7 +214,8 @@ private Result<Record7<Integer, Integer, String, String, String, String, String>
                 USER.FIRST_NAME,
                 USER.LAST_NAME,
                 USER.PHONE,
-                USER.E_MAIL
+                USER.E_MAIL,
+                USER.USER_NOTIFICATION_FEATURES
         );
 
         if (form.isSetUserPk()) {
@@ -225,6 +266,8 @@ private void addInternal(DSLContext ctx, UserForm form, Integer addressPk) {
                        .set(USER.NOTE, form.getNote())
                        .set(USER.ADDRESS_PK, addressPk)
                        .set(USER.OCPP_TAG_PK, selectOcppTagPk(form.getOcppIdTag()))
+                       .set(USER.USER_NOTIFICATION_FEATURES,
+                               UserNotificationFeature.joinFeatures(form.getEnabledFeatures()))
                        .execute();
 
         if (count != 1) {
@@ -243,6 +286,7 @@ private void updateInternal(DSLContext ctx, UserForm form, Integer addressPk) {
            .set(USER.NOTE, form.getNote())
            .set(USER.ADDRESS_PK, addressPk)
            .set(USER.OCPP_TAG_PK, selectOcppTagPk(form.getOcppIdTag()))
+           .set(USER.USER_NOTIFICATION_FEATURES, UserNotificationFeature.joinFeatures(form.getEnabledFeatures()))
            .where(USER.USER_PK.eq(form.getUserPk()))
            .execute();
     }

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

@@ -27,6 +27,7 @@
 import de.rwth.idsg.steve.repository.dto.UpdateTransactionParams;
 import de.rwth.idsg.steve.service.notification.OccpStationBooted;
 import de.rwth.idsg.steve.service.notification.OcppStationStatusFailure;
+import de.rwth.idsg.steve.service.notification.OcppStationStatusSuspendedEV;
 import de.rwth.idsg.steve.service.notification.OcppTransactionEnded;
 import de.rwth.idsg.steve.service.notification.OcppTransactionStarted;
 import jooq.steve.db.enums.TransactionStopEventActor;
@@ -147,6 +148,11 @@ public StatusNotificationResponse statusNotification(
                     chargeBoxIdentity, parameters.getConnectorId(), parameters.getErrorCode().value()));
         }
 
+         if (parameters.getStatus() == ChargePointStatus.SUSPENDED_EV) {
+            applicationEventPublisher.publishEvent(new OcppStationStatusSuspendedEV(
+                    chargeBoxIdentity, parameters.getConnectorId(), parameters.getTimestamp()));
+        }
+
         return new StatusNotificationResponse();
     }
 

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

@@ -40,6 +40,9 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
+import static de.rwth.idsg.steve.utils.StringUtils.splitByComma;
+import static de.rwth.idsg.steve.utils.StringUtils.isValidAddress;
+import java.util.List;
 
 /**
  * @author Sevket Goekay <[email protected]>
@@ -81,7 +84,7 @@ public MailSettings getSettings() {
 
     public void sendTestMail() {
         try {
-            send("Test", "Test");
+            send("Test", "Test", "");
         } catch (MessagingException e) {
             throw new SteveException("Failed to send mail", e);
         }
@@ -90,29 +93,54 @@ public void sendTestMail() {
     public void sendAsync(String subject, String body) {
         executorService.execute(() -> {
             try {
-                send(subject, body);
+                send(subject, body, "");
             } catch (MessagingException e) {
                 log.error("Failed to send mail", e);
             }
         });
     }
 
-    public void send(String subject, String body) throws MessagingException {
-        MailSettings settings = getSettings();
+    public void sendAsync(String subject, String body, String recipientAddresses) {
+        executorService.execute(() -> {
+            try {
+                send(subject, body, recipientAddresses);
+            } catch (MessagingException e) {
+                log.error("Failed to send mail", e);
+            }
+        });
+    }
+
+    private void send(String subject, String body, String recipientAddresses) throws MessagingException {
+        MailSettings settingsLocal = getSettings();
 
         Message mail = new MimeMessage(session);
         mail.setSubject("[SteVe] " + subject);
         mail.setContent(body, "text/plain");
-        mail.setFrom(new InternetAddress(settings.getFrom()));
+        mail.setFrom(new InternetAddress(settingsLocal.getFrom()));
+
+        List<String> eMailAddresses;
 
-        for (String rep : settings.getRecipients()) {
-            mail.addRecipient(Message.RecipientType.TO, new InternetAddress(rep));
+        if (recipientAddresses.isEmpty()) {
+            eMailAddresses = settingsLocal.getRecipients();
+        } else {
+            eMailAddresses = splitByComma(recipientAddresses);
+        }
+
+        for (String rep : eMailAddresses) {
+            if (isValidAddress(rep)) {
+                mail.addRecipient(Message.RecipientType.TO, new InternetAddress(rep));
+            } else {
+                log.error("Failed to send mail to " + rep + "! Format of the address is invalid.");
+            }
         }
 
         try (Transport transport = session.getTransport()) {
             transport.connect();
             transport.sendMessage(mail, mail.getAllRecipients());
         }
+        catch (Exception e) {
+            log.error("Failed to send mail(s)! ", e);
+        }
     }
 
     // -------------------------------------------------------------------------