improve user notification impl

* separate user notifications from others: introduction of NotificationServiceForUser
* simplify and dedup user notification logic in NotificationServiceForUser
* refactor MailService: async not needed for mail for user notifications, because the whole user notification processing is done in async
* UserRepository.getDetails(String ocppTag) is not needed. the use cases can be achieved via getOverview(..)

Author: goekay

src/main/java/de/rwth/idsg/steve/config/BeanConfiguration.java

@@ -43,6 +43,7 @@
 import org.springframework.format.support.FormattingConversionService;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
@@ -67,6 +68,7 @@
 @Configuration
 @EnableWebMvc
 @EnableScheduling
+@EnableAsync
 @ComponentScan("de.rwth.idsg.steve")
 public class BeanConfiguration implements WebMvcConfigurer {
 

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

@@ -31,7 +31,6 @@
 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/impl/UserRepositoryImpl.java

@@ -45,7 +45,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 
 import static de.rwth.idsg.steve.utils.CustomDSL.includes;
 import static jooq.steve.db.Tables.USER_OCPP_TAG;
@@ -120,30 +119,6 @@ public User.Details getDetails(int userPk) {
                            .build();
     }
 
-    @Override
-    public User.Details getDetails(String ocppIdTag) {
-        Map<Integer, List<User.OcppTagEntry>> ocppTagEntries = getOcppTagsInternal(null, ocppIdTag);
-        if (CollectionUtils.isEmpty(ocppTagEntries)) {
-            throw new SteveException("There is no user with OcppTag '%s'", ocppIdTag);
-        }
-
-        Integer userPk = ocppTagEntries.keySet().iterator().next();
-
-        UserRecord ur = ctx.selectFrom(USER)
-                           .where(USER.USER_PK.equal(userPk))
-                           .fetchOne();
-
-        if (ur == null) {
-            throw new SteveException("There is no user with id '%s'", userPk);
-        }
-
-        return User.Details.builder()
-                           .userRecord(ur)
-                           .address(addressRepository.get(ctx, ur.getAddressPk()))
-                           .ocppTagEntries(ocppTagEntries.getOrDefault(userPk, List.of()))
-                           .build();
-    }
-
     @Override
     public void add(UserForm form) {
         ctx.transaction(configuration -> {

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

@@ -20,6 +20,8 @@
 
 import de.rwth.idsg.steve.web.dto.SettingsForm.MailSettings;
 
+import jakarta.mail.MessagingException;
+
 import java.util.List;
 
 /**
@@ -34,5 +36,7 @@ public interface MailService {
 
     void sendAsync(String subject, String body);
 
-    void sendAsync(String subject, String body, List<String> eMailAddresses);
+    void send(String subject, String body) throws MessagingException;
+
+    void send(String subject, String body, List<String> eMailAddresses);
 }

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

@@ -16,7 +16,6 @@
  * 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.service;
 
 import com.google.common.base.Strings;
@@ -37,9 +36,9 @@
 import jakarta.mail.internet.InternetAddress;
 import jakarta.mail.internet.MimeMessage;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
+import java.util.function.Function;
 
 /**
  * @author Sevket Goekay <[email protected]>
@@ -61,8 +60,7 @@ public MailSettings getSettings() {
     @Override
     public void sendTestMail() {
         try {
-            List<String> noAddress = new ArrayList();
-            send("Test", "Test", noAddress);
+            send("Test", "Test");
         } catch (MessagingException e) {
             throw new SteveException("Failed to send mail", e);
         }
@@ -72,26 +70,28 @@ public void sendTestMail() {
     public void sendAsync(String subject, String body) {
         asyncTaskExecutor.execute(() -> {
             try {
-                List<String> noAddress = new ArrayList();
-                send(subject, body, noAddress);
+                send(subject, body);
             } catch (MessagingException e) {
                 log.error("Failed to send mail", e);
             }
         });
     }
 
     @Override
-    public void sendAsync(String subject, String body, List<String> eMailAddresses) {
-        asyncTaskExecutor.execute(() -> {
-            try {
-                send(subject, body, eMailAddresses);
-            } catch (MessagingException e) {
-                log.error("Failed to send mail", e);
-            }
-        });
+    public void send(String subject, String body) throws MessagingException {
+        sendInternal(subject, body, MailSettings::getRecipients);
+    }
+
+    @Override
+    public void send(String subject, String body, List<String> eMailAddresses) {
+        try {
+            sendInternal(subject, body, mailSettings -> eMailAddresses);
+        } catch (MessagingException e) {
+            log.error("Failed to send mail", e);
+        }
     }
 
-    private void send(String subject, String body, List<String> eMailAddresses) throws MessagingException {
+    public void sendInternal(String subject, String body, Function<MailSettings, List<String>> emailAddressProvider) throws MessagingException {
         MailSettings settings = getSettings();
         Session session = createSession(settings);
 
@@ -100,21 +100,14 @@ private void send(String subject, String body, List<String> eMailAddresses) thro
         mail.setContent(body, "text/plain");
         mail.setFrom(new InternetAddress(settings.getFrom()));
 
-        if (eMailAddresses.isEmpty()) {
-            eMailAddresses = settings.getRecipients();
-        }
-
-        for (String rep : eMailAddresses) {
+        for (String rep : emailAddressProvider.apply(settings)) {
             mail.addRecipient(Message.RecipientType.TO, new InternetAddress(rep));
         }
 
         try (Transport transport = session.getTransport()) {
             transport.connect();
             transport.sendMessage(mail, mail.getAllRecipients());
         }
-        catch (Exception e) {
-            log.error("Failed to send mail(s)! ", e);
-        }
     }
 
     // -------------------------------------------------------------------------