From 26a6d99b45267679f5602f3d93e1ff1fc06e0c7b Mon Sep 17 00:00:00 2001 From: "el-miloud.tihlat" Date: Wed, 8 Jul 2026 15:15:34 +0200 Subject: [PATCH 1/5] feat: ajout des notifications --- pom.xml | 6 ++ .../aop/notification/NotificationAspect.java | 59 +++++++++++++++++++ .../NotificationAspectConfig.java | 23 ++++++++ src/main/resources/application.example.yml | 8 ++- 4 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java create mode 100644 src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java diff --git a/pom.xml b/pom.xml index c8dc829..d633a16 100644 --- a/pom.xml +++ b/pom.xml @@ -163,6 +163,12 @@ 1.8.0 + + fr.recia.notifications + event-rest-client-kafka + 1.0.14-java-11 + + diff --git a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java new file mode 100644 index 0000000..5dada19 --- /dev/null +++ b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java @@ -0,0 +1,59 @@ +package fr.recia.mce.api.escomceapi.aop.notification; + +import fr.recia.event_rest_client_kafka.HttpNotificationClient; +import fr.recia.model_kafka.model.*; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.annotation.After; +import org.aspectj.lang.annotation.Aspect; +import org.springframework.stereotype.Component; + +import java.util.List; + + +@Component +@Aspect +@Slf4j +@Data +public class NotificationAspect { + private final HttpNotificationClient notificationClient; + + + @After("execution(* fr.recia.mce.api.escomceapi.ldap.repository.LdapUserDaoImp.updatePassword(..)) && args(uid, newHashedPassword)") + public void notifPasswordChange(String uid, String newHashedPassword) { + try { + String id = uid; + String title = "MON COMPTE ÉTUDIANT"; + String message = "Votre mot de passe a été mis à jour"; + List channel = List.of(Channel.WEB); + String idLink = ""; + Priority priority = Priority.NORMAL; + TargetType targetType = TargetType.UID; + + notificationClient.sendNotification(title, message, idLink, id, channel, priority, targetType); + + log.debug("Le mot de passe de {} a été mis à jour", id); + }catch (Exception e) { + log.debug("Erreur: la notification n'a pas pu être envoyée", e); + } + } + + @After("execution(* fr.recia.mce.api.escomceapi.ldap.repository.LdapUserDaoImp.updateEmail(..)) && args(uid, newEmail)") + public void notifEmailChange(String uid, String newEmail) { + try { + String id = uid; + String title = "MON COMPTE ÉTUDIANT"; + String message = "Votre email a été mis à jour, avec cette adresse : " + newEmail; + List channel = List.of(Channel.WEB); + String idLink = ""; + Priority priority = Priority.NORMAL; + TargetType targetType = TargetType.UID; + + notificationClient.sendNotification(title, message, idLink, id, channel, priority, targetType); + + log.debug("Le mail de {} a été modifié", id); + }catch (Exception e) { + log.debug("Erreur: la notification n'a pas pu être envoyée", e); + } + } +} diff --git a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java new file mode 100644 index 0000000..772c26a --- /dev/null +++ b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java @@ -0,0 +1,23 @@ +package fr.recia.mce.api.escomceapi.aop.notification.configuration; + +import fr.recia.event_rest_client_kafka.HttpNotificationClient; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class NotificationAspectConfig { + @Value("${notification-api.url}") + private String apiUrl; + + @Value("${notification-api.service-name}") + private String serviceName; + + @Value("${notification-api.api-key}") + private String apiKey; + + @Bean + public HttpNotificationClient notificationClient() { + return new HttpNotificationClient(apiUrl, serviceName, apiKey); + } +} \ No newline at end of file diff --git a/src/main/resources/application.example.yml b/src/main/resources/application.example.yml index 61eeaff..55df396 100644 --- a/src/main/resources/application.example.yml +++ b/src/main/resources/application.example.yml @@ -185,5 +185,11 @@ mail: regexValideAddr: '[_A-Za-z0-9-]+(\.[_A-Za-z0-9-]+)*@[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)*(\.[A-Za-z-]{2,4})' regexsDomainesExclus: 'netocentre.fr touraine-eschool.fr chercan.fr colleges41.fr mon-e-college.loiret.fr e-college.indre.fr colleges-eureliens.fr' verification: + base-url: http://localhost:8080/api/personne/mce/verify-email frontend-url: http://localhost:5173/verification-email - expiry-hours: 1 + expiry-hours: 24 + +notification-api: + url: "localhost:8079/event/emit" + service-name: "Service Name" + api-key: "MySecretApiKey" From 2c99fd3240728008ffe0932aaaf29b9e50881769 Mon Sep 17 00:00:00 2001 From: "el-miloud.tihlat" Date: Wed, 8 Jul 2026 15:33:56 +0200 Subject: [PATCH 2/5] chore: ajout des licences --- .../aop/notification/NotificationAspect.java | 20 ++++++++++++++++--- .../NotificationAspectConfig.java | 19 ++++++++++++++++-- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java index 5dada19..b9215da 100644 --- a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java +++ b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java @@ -1,7 +1,22 @@ +/* + * Copyright (C) 2023 GIP-RECIA, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package fr.recia.mce.api.escomceapi.aop.notification; -import fr.recia.event_rest_client_kafka.HttpNotificationClient; -import fr.recia.model_kafka.model.*; +import fr.recia.notifications.event_rest_client_kafka.HttpNotificationClient; +import fr.recia.notifications.model_kafka.model.*; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.annotation.After; @@ -18,7 +33,6 @@ public class NotificationAspect { private final HttpNotificationClient notificationClient; - @After("execution(* fr.recia.mce.api.escomceapi.ldap.repository.LdapUserDaoImp.updatePassword(..)) && args(uid, newHashedPassword)") public void notifPasswordChange(String uid, String newHashedPassword) { try { diff --git a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java index 772c26a..c0306bf 100644 --- a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java +++ b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java @@ -1,6 +1,21 @@ +/* + * Copyright (C) 2023 GIP-RECIA, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package fr.recia.mce.api.escomceapi.aop.notification.configuration; -import fr.recia.event_rest_client_kafka.HttpNotificationClient; +import fr.recia.notifications.event_rest_client_kafka.HttpNotificationClient; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -20,4 +35,4 @@ public class NotificationAspectConfig { public HttpNotificationClient notificationClient() { return new HttpNotificationClient(apiUrl, serviceName, apiKey); } -} \ No newline at end of file +} From 57acfb309aee65f085bdecca7e9470e6d2d205f3 Mon Sep 17 00:00:00 2001 From: "el-miloud.tihlat" Date: Tue, 18 Aug 2026 11:44:50 +0200 Subject: [PATCH 3/5] feat: finalisation des notifications du MCE --- .../aop/notification/NotificationAspect.java | 60 ++++++++++++------- .../NotificationAspectConfig.java | 14 ++--- .../NotificationAspectConfigMail.java | 13 ++++ .../NotificationAspectConfigPassword.java | 13 ++++ 4 files changed, 70 insertions(+), 30 deletions(-) create mode 100644 src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigMail.java create mode 100644 src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigPassword.java diff --git a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java index b9215da..a850507 100644 --- a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java +++ b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java @@ -15,6 +15,8 @@ */ package fr.recia.mce.api.escomceapi.aop.notification; +import fr.recia.mce.api.escomceapi.aop.notification.configuration.NotificationAspectConfigPassword; +import fr.recia.mce.api.escomceapi.aop.notification.configuration.NotificationAspectConfigMail; import fr.recia.notifications.event_rest_client_kafka.HttpNotificationClient; import fr.recia.notifications.model_kafka.model.*; import lombok.Data; @@ -23,7 +25,10 @@ import org.aspectj.lang.annotation.Aspect; import org.springframework.stereotype.Component; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; import java.util.List; +import java.util.Locale; @Component @@ -32,42 +37,53 @@ @Data public class NotificationAspect { private final HttpNotificationClient notificationClient; + private final NotificationAspectConfigPassword notificationAspectConfigPassword; + private final NotificationAspectConfigMail notificationAspectConfigMail; + + private static final DateTimeFormatter DATE_TIME_FORMATTER = + DateTimeFormatter.ofPattern("dd/MM/yyyy 'à' HH:mm", Locale.FRENCH); + + private String buildMessage(String template) { + return template + ZonedDateTime.now().format(DATE_TIME_FORMATTER); + } @After("execution(* fr.recia.mce.api.escomceapi.ldap.repository.LdapUserDaoImp.updatePassword(..)) && args(uid, newHashedPassword)") public void notifPasswordChange(String uid, String newHashedPassword) { try { - String id = uid; - String title = "MON COMPTE ÉTUDIANT"; - String message = "Votre mot de passe a été mis à jour"; - List channel = List.of(Channel.WEB); - String idLink = ""; - Priority priority = Priority.NORMAL; - TargetType targetType = TargetType.UID; + final String id = uid; + final String title = notificationAspectConfigPassword.getTitle(); + final String message = buildMessage(notificationAspectConfigPassword.getMessage()); + final List channel = List.of(Channel.WEB); + final String idLink = ""; + final Priority priority = Priority.NORMAL; + final TargetType targetType = TargetType.UID; notificationClient.sendNotification(title, message, idLink, id, channel, priority, targetType); - log.debug("Le mot de passe de {} a été mis à jour", id); - }catch (Exception e) { - log.debug("Erreur: la notification n'a pas pu être envoyée", e); + log.debug("Notification pour changement de mot de passe de {} a été mis à jour", id); + } catch (Exception e) { + log.error("Erreur: la notification n'a pas pu être envoyée", e); } } - @After("execution(* fr.recia.mce.api.escomceapi.ldap.repository.LdapUserDaoImp.updateEmail(..)) && args(uid, newEmail)") - public void notifEmailChange(String uid, String newEmail) { + @After("execution(* fr.recia.mce.api.escomceapi.services.PersonneService.updateEmail(..)) && args(uid, ..)") + public void notifEmailChange(String uid) { try { - String id = uid; - String title = "MON COMPTE ÉTUDIANT"; - String message = "Votre email a été mis à jour, avec cette adresse : " + newEmail; - List channel = List.of(Channel.WEB); - String idLink = ""; - Priority priority = Priority.NORMAL; - TargetType targetType = TargetType.UID; + final String id = uid; + final String title = notificationAspectConfigMail.getTitle(); + final String message = buildMessage(notificationAspectConfigMail.getMessage()); + final List channel = List.of(Channel.WEB); + final String idLink = ""; + final Priority priority = Priority.NORMAL; + final TargetType targetType = TargetType.UID; + + log.trace("TEST POUR L'ENVOIE DE NOTIFICATION, L'ID EST-IL RÉCUPÉRÉ ? ID : {}", id); notificationClient.sendNotification(title, message, idLink, id, channel, priority, targetType); - log.debug("Le mail de {} a été modifié", id); - }catch (Exception e) { - log.debug("Erreur: la notification n'a pas pu être envoyée", e); + log.info("Notification pour changement de mail {} a été envoyé", id); + } catch (Exception e) { + log.error("Erreur: la notification n'a pas pu être envoyée", e); } } } diff --git a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java index c0306bf..9fdbd7f 100644 --- a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java +++ b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java @@ -16,23 +16,21 @@ package fr.recia.mce.api.escomceapi.aop.notification.configuration; import fr.recia.notifications.event_rest_client_kafka.HttpNotificationClient; -import org.springframework.beans.factory.annotation.Value; +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +@Data @Configuration +@ConfigurationProperties(prefix = "notification-api") public class NotificationAspectConfig { - @Value("${notification-api.url}") - private String apiUrl; - - @Value("${notification-api.service-name}") + private String url; private String serviceName; - - @Value("${notification-api.api-key}") private String apiKey; @Bean public HttpNotificationClient notificationClient() { - return new HttpNotificationClient(apiUrl, serviceName, apiKey); + return new HttpNotificationClient(url, serviceName, apiKey); } } diff --git a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigMail.java b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigMail.java new file mode 100644 index 0000000..27b60df --- /dev/null +++ b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigMail.java @@ -0,0 +1,13 @@ +package fr.recia.mce.api.escomceapi.aop.notification.configuration; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Data +@ConfigurationProperties(prefix = "notification-conf-mail") +@Configuration +public class NotificationAspectConfigMail { + String title; + String message; +} diff --git a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigPassword.java b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigPassword.java new file mode 100644 index 0000000..c5f4cc5 --- /dev/null +++ b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigPassword.java @@ -0,0 +1,13 @@ +package fr.recia.mce.api.escomceapi.aop.notification.configuration; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@Data +@ConfigurationProperties(prefix = "notification-conf-password") +@Configuration +public class NotificationAspectConfigPassword { + String title; + String message; +} From d8c3931f0d83fe18d8891e69042f8bfcc18e4a8f Mon Sep 17 00:00:00 2001 From: "el-miloud.tihlat" Date: Tue, 18 Aug 2026 11:55:45 +0200 Subject: [PATCH 4/5] feat: ajout des licences --- .../NotificationAspectConfigMail.java | 15 +++++++++++++++ .../NotificationAspectConfigPassword.java | 15 +++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigMail.java b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigMail.java index 27b60df..c08394f 100644 --- a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigMail.java +++ b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigMail.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2023 GIP-RECIA, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package fr.recia.mce.api.escomceapi.aop.notification.configuration; import lombok.Data; diff --git a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigPassword.java b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigPassword.java index c5f4cc5..16b1e09 100644 --- a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigPassword.java +++ b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigPassword.java @@ -1,3 +1,18 @@ +/* + * Copyright (C) 2023 GIP-RECIA, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package fr.recia.mce.api.escomceapi.aop.notification.configuration; import lombok.Data; From 00ea2c6e4f8766ba6ff0a0d985ae3c142c61a3cc Mon Sep 17 00:00:00 2001 From: "el-miloud.tihlat" Date: Wed, 19 Aug 2026 12:02:35 +0200 Subject: [PATCH 5/5] feat: modification des notifications --- .../aop/notification/NotificationAspect.java | 35 +++++++------------ .../NotificationAspectConfig.java | 4 +++ .../NotificationAspectConfigMail.java | 28 --------------- .../NotificationAspectConfigPassword.java | 28 --------------- 4 files changed, 17 insertions(+), 78 deletions(-) delete mode 100644 src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigMail.java delete mode 100644 src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigPassword.java diff --git a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java index a850507..8150a27 100644 --- a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java +++ b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/NotificationAspect.java @@ -15,8 +15,7 @@ */ package fr.recia.mce.api.escomceapi.aop.notification; -import fr.recia.mce.api.escomceapi.aop.notification.configuration.NotificationAspectConfigPassword; -import fr.recia.mce.api.escomceapi.aop.notification.configuration.NotificationAspectConfigMail; +import fr.recia.mce.api.escomceapi.aop.notification.configuration.NotificationAspectConfig; import fr.recia.notifications.event_rest_client_kafka.HttpNotificationClient; import fr.recia.notifications.model_kafka.model.*; import lombok.Data; @@ -37,8 +36,8 @@ @Data public class NotificationAspect { private final HttpNotificationClient notificationClient; - private final NotificationAspectConfigPassword notificationAspectConfigPassword; - private final NotificationAspectConfigMail notificationAspectConfigMail; + private final NotificationAspectConfig notificationAspectConfig; + private static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("dd/MM/yyyy 'à' HH:mm", Locale.FRENCH); @@ -50,17 +49,14 @@ private String buildMessage(String template) { @After("execution(* fr.recia.mce.api.escomceapi.ldap.repository.LdapUserDaoImp.updatePassword(..)) && args(uid, newHashedPassword)") public void notifPasswordChange(String uid, String newHashedPassword) { try { - final String id = uid; - final String title = notificationAspectConfigPassword.getTitle(); - final String message = buildMessage(notificationAspectConfigPassword.getMessage()); + final String title = notificationAspectConfig.getTitleMdp(); + final String message = buildMessage(notificationAspectConfig.getMessageMdp()); final List channel = List.of(Channel.WEB); final String idLink = ""; - final Priority priority = Priority.NORMAL; + final Priority priority = Priority.HIGH; final TargetType targetType = TargetType.UID; - - notificationClient.sendNotification(title, message, idLink, id, channel, priority, targetType); - - log.debug("Notification pour changement de mot de passe de {} a été mis à jour", id); + notificationClient.sendNotification(title, message, idLink, uid, channel, priority, targetType); + log.debug("Notification pour changement de mot de passe de {} a été mis à jour", uid); } catch (Exception e) { log.error("Erreur: la notification n'a pas pu être envoyée", e); } @@ -69,19 +65,14 @@ public void notifPasswordChange(String uid, String newHashedPassword) { @After("execution(* fr.recia.mce.api.escomceapi.services.PersonneService.updateEmail(..)) && args(uid, ..)") public void notifEmailChange(String uid) { try { - final String id = uid; - final String title = notificationAspectConfigMail.getTitle(); - final String message = buildMessage(notificationAspectConfigMail.getMessage()); + final String title = notificationAspectConfig.getTitleMail(); + final String message = buildMessage(notificationAspectConfig.getMessageMail()); final List channel = List.of(Channel.WEB); final String idLink = ""; - final Priority priority = Priority.NORMAL; + final Priority priority = Priority.HIGH ; final TargetType targetType = TargetType.UID; - - log.trace("TEST POUR L'ENVOIE DE NOTIFICATION, L'ID EST-IL RÉCUPÉRÉ ? ID : {}", id); - - notificationClient.sendNotification(title, message, idLink, id, channel, priority, targetType); - - log.info("Notification pour changement de mail {} a été envoyé", id); + notificationClient.sendNotification(title, message, idLink, uid, channel, priority, targetType); + log.info("Notification pour changement de mail {} a été envoyé", uid); } catch (Exception e) { log.error("Erreur: la notification n'a pas pu être envoyée", e); } diff --git a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java index 9fdbd7f..f8af189 100644 --- a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java +++ b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfig.java @@ -28,6 +28,10 @@ public class NotificationAspectConfig { private String url; private String serviceName; private String apiKey; + private String titleMdp; + private String messageMdp; + private String titleMail; + private String messageMail; @Bean public HttpNotificationClient notificationClient() { diff --git a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigMail.java b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigMail.java deleted file mode 100644 index c08394f..0000000 --- a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigMail.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2023 GIP-RECIA, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package fr.recia.mce.api.escomceapi.aop.notification.configuration; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Data -@ConfigurationProperties(prefix = "notification-conf-mail") -@Configuration -public class NotificationAspectConfigMail { - String title; - String message; -} diff --git a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigPassword.java b/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigPassword.java deleted file mode 100644 index 16b1e09..0000000 --- a/src/main/java/fr/recia/mce/api/escomceapi/aop/notification/configuration/NotificationAspectConfigPassword.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2023 GIP-RECIA, Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package fr.recia.mce.api.escomceapi.aop.notification.configuration; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Configuration; - -@Data -@ConfigurationProperties(prefix = "notification-conf-password") -@Configuration -public class NotificationAspectConfigPassword { - String title; - String message; -}