diff --git a/.env b/.env index 11ee0bc6560..2d422eeb0db 100644 --- a/.env +++ b/.env @@ -120,8 +120,6 @@ JEMENGAGE_APP_PACKAGE_ID= INVALID_EMAIL_HASH_KEY=super-key RENAISSANCE_SENDER_EMAIL=ne-pas-repondre@parti-renaissance.fr -EU_SENDER_EMAIL=ne-pas-repondre@besoindeurope.fr -LEGISLATIVE_SENDER_EMAIL=ne-pas-repondre@parti-renaissance.fr SSL_KEY_PERMISSIONS_CHECK=true UNLAYER_PROJECT_ID= diff --git a/config/services.yaml b/config/services.yaml index fa56eb19cdc..f0b6bbc51c9 100644 --- a/config/services.yaml +++ b/config/services.yaml @@ -408,12 +408,6 @@ services: App\Mailer\Message\Renaissance\RenaissanceMessageInterface: name: Renaissance email: "%env(RENAISSANCE_SENDER_EMAIL)%" - App\Mailer\Message\BesoinDEurope\BesoinDEuropeMessageInterface: - name: Besoin d'Europe - email: "%env(EU_SENDER_EMAIL)%" - App\Mailer\Message\Ensemble\EnsembleMessageInterface: - name: ENSEMBLE - email: "%env(LEGISLATIVE_SENDER_EMAIL)%" App\Security\SimpleCsrfTokenManager: ~ diff --git a/src/Adhesion/Handler/GenerateActivationCodeCommandHandler.php b/src/Adhesion/Handler/GenerateActivationCodeCommandHandler.php index a8e1ef67be6..2f2e7b568c5 100644 --- a/src/Adhesion/Handler/GenerateActivationCodeCommandHandler.php +++ b/src/Adhesion/Handler/GenerateActivationCodeCommandHandler.php @@ -5,9 +5,7 @@ use App\Adhesion\ActivationCodeManager; use App\Adhesion\Command\GenerateActivationCodeCommand; use App\Mailer\MailerService; -use App\Mailer\Message\Ensemble\EnsembleInscriptionCodeValidationMessage; use App\Mailer\Message\Renaissance\AdhesionCodeValidationMessage; -use App\Membership\MembershipSourceEnum; use Symfony\Component\Messenger\Attribute\AsMessageHandler; use Symfony\Component\Security\Http\LoginLink\LoginLinkHandlerInterface; @@ -28,10 +26,6 @@ public function __invoke(GenerateActivationCodeCommand $command): void $code = $this->activationCodeGenerator->generate($adherent, $command->force)->value; $magicLink = $this->loginLinkHandler->createLoginLink($adherent, null, $adherent->getSource())->getUrl(); - if (MembershipSourceEnum::LEGISLATIVE === $adherent->getSource()) { - $this->transactionalMailer->sendMessage(EnsembleInscriptionCodeValidationMessage::create($adherent, $code, $magicLink)); - } else { - $this->transactionalMailer->sendMessage(AdhesionCodeValidationMessage::create($adherent, $code, $magicLink)); - } + $this->transactionalMailer->sendMessage(AdhesionCodeValidationMessage::create($adherent, $code, $magicLink)); } } diff --git a/src/Command/BesoinDEuropeRemindActivationCommand.php b/src/Command/BesoinDEuropeRemindActivationCommand.php deleted file mode 100644 index c5e15bb452e..00000000000 --- a/src/Command/BesoinDEuropeRemindActivationCommand.php +++ /dev/null @@ -1,66 +0,0 @@ -findToRemind(100)) { - foreach ($adherents as $adherent) { - $this->membershipNotifier->sendActivationReminder($adherent); - - $adherent->setActivationReminded(); - - $this->em->flush(); - } - - $this->em->clear(); - } - - return self::SUCCESS; - } - - /** - * @return Adherent[] - */ - private function findToRemind(int $limit): array - { - return $this->adherentRepository - ->createQueryBuilder('adherent') - ->where('adherent.source = :source_bde') - ->andWhere('adherent.activatedAt IS NULL') - ->andWhere('adherent.activationRemindedAt IS NULL') - ->andWhere('adherent.registeredAt < :current_day') - ->setParameters([ - 'source_bde' => MembershipSourceEnum::BESOIN_D_EUROPE, - 'current_day' => date('Y-m-d'), - ]) - ->setMaxResults($limit) - ->getQuery() - ->getResult() - ; - } -} diff --git a/src/Event/EventListener/EventMessageNotifierListener.php b/src/Event/EventListener/EventMessageNotifierListener.php index b17f15465f7..c66246619ef 100644 --- a/src/Event/EventListener/EventMessageNotifierListener.php +++ b/src/Event/EventListener/EventMessageNotifierListener.php @@ -11,9 +11,9 @@ use App\Event\EventRegistrationEvent; use App\Events; use App\Mailer\MailerService; -use App\Mailer\Message\Ensemble\EnsembleEventCancellationMessage; -use App\Mailer\Message\Ensemble\EnsembleEventRegistrationConfirmationMessage; -use App\Mailer\Message\Ensemble\EnsembleEventUpdateMessage; +use App\Mailer\Message\Renaissance\EventCancellationMessage; +use App\Mailer\Message\Renaissance\EventRegistrationConfirmationMessage; +use App\Mailer\Message\Renaissance\EventUpdateMessage; use App\Mailer\Message\Renaissance\RenaissanceEventNotificationMessage; use App\Repository\EventRegistrationRepository; use Symfony\Component\EventDispatcher\EventSubscriberInterface; @@ -75,7 +75,6 @@ function (Adherent $adherent) { public function onEventCancelled(EventEvent $event): void { - // @var BaseEvent $event $event = $event->getEvent(); if (!$event->isCancelled()) { @@ -88,7 +87,7 @@ public function onEventCancelled(EventEvent $event): void foreach (array_chunk($subscriptions, MailerService::PAYLOAD_MAXSIZE) as $chunk) { $this->transactionalMailer->sendMessage( - EnsembleEventCancellationMessage::create( + EventCancellationMessage::create( $chunk, $event, $this->generateUrl('vox_app').'/evenements', @@ -105,7 +104,7 @@ public function sendRegistrationEmail(EventRegistrationEvent $event): void $registration = $event->getRegistration(); - $this->transactionalMailer->sendMessage(EnsembleEventRegistrationConfirmationMessage::createFromRegistration( + $this->transactionalMailer->sendMessage(EventRegistrationConfirmationMessage::createFromRegistration( $registration, $this->generateUrl('vox_app').'/evenements/'.$registration->getEvent()->getUuidAsString(), )); @@ -135,7 +134,7 @@ public function onEventPostUpdate(EventEvent $event): void } foreach (array_chunk($subscriptions, MailerService::PAYLOAD_MAXSIZE) as $chunk) { - $this->transactionalMailer->sendMessage(EnsembleEventUpdateMessage::create( + $this->transactionalMailer->sendMessage(EventUpdateMessage::create( $chunk, $event, $this->generateUrl('vox_app').'/evenements/'.$event->getUuidAsString(), diff --git a/src/Mailer/Message/AdherentResetPasswordConfirmationMessage.php b/src/Mailer/Message/AdherentResetPasswordConfirmationMessage.php deleted file mode 100644 index 7305489dc62..00000000000 --- a/src/Mailer/Message/AdherentResetPasswordConfirmationMessage.php +++ /dev/null @@ -1,20 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - 'Confirmation réinitialisation du mot de passe', - ['first_name' => self::escape($adherent->getFirstName())] - ); - } -} diff --git a/src/Mailer/Message/AdherentResetPasswordMessage.php b/src/Mailer/Message/AdherentResetPasswordMessage.php deleted file mode 100644 index de9d5273fb6..00000000000 --- a/src/Mailer/Message/AdherentResetPasswordMessage.php +++ /dev/null @@ -1,23 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - 'Réinitialisation de votre mot de passe', - [ - 'first_name' => self::escape($adherent->getFirstName()), - 'reset_link' => $resetPasswordLink, - ] - ); - } -} diff --git a/src/Mailer/Message/AvecVous/AbstractAvecVousMessage.php b/src/Mailer/Message/AvecVous/AbstractAvecVousMessage.php deleted file mode 100644 index e3c0ed65163..00000000000 --- a/src/Mailer/Message/AvecVous/AbstractAvecVousMessage.php +++ /dev/null @@ -1,16 +0,0 @@ -setSenderEmail('ne-pas-repondre@parti-renaissance.fr'); - $message->setSenderName('Emmanuel Macron avec vous'); - - return $message; - } -} diff --git a/src/Mailer/Message/AvecVous/AvecVousUserAccountConfirmationMessage.php b/src/Mailer/Message/AvecVous/AvecVousUserAccountConfirmationMessage.php deleted file mode 100644 index 0c655f4b8a2..00000000000 --- a/src/Mailer/Message/AvecVous/AvecVousUserAccountConfirmationMessage.php +++ /dev/null @@ -1,23 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - '🚀 Activez votre compte Je m’engage', - [ - 'create_password_link' => $createPasswordLink, - ] - )); - } -} diff --git a/src/Mailer/Message/BesoinDEurope/AbstractBesoinDEuropeMessage.php b/src/Mailer/Message/BesoinDEurope/AbstractBesoinDEuropeMessage.php deleted file mode 100644 index fa319612313..00000000000 --- a/src/Mailer/Message/BesoinDEurope/AbstractBesoinDEuropeMessage.php +++ /dev/null @@ -1,9 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - '', - [ - 'first_name' => self::escape($adherent->getFirstName()), - 'magic_link' => $magicLink, - 'forgot_password_link' => $forgotPasswordLink, - ], - ); - } -} diff --git a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeAccountCreatedMessage.php b/src/Mailer/Message/BesoinDEurope/BesoinDEuropeAccountCreatedMessage.php deleted file mode 100644 index 1dd9fe20a0c..00000000000 --- a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeAccountCreatedMessage.php +++ /dev/null @@ -1,22 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - \sprintf('Bienvenue %s !', $firstName = self::escape($adherent->getFirstName())), - [ - 'first_name' => $firstName, - ], - ); - } -} diff --git a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeActivationReminderMessage.php b/src/Mailer/Message/BesoinDEurope/BesoinDEuropeActivationReminderMessage.php deleted file mode 100644 index e16d20484b8..00000000000 --- a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeActivationReminderMessage.php +++ /dev/null @@ -1,23 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - '', - [ - 'first_name' => self::escape($adherent->getFirstName()), - 'login_link' => $loginLink, - ], - ); - } -} diff --git a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeEventCancellationMessage.php b/src/Mailer/Message/BesoinDEurope/BesoinDEuropeEventCancellationMessage.php deleted file mode 100644 index 93f9da75f07..00000000000 --- a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeEventCancellationMessage.php +++ /dev/null @@ -1,54 +0,0 @@ -getEmailAddress(), - $recipient->getFirstName().' '.$recipient->getLastName(), - '', - static::getTemplateVars($event->getName(), $eventsLink), - self::getRecipientVars($recipient) - ); - - foreach ($recipients as $recipient) { - $message->addRecipient( - $recipient->getEmailAddress(), - $recipient->getFirstName().' '.$recipient->getLastName(), - self::getRecipientVars($recipient) - ); - } - - return $message; - } - - private static function getTemplateVars(string $eventName, string $eventsLink): array - { - return [ - 'event_name' => $eventName, - 'events_link' => $eventsLink, - ]; - } - - private static function getRecipientVars(EventRegistration $eventRegistration): array - { - return [ - 'target_firstname' => self::escape($eventRegistration->getFirstName()), - ]; - } -} diff --git a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeEventRegistrationConfirmationMessage.php b/src/Mailer/Message/BesoinDEurope/BesoinDEuropeEventRegistrationConfirmationMessage.php deleted file mode 100644 index 607aad08d30..00000000000 --- a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeEventRegistrationConfirmationMessage.php +++ /dev/null @@ -1,44 +0,0 @@ -getEvent(); - $firstName = $registration->getFirstName(); - - return new self( - Uuid::uuid4(), - $registration->getEmailAddress(), - $firstName, - '', - static::getTemplateVars( - $event->getName(), - $event->getOrganizerName(), - $eventLink - ), - static::getRecipientVars($firstName) - ); - } - - private static function getTemplateVars(string $eventName, string $organizerName, string $eventLink): array - { - return [ - 'event_name' => self::escape($eventName), - 'event_organiser' => self::escape($organizerName), - 'event_link' => $eventLink, - ]; - } - - private static function getRecipientVars(string $firstName): array - { - return [ - 'first_name' => self::escape($firstName), - ]; - } -} diff --git a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeEventUpdateMessage.php b/src/Mailer/Message/BesoinDEurope/BesoinDEuropeEventUpdateMessage.php deleted file mode 100644 index 4bc4f115020..00000000000 --- a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeEventUpdateMessage.php +++ /dev/null @@ -1,60 +0,0 @@ -getEmailAddress(), - $recipient->getFirstName().' '.$recipient->getLastName(), - '', - static::getTemplateVars($event, $eventUrl), - static::getRecipientVars($recipient) - ); - - /* @var EventRegistration[] $recipients */ - foreach ($recipients as $recipient) { - $message->addRecipient( - $recipient->getEmailAddress(), - $recipient->getFirstName().' '.$recipient->getLastName(), - static::getRecipientVars($recipient) - ); - } - - return $message; - } - - private static function getTemplateVars(BaseEvent $event, string $eventUrl): array - { - return [ - 'event_name' => self::escape($event->getName()), - 'event_url' => $eventUrl, - 'event_date' => static::formatDate($event->getLocalBeginAt(), 'EEEE d MMMM y'), - 'event_hour' => \sprintf( - '%sh%s', - static::formatDate($event->getLocalBeginAt(), 'HH'), - static::formatDate($event->getLocalBeginAt(), 'mm') - ), - 'event_address' => $event->getInlineFormattedAddress(), - ]; - } - - private static function getRecipientVars(EventRegistration $recipient): array - { - return ['first_name' => self::escape($recipient->getFirstName())]; - } -} diff --git a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeInscriptionCodeValidationMessage.php b/src/Mailer/Message/BesoinDEurope/BesoinDEuropeInscriptionCodeValidationMessage.php deleted file mode 100644 index d95409a4a44..00000000000 --- a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeInscriptionCodeValidationMessage.php +++ /dev/null @@ -1,24 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - '', - [ - 'first_name' => self::escape($adherent->getFirstName()), - 'code' => $code, - 'magic_link' => $magicLink, - ], - ); - } -} diff --git a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeMagicLinkMessage.php b/src/Mailer/Message/BesoinDEurope/BesoinDEuropeMagicLinkMessage.php deleted file mode 100644 index f61814d451c..00000000000 --- a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeMagicLinkMessage.php +++ /dev/null @@ -1,21 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - '', - [], - ['magic_link' => $url], - ); - } -} diff --git a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeMessageInterface.php b/src/Mailer/Message/BesoinDEurope/BesoinDEuropeMessageInterface.php deleted file mode 100644 index 6d6f9c90617..00000000000 --- a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeMessageInterface.php +++ /dev/null @@ -1,7 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - '', - ['first_name' => self::escape($adherent->getFirstName())] - ); - } -} diff --git a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeResetPasswordMessage.php b/src/Mailer/Message/BesoinDEurope/BesoinDEuropeResetPasswordMessage.php deleted file mode 100644 index fd9347c41e5..00000000000 --- a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeResetPasswordMessage.php +++ /dev/null @@ -1,23 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - '', - [ - 'first_name' => self::escape($adherent->getFirstName()), - 'reset_link' => $resetPasswordLink, - ] - ); - } -} diff --git a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeTerminateMembershipMessage.php b/src/Mailer/Message/BesoinDEurope/BesoinDEuropeTerminateMembershipMessage.php deleted file mode 100644 index 8f5a6572024..00000000000 --- a/src/Mailer/Message/BesoinDEurope/BesoinDEuropeTerminateMembershipMessage.php +++ /dev/null @@ -1,22 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - '', - [ - 'first_name' => self::escape($adherent->getFirstName()), - ], - ); - } -} diff --git a/src/Mailer/Message/BesoinDEurope/EuNewsletterSubscriptionConfirmationMessage.php b/src/Mailer/Message/BesoinDEurope/EuNewsletterSubscriptionConfirmationMessage.php deleted file mode 100644 index bd75913f4e4..00000000000 --- a/src/Mailer/Message/BesoinDEurope/EuNewsletterSubscriptionConfirmationMessage.php +++ /dev/null @@ -1,19 +0,0 @@ - $confirmationLink] - ); - } -} diff --git a/src/Mailer/Message/CertificationRequestApprovedMessage.php b/src/Mailer/Message/CertificationRequestApprovedMessage.php deleted file mode 100644 index a38447509f2..00000000000 --- a/src/Mailer/Message/CertificationRequestApprovedMessage.php +++ /dev/null @@ -1,22 +0,0 @@ -getAdherent(); - - return new self( - Uuid::uuid4(), - $adherent->getEmailAddress(), - $adherent->getFullName(), - 'Vous êtes certifié(e)', - ['first_name' => $adherent->getFirstName()] - ); - } -} diff --git a/src/Mailer/Message/CertificationRequestBlockedMessage.php b/src/Mailer/Message/CertificationRequestBlockedMessage.php deleted file mode 100644 index fd94a423652..00000000000 --- a/src/Mailer/Message/CertificationRequestBlockedMessage.php +++ /dev/null @@ -1,22 +0,0 @@ -getAdherent(); - - return new self( - Uuid::uuid4(), - $adherent->getEmailAddress(), - $adherent->getFullName(), - 'Votre profil ne peut pas être certifié', - ['first_name' => $adherent->getFirstName()] - ); - } -} diff --git a/src/Mailer/Message/CertificationRequestPendingMessage.php b/src/Mailer/Message/CertificationRequestPendingMessage.php deleted file mode 100644 index 6dd1e606ccf..00000000000 --- a/src/Mailer/Message/CertificationRequestPendingMessage.php +++ /dev/null @@ -1,22 +0,0 @@ -getAdherent(); - - return new self( - Uuid::uuid4(), - $adherent->getEmailAddress(), - $adherent->getFullName(), - 'Votre demande a bien été reçue', - ['first_name' => $adherent->getFirstName()] - ); - } -} diff --git a/src/Mailer/Message/CertificationRequestRefusedMessage.php b/src/Mailer/Message/CertificationRequestRefusedMessage.php deleted file mode 100644 index 23f74c95fea..00000000000 --- a/src/Mailer/Message/CertificationRequestRefusedMessage.php +++ /dev/null @@ -1,29 +0,0 @@ -getAdherent(); - - return new self( - Uuid::uuid4(), - $adherent->getEmailAddress(), - $adherent->getFullName(), - 'Votre demande n\'a pas abouti', - [ - 'first_name' => $adherent->getFirstName(), - 'refusal_reason' => $refusalReason, - 'certification_request_url' => $certificationRequestUrl, - ] - ); - } -} diff --git a/src/Mailer/Message/CommitteeMessageNotificationMessage.php b/src/Mailer/Message/CommitteeMessageNotificationMessage.php deleted file mode 100644 index e7e1d4620a0..00000000000 --- a/src/Mailer/Message/CommitteeMessageNotificationMessage.php +++ /dev/null @@ -1,64 +0,0 @@ -getEmailAddress(), - $recipient->getFullName(), - "[Comité local] $subject", - static::getTemplateVars($feedItem->getAuthorFirstName(), $feedItem->getContent()), - static::getRecipientVars($recipient->getFirstName()), - $feedItem->getAuthor()->getEmailAddress() - ); - - $message->setSenderName($feedItem->getAuthor()->getFullName()); - - foreach ($recipients as $recipient) { - $message->addRecipient( - $recipient->getEmailAddress(), - $recipient->getFullName(), - static::getRecipientVars($recipient->getFirstName()) - ); - } - - return $message; - } - - private static function getTemplateVars(string $hostFirstName, string $hostMessage): array - { - return [ - 'animator_firstname' => self::escape($hostFirstName), - 'target_message' => $hostMessage, - ]; - } - - private static function getRecipientVars(string $firstName): array - { - return [ - 'target_firstname' => self::escape($firstName), - ]; - } -} diff --git a/src/Mailer/Message/Ensemble/AbstractEnsembleMessage.php b/src/Mailer/Message/Ensemble/AbstractEnsembleMessage.php deleted file mode 100644 index e7a97109b7c..00000000000 --- a/src/Mailer/Message/Ensemble/AbstractEnsembleMessage.php +++ /dev/null @@ -1,9 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - 'Vous possédez déjà un compte', - [ - 'first_name' => self::escape($adherent->getFirstName()), - 'magic_link' => $magicLink, - 'forgot_password_link' => $forgotPasswordLink, - ], - ); - } -} diff --git a/src/Mailer/Message/Ensemble/EnsembleAccountCreatedMessage.php b/src/Mailer/Message/Ensemble/EnsembleAccountCreatedMessage.php deleted file mode 100644 index 4132d25c12e..00000000000 --- a/src/Mailer/Message/Ensemble/EnsembleAccountCreatedMessage.php +++ /dev/null @@ -1,22 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - \sprintf('Bienvenue %s !', $firstName = self::escape($adherent->getFirstName())), - [ - 'first_name' => $firstName, - ], - ); - } -} diff --git a/src/Mailer/Message/Ensemble/EnsembleEventRegistrationConfirmationMessage.php b/src/Mailer/Message/Ensemble/EnsembleEventRegistrationConfirmationMessage.php deleted file mode 100644 index 1e62b4579d8..00000000000 --- a/src/Mailer/Message/Ensemble/EnsembleEventRegistrationConfirmationMessage.php +++ /dev/null @@ -1,44 +0,0 @@ -getEvent(); - $firstName = $registration->getFirstName(); - - return new self( - Uuid::uuid4(), - $registration->getEmailAddress(), - $firstName, - 'Inscription confirmée', - static::getTemplateVars( - $event->getName(), - $event->getOrganizerName(), - $eventLink - ), - static::getRecipientVars($firstName) - ); - } - - private static function getTemplateVars(string $eventName, string $organizerName, string $eventLink): array - { - return [ - 'event_name' => self::escape($eventName), - 'event_organiser' => self::escape($organizerName), - 'event_link' => $eventLink, - ]; - } - - private static function getRecipientVars(string $firstName): array - { - return [ - 'first_name' => self::escape($firstName), - ]; - } -} diff --git a/src/Mailer/Message/Ensemble/EnsembleInscriptionCodeValidationMessage.php b/src/Mailer/Message/Ensemble/EnsembleInscriptionCodeValidationMessage.php deleted file mode 100644 index f6c7c230c82..00000000000 --- a/src/Mailer/Message/Ensemble/EnsembleInscriptionCodeValidationMessage.php +++ /dev/null @@ -1,24 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - 'Confirmez votre adresse email', - [ - 'first_name' => self::escape($adherent->getFirstName()), - 'code' => $code, - 'magic_link' => $magicLink, - ], - ); - } -} diff --git a/src/Mailer/Message/Ensemble/EnsembleMessageInterface.php b/src/Mailer/Message/Ensemble/EnsembleMessageInterface.php deleted file mode 100644 index 49d30c845c3..00000000000 --- a/src/Mailer/Message/Ensemble/EnsembleMessageInterface.php +++ /dev/null @@ -1,7 +0,0 @@ - $confirmationLink] - ); - } -} diff --git a/src/Mailer/Message/Ensemble/EnsembleResetPasswordConfirmationMessage.php b/src/Mailer/Message/Ensemble/EnsembleResetPasswordConfirmationMessage.php deleted file mode 100644 index 453d11d1a84..00000000000 --- a/src/Mailer/Message/Ensemble/EnsembleResetPasswordConfirmationMessage.php +++ /dev/null @@ -1,20 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - 'Mot de passe modifié', - ['first_name' => self::escape($adherent->getFirstName())] - ); - } -} diff --git a/src/Mailer/Message/Ensemble/EnsembleResetPasswordMessage.php b/src/Mailer/Message/Ensemble/EnsembleResetPasswordMessage.php deleted file mode 100644 index 0dce4d0bfb4..00000000000 --- a/src/Mailer/Message/Ensemble/EnsembleResetPasswordMessage.php +++ /dev/null @@ -1,23 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - 'Réinitialiser mon mot de passe', - [ - 'first_name' => self::escape($adherent->getFirstName()), - 'reset_link' => $resetPasswordLink, - ] - ); - } -} diff --git a/src/Mailer/Message/EventCancellationMessage.php b/src/Mailer/Message/EventCancellationMessage.php deleted file mode 100644 index de6c6801476..00000000000 --- a/src/Mailer/Message/EventCancellationMessage.php +++ /dev/null @@ -1,63 +0,0 @@ -getEmailAddress(), - $recipient->getFirstName().' '.$recipient->getLastName(), - \sprintf('L\'événement "%s" a été annulé.', $event->getName()), - static::getTemplateVars($event->getName(), $eventsLink), - self::getRecipientVars($recipient), - $host->getEmailAddress() - ); - - foreach ($recipients as $recipient) { - $message->addRecipient( - $recipient->getEmailAddress(), - $recipient->getFirstName().' '.$recipient->getLastName(), - self::getRecipientVars($recipient) - ); - } - - return $message; - } - - private static function getTemplateVars(string $eventName, string $eventsLink): array - { - return [ - 'event_name' => $eventName, - 'event_slug' => $eventsLink, - ]; - } - - private static function getRecipientVars(EventRegistration $eventRegistration): array - { - return [ - 'target_firstname' => self::escape($eventRegistration->getFirstName()), - ]; - } -} diff --git a/src/Mailer/Message/EventUpdateMessage.php b/src/Mailer/Message/EventUpdateMessage.php deleted file mode 100644 index 3c627c40297..00000000000 --- a/src/Mailer/Message/EventUpdateMessage.php +++ /dev/null @@ -1,70 +0,0 @@ -getEmailAddress(), - $recipient->getFirstName().' '.$recipient->getLastName(), - 'Un événement auquel vous participez a été mis à jour', - static::getTemplateVars($event, $eventUrl, $icalEventUrl), - static::getRecipientVars($recipient), - $host->getEmailAddress() - ); - - /* @var EventRegistration[] $recipients */ - foreach ($recipients as $recipient) { - $message->addRecipient( - $recipient->getEmailAddress(), - $recipient->getFirstName().' '.$recipient->getLastName(), - static::getRecipientVars($recipient) - ); - } - - return $message; - } - - private static function getTemplateVars(BaseEvent $event, string $eventUrl, string $icalEventUrl): array - { - return [ - 'event_name' => self::escape($event->getName()), - 'event_url' => $eventUrl, - 'event_date' => static::formatDate($event->getLocalBeginAt(), 'EEEE d MMMM y'), - 'event_hour' => \sprintf( - '%sh%s', - static::formatDate($event->getLocalBeginAt(), 'HH'), - static::formatDate($event->getLocalBeginAt(), 'mm') - ), - 'event_address' => $event->getInlineFormattedAddress(), - 'calendar_url' => $icalEventUrl, - ]; - } - - private static function getRecipientVars(EventRegistration $recipient): array - { - return ['first_name' => self::escape($recipient->getFirstName())]; - } -} diff --git a/src/Mailer/Message/JeMengage/AbstractJeMengageMessage.php b/src/Mailer/Message/JeMengage/AbstractJeMengageMessage.php deleted file mode 100644 index c699d041790..00000000000 --- a/src/Mailer/Message/JeMengage/AbstractJeMengageMessage.php +++ /dev/null @@ -1,16 +0,0 @@ -setSenderEmail('ne-pas-repondre@parti-renaissance.fr'); - $message->setSenderName('Je m\'engage'); - - return $message; - } -} diff --git a/src/Mailer/Message/JeMengage/JeMengageEventRegistrationConfirmationMessage.php b/src/Mailer/Message/JeMengage/JeMengageEventRegistrationConfirmationMessage.php deleted file mode 100644 index 398fce0538a..00000000000 --- a/src/Mailer/Message/JeMengage/JeMengageEventRegistrationConfirmationMessage.php +++ /dev/null @@ -1,45 +0,0 @@ -getEvent(); - $firstName = $registration->getFirstName(); - - return self::updateSenderInfo(new self( - Uuid::uuid4(), - $registration->getEmailAddress(), - $firstName, - 'Confirmation de participation à un événement', - static::getTemplateVars( - $event->getName(), - $event->getOrganizerName(), - $eventLink - ), - static::getRecipientVars($firstName) - )); - } - - private static function getTemplateVars(string $eventName, string $organizerName, string $eventLink): array - { - return [ - 'event_name' => self::escape($eventName), - 'event_organiser' => self::escape($organizerName), - 'event_link' => $eventLink, - ]; - } - - private static function getRecipientVars(string $firstName): array - { - return [ - 'first_name' => self::escape($firstName), - ]; - } -} diff --git a/src/Mailer/Message/JeMengage/JeMengageResetPasswordMessage.php b/src/Mailer/Message/JeMengage/JeMengageResetPasswordMessage.php deleted file mode 100644 index a53e3b8fff4..00000000000 --- a/src/Mailer/Message/JeMengage/JeMengageResetPasswordMessage.php +++ /dev/null @@ -1,24 +0,0 @@ -getEmailAddress(), - $user->getFullName(), - 'Réinitialisation de votre mot de passe', - [ - 'first_name' => self::escape($user->getFirstName()), - 'create_password_link' => $createPasswordLink, - ] - )); - } -} diff --git a/src/Mailer/Message/JeMengage/JeMengageUserAccountConfirmationMessage.php b/src/Mailer/Message/JeMengage/JeMengageUserAccountConfirmationMessage.php deleted file mode 100644 index b625ba01e7d..00000000000 --- a/src/Mailer/Message/JeMengage/JeMengageUserAccountConfirmationMessage.php +++ /dev/null @@ -1,24 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - 'Confirmez votre adresse email', - [ - 'first_name' => self::escape($adherent->getFirstName()), - 'create_password_link' => $createPasswordLink, - ] - )); - } -} diff --git a/src/Mailer/Message/PostVoteStatusesMessage.php b/src/Mailer/Message/PostVoteStatusesMessage.php deleted file mode 100644 index 0d84bb3db4d..00000000000 --- a/src/Mailer/Message/PostVoteStatusesMessage.php +++ /dev/null @@ -1,51 +0,0 @@ -getEmailAddress(), - $adherent->getFullName(), - 'Vous avez voté pour Renaissance !', - [ - 'now' => self::formatDate(new \DateTime(), 'EEEE d MMMM y'), - 'convocation_url' => $convocationUrl, - ], - [ - 'first_name' => $adherent->getFirstName(), - 'last_name' => $adherent->getLastName(), - ] - ); - - foreach ($adherents as $adherent) { - $message->addRecipient( - $adherent->getEmailAddress(), - $adherent->getFullName(), - [ - 'first_name' => $adherent->getFirstName(), - 'last_name' => $adherent->getLastName(), - ] - ); - } - - return self::updateSenderInfo($message); - } - - protected static function updateSenderInfo(Message $message): Message - { - $message->setSenderEmail('contact@parti-renaissance.fr'); - $message->setSenderName('Renaissance'); - - return $message; - } -} diff --git a/src/Mailer/Message/Ensemble/EnsembleEventCancellationMessage.php b/src/Mailer/Message/Renaissance/EventCancellationMessage.php similarity index 92% rename from src/Mailer/Message/Ensemble/EnsembleEventCancellationMessage.php rename to src/Mailer/Message/Renaissance/EventCancellationMessage.php index 64945655982..68e44b332b0 100644 --- a/src/Mailer/Message/Ensemble/EnsembleEventCancellationMessage.php +++ b/src/Mailer/Message/Renaissance/EventCancellationMessage.php @@ -1,12 +1,12 @@ getEmailAddress(), $firstName, - 'Confirmation de participation à un événement En Marche !', + 'Inscription confirmée', static::getTemplateVars( $event->getName(), $event->getOrganizerName(), @@ -38,7 +38,7 @@ private static function getTemplateVars(string $eventName, string $organizerName private static function getRecipientVars(string $firstName): array { return [ - 'prenom' => self::escape($firstName), + 'first_name' => self::escape($firstName), ]; } } diff --git a/src/Mailer/Message/Ensemble/EnsembleEventUpdateMessage.php b/src/Mailer/Message/Renaissance/EventUpdateMessage.php similarity index 94% rename from src/Mailer/Message/Ensemble/EnsembleEventUpdateMessage.php rename to src/Mailer/Message/Renaissance/EventUpdateMessage.php index 11e89b8edbc..08cf1fb9141 100644 --- a/src/Mailer/Message/Ensemble/EnsembleEventUpdateMessage.php +++ b/src/Mailer/Message/Renaissance/EventUpdateMessage.php @@ -1,12 +1,12 @@ getEmailAddress(), - $recipient->getFirstName().' '.$recipient->getLastName(), - 'Un événement auquel vous participez a été mis à jour', - static::getTemplateVars($event, $eventUrl, $icalEventUrl), - static::getRecipientVars($recipient), - $host->getEmailAddress() - ); - - /* @var EventRegistration[] $recipients */ - foreach ($recipients as $recipient) { - $message->addRecipient( - $recipient->getEmailAddress(), - $recipient->getFirstName().' '.$recipient->getLastName(), - static::getRecipientVars($recipient) - ); - } - - return $message; - } - - private static function getTemplateVars(BaseEvent $event, string $eventUrl, string $icalEventUrl): array - { - return [ - 'event_name' => self::escape($event->getName()), - 'event_url' => $eventUrl, - 'event_date' => static::formatDate($event->getLocalBeginAt(), 'EEEE d MMMM y'), - 'event_hour' => \sprintf( - '%sh%s', - static::formatDate($event->getLocalBeginAt(), 'HH'), - static::formatDate($event->getLocalBeginAt(), 'mm') - ), - 'event_address' => $event->getInlineFormattedAddress(), - 'calendar_url' => $icalEventUrl, - ]; - } - - private static function getRecipientVars(EventRegistration $recipient): array - { - return ['first_name' => self::escape($recipient->getFirstName())]; - } -} diff --git a/src/Membership/AdherentResetPasswordHandler.php b/src/Membership/AdherentResetPasswordHandler.php index 9a9c76edfb6..bfb1f3688e3 100644 --- a/src/Membership/AdherentResetPasswordHandler.php +++ b/src/Membership/AdherentResetPasswordHandler.php @@ -2,13 +2,10 @@ namespace App\Membership; -use App\AppCodeEnum; use App\Entity\Adherent; use App\Entity\AdherentActivationToken; use App\Entity\AdherentResetPasswordToken; use App\Mailer\MailerService; -use App\Mailer\Message\AdherentResetPasswordConfirmationMessage; -use App\Mailer\Message\Ensemble\EnsembleResetPasswordConfirmationMessage; use App\Mailer\Message\Renaissance\RenaissanceResetPasswordConfirmationMessage; use App\Membership\Event\UserEvent; use App\Membership\Event\UserResetPasswordEvent; @@ -71,12 +68,8 @@ public function reset( $this->manager->flush(); - if (AppCodeEnum::isMobileApp($appCode)) { - $this->mailer->sendMessage(EnsembleResetPasswordConfirmationMessage::createFromAdherent($adherent)); - } elseif (MembershipSourceEnum::RENAISSANCE === $appCode && !$isCreation) { + if (!$isCreation) { $this->mailer->sendMessage(RenaissanceResetPasswordConfirmationMessage::createFromAdherent($adherent)); - } elseif (null === $adherent->getSource()) { - $this->mailer->sendMessage(AdherentResetPasswordConfirmationMessage::createFromAdherent($adherent)); } else { if ($hasBeenActivated) { $this->dispatcher->dispatch(new UserEvent($adherent), UserEvents::USER_VALIDATED); diff --git a/src/Membership/EventListener/SendEmailValidationSubscriber.php b/src/Membership/EventListener/SendEmailValidationSubscriber.php deleted file mode 100644 index 974fb715602..00000000000 --- a/src/Membership/EventListener/SendEmailValidationSubscriber.php +++ /dev/null @@ -1,77 +0,0 @@ -entityManager = $entityManager; - $this->mailer = $transactionalMailer; - $this->notifier = $notifier; - $this->appUrlManager = $appUrlManager; - } - - public function sendConfirmationEmail(UserEvent $event): void - { - $adherent = $event->getUser(); - - if ($adherent->isRenaissanceUser()) { - return; - } - - $message = $token = null; - - switch ($adherent->getSource()) { - case MembershipSourceEnum::AVECVOUS: - $token = AdherentResetPasswordToken::generate($adherent); - $message = AvecVousUserAccountConfirmationMessage::createFromAdherent( - $adherent, - $this->appUrlManager->getUrlGenerator(MembershipSourceEnum::JEMENGAGE)->generateCreatePasswordLink($adherent, $token, ['is_creation' => true]) - ); - break; - case MembershipSourceEnum::JEMENGAGE: - $token = AdherentResetPasswordToken::generate($adherent); - $message = JeMengageUserAccountConfirmationMessage::createFromAdherent( - $adherent, - $this->appUrlManager->getUrlGenerator($adherent->getSource())->generateCreatePasswordLink($adherent, $token, ['is_creation' => true]) - ); - break; - } - - if ($message && $token) { - $this->entityManager->persist($token); - $this->entityManager->flush(); - - $this->mailer->sendMessage($message); - } - } - - public static function getSubscribedEvents(): array - { - return [ - UserEvents::USER_CREATED => 'sendConfirmationEmail', - ]; - } -} diff --git a/src/Membership/EventListener/UserResetPasswordSubscriber.php b/src/Membership/EventListener/UserResetPasswordSubscriber.php index 975501683d6..91fc1e53bba 100644 --- a/src/Membership/EventListener/UserResetPasswordSubscriber.php +++ b/src/Membership/EventListener/UserResetPasswordSubscriber.php @@ -3,26 +3,18 @@ namespace App\Membership\EventListener; use App\Mailer\MailerService; -use App\Mailer\Message\AdherentResetPasswordMessage; -use App\Mailer\Message\BesoinDEurope\BesoinDEuropeResetPasswordMessage; -use App\Mailer\Message\Ensemble\EnsembleResetPasswordMessage; -use App\Mailer\Message\JeMengage\JeMengageResetPasswordMessage; use App\Mailer\Message\Renaissance\RenaissanceResetPasswordMessage; use App\Membership\Event\UserResetPasswordEvent; -use App\Membership\MembershipSourceEnum; use App\Membership\UserEvents; use App\OAuth\App\AuthAppUrlManager; use Symfony\Component\EventDispatcher\EventSubscriberInterface; class UserResetPasswordSubscriber implements EventSubscriberInterface { - private MailerService $mailer; - private AuthAppUrlManager $appUrlManager; - - public function __construct(MailerService $transactionalMailer, AuthAppUrlManager $appUrlManager) - { - $this->mailer = $transactionalMailer; - $this->appUrlManager = $appUrlManager; + public function __construct( + private readonly MailerService $transactionalMailer, + private readonly AuthAppUrlManager $appUrlManager, + ) { } public function publishUserResetPassword(UserResetPasswordEvent $event): void @@ -31,16 +23,7 @@ public function publishUserResetPassword(UserResetPasswordEvent $event): void $resetPasswordToken = $event->getResetPasswordToken(); $resetPasswordUrl = $this->appUrlManager->getUrlGenerator($source = $event->getSource())->generateCreatePasswordLink($user, $resetPasswordToken); - $message = match ($source) { - MembershipSourceEnum::JEMENGAGE => JeMengageResetPasswordMessage::createFromAdherent($user, $resetPasswordUrl), - MembershipSourceEnum::RENAISSANCE => RenaissanceResetPasswordMessage::createFromAdherent($user, $resetPasswordUrl), - MembershipSourceEnum::BESOIN_D_EUROPE => BesoinDEuropeResetPasswordMessage::createFromAdherent($user, $resetPasswordUrl), - MembershipSourceEnum::PLATFORM => AdherentResetPasswordMessage::createFromAdherent($user, $resetPasswordUrl), - MembershipSourceEnum::LEGISLATIVE => EnsembleResetPasswordMessage::createFromAdherent($user, $resetPasswordUrl), - default => throw new \InvalidArgumentException(\sprintf('Invalid adherent source "%s"', $source)), - }; - - $this->mailer->sendMessage($message); + $this->transactionalMailer->sendMessage(RenaissanceResetPasswordMessage::createFromAdherent($user, $resetPasswordUrl)); } public static function getSubscribedEvents(): array diff --git a/src/Membership/MembershipNotifier.php b/src/Membership/MembershipNotifier.php index 71bdb0675d0..751c0059bd9 100644 --- a/src/Membership/MembershipNotifier.php +++ b/src/Membership/MembershipNotifier.php @@ -2,7 +2,6 @@ namespace App\Membership; -use App\AppCodeEnum; use App\Entity\Adherent; use App\Entity\AdherentResetPasswordToken; use App\Mailer\MailerService; @@ -39,32 +38,14 @@ public function sendEmailReminder(Adherent $adherent): bool return $this->transactionalMailer->sendMessage(Message\AdherentMembershipReminderMessage::create($adherent, $donationUrl)); } - public function sendActivationReminder(Adherent $adherent): void - { - if (MembershipSourceEnum::BESOIN_D_EUROPE === $adherent->getSource()) { - $this->transactionalMailer->sendMessage(Message\BesoinDEurope\BesoinDEuropeActivationReminderMessage::create( - $adherent, - $this->linkHandler->createLoginLink($adherent, null, AppCodeEnum::BESOIN_D_EUROPE)->getUrl() - )); - } - } - public function sendConfirmationJoinMessage(Adherent $adherent): void { - if (MembershipSourceEnum::RENAISSANCE === $adherent->getSource()) { - $this->transactionalMailer->sendMessage(Message\Renaissance\RenaissanceAdherentAccountConfirmationMessage::createFromAdherent( - $adherent, - $this->callbackManager->generateUrl('app_renaissance_adherent_profile', [], UrlGeneratorInterface::ABSOLUTE_URL), - $this->callbackManager->generateUrl('app_donation_index', [], UrlGeneratorInterface::ABSOLUTE_URL), - $this->callbackManager->generateUrl('app_my_committee_show_current', [], UrlGeneratorInterface::ABSOLUTE_URL), - )); - - return; - } - - if (MembershipSourceEnum::LEGISLATIVE === $adherent->getSource()) { - $this->transactionalMailer->sendMessage(Message\Ensemble\EnsembleAccountCreatedMessage::create($adherent)); - } + $this->transactionalMailer->sendMessage(Message\Renaissance\RenaissanceAdherentAccountConfirmationMessage::createFromAdherent( + $adherent, + $this->callbackManager->generateUrl('app_renaissance_adherent_profile', [], UrlGeneratorInterface::ABSOLUTE_URL), + $this->callbackManager->generateUrl('app_donation_index', [], UrlGeneratorInterface::ABSOLUTE_URL), + $this->callbackManager->generateUrl('app_my_committee_show_current', [], UrlGeneratorInterface::ABSOLUTE_URL), + )); } public function sendReAdhesionConfirmationMessage(Adherent $adherent): void @@ -79,15 +60,7 @@ public function sendReAdhesionConfirmationMessage(Adherent $adherent): void public function sendUnregistrationMessage(Adherent $adherent): void { - if (MembershipSourceEnum::BESOIN_D_EUROPE === $adherent->getSource()) { - $this->transactionalMailer->sendMessage(Message\BesoinDEurope\BesoinDEuropeTerminateMembershipMessage::create($adherent)); - - return; - } - - if (MembershipSourceEnum::RENAISSANCE === $adherent->getSource()) { - $this->transactionalMailer->sendMessage(Message\Renaissance\RenaissanceAdherentTerminateMembershipMessage::createFromAdherent($adherent)); - } + $this->transactionalMailer->sendMessage(Message\Renaissance\RenaissanceAdherentTerminateMembershipMessage::createFromAdherent($adherent)); } public function sendAccountCreatedEmail(Adherent $adherent): void @@ -108,17 +81,6 @@ public function sendConnexionDetailsMessage(Adherent $adherent, ?string $appCode { $url = $this->linkHandler->createLoginLink($adherent, null, $appCode); - if (AppCodeEnum::isMobileApp($appCode)) { - $urlGenerator = $this->appUrlManager->getUrlGenerator($appCode); - $this->transactionalMailer->sendMessage(Message\Ensemble\EnsembleAccountAlreadyExistsMessage::create( - $adherent, - $url, - $this->urlGenerator->generate('app_forgot_password', ['app_domain' => $urlGenerator->getAppHost()], UrlGeneratorInterface::ABSOLUTE_URL), - )); - - return; - } - if ($adherent->isRenaissanceAdherent()) { $this->transactionalMailer->sendMessage(AdhesionAlreadyAdherentMessage::create( $adherent, diff --git a/src/NationalEvent/Handler/SendTicketCommandHandler.php b/src/NationalEvent/Handler/SendTicketCommandHandler.php index e28e5f7bbee..597a204ab5d 100644 --- a/src/NationalEvent/Handler/SendTicketCommandHandler.php +++ b/src/NationalEvent/Handler/SendTicketCommandHandler.php @@ -4,7 +4,7 @@ use App\Entity\NationalEvent\EventInscription; use App\Mailer\MailerService; -use App\Mailer\Message\BesoinDEurope\NationalEventTicketMessage; +use App\Mailer\Message\Renaissance\NationalEventTicketMessage; use App\NationalEvent\Command\SendTicketCommand; use App\Repository\NationalEvent\EventInscriptionRepository; use Doctrine\ORM\EntityManagerInterface; diff --git a/src/NationalEvent/Listener/SendInscriptionConfirmationListener.php b/src/NationalEvent/Listener/SendInscriptionConfirmationListener.php index c387d243caf..680f86174c4 100644 --- a/src/NationalEvent/Listener/SendInscriptionConfirmationListener.php +++ b/src/NationalEvent/Listener/SendInscriptionConfirmationListener.php @@ -3,7 +3,7 @@ namespace App\NationalEvent\Listener; use App\Mailer\MailerService; -use App\Mailer\Message\BesoinDEurope\NationalEventInscriptionConfirmationMessage; +use App\Mailer\Message\Renaissance\NationalEventInscriptionConfirmationMessage; use App\NationalEvent\NewNationalEventInscriptionEvent; use Symfony\Component\EventDispatcher\EventSubscriberInterface; diff --git a/src/Renaissance/Newsletter/Handler/SendWelcomeMailCommandHandler.php b/src/Renaissance/Newsletter/Handler/SendWelcomeMailCommandHandler.php index d2c10699a22..930937aba6f 100644 --- a/src/Renaissance/Newsletter/Handler/SendWelcomeMailCommandHandler.php +++ b/src/Renaissance/Newsletter/Handler/SendWelcomeMailCommandHandler.php @@ -4,10 +4,8 @@ use App\Entity\Renaissance\NewsletterSubscription; use App\Mailer\MailerService; -use App\Mailer\Message\Ensemble\EnsembleNewsletterSubscriptionConfirmationMessage; use App\Mailer\Message\Message; use App\Mailer\Message\Renaissance\RenaissanceNewsletterSubscriptionConfirmationMessage; -use App\Newsletter\NewsletterTypeEnum; use App\Renaissance\Newsletter\Command\SendWelcomeMailCommand; use Symfony\Component\Messenger\Handler\MessageHandlerInterface; use Symfony\Component\Routing\Generator\UrlGeneratorInterface; @@ -17,7 +15,6 @@ class SendWelcomeMailCommandHandler implements MessageHandlerInterface public function __construct( private readonly MailerService $transactionalMailer, private readonly UrlGeneratorInterface $urlGenerator, - private readonly string $userVoxHost, ) { } @@ -32,22 +29,6 @@ public function __invoke(SendWelcomeMailCommand $command): void private function createMessage(NewsletterSubscription $subscription): Message { - if (\in_array($subscription->source, [ - NewsletterTypeEnum::SITE_EU, - NewsletterTypeEnum::FROM_EVENT, - NewsletterTypeEnum::SITE_ENSEMBLE, - NewsletterTypeEnum::SITE_PROCURATION, - ], true)) { - return EnsembleNewsletterSubscriptionConfirmationMessage::create( - $subscription->email, - $this->urlGenerator->generate('app_renaissance_newsletter_confirm', [ - 'uuid' => $subscription->getUuid()->toString(), - 'confirm_token' => $subscription->token->toString(), - 'app_domain' => $this->userVoxHost, - ], UrlGeneratorInterface::ABSOLUTE_URL) - ); - } - return RenaissanceNewsletterSubscriptionConfirmationMessage::create( $subscription->email, $this->urlGenerator->generate('app_renaissance_newsletter_confirm', [ diff --git a/tests/Controller/Api/Event/EventControllerTest.php b/tests/Controller/Api/Event/EventControllerTest.php index 5bead50095e..81c1a131781 100644 --- a/tests/Controller/Api/Event/EventControllerTest.php +++ b/tests/Controller/Api/Event/EventControllerTest.php @@ -7,7 +7,7 @@ use App\DataFixtures\ORM\LoadClientData; use App\Entity\Event\BaseEvent; use App\Event\EventTypeEnum; -use App\Mailer\Message\Ensemble\EnsembleEventUpdateMessage; +use App\Mailer\Message\Renaissance\EventUpdateMessage; use App\OAuth\Model\GrantTypeEnum; use App\OAuth\Model\Scope; use PHPUnit\Framework\Attributes\Group; @@ -76,7 +76,7 @@ public function testAReferentCanCreateAnEventInJme(): void self::assertSame('My best edited event !', $response['name']); self::assertSame('online', $response['mode']); - $this->assertCountMails(1, EnsembleEventUpdateMessage::class); - $this->assertMail(EnsembleEventUpdateMessage::class, 'president-ad@renaissance-dev.fr', ['template_name' => 'ensemble-event-update']); + $this->assertCountMails(1, EventUpdateMessage::class); + $this->assertMail(EventUpdateMessage::class, 'president-ad@renaissance-dev.fr', ['template_name' => 'ensemble-event-update']); } } diff --git a/tests/Controller/EnMarche/EventControllerTest.php b/tests/Controller/EnMarche/EventControllerTest.php index a633f4bb119..b5b850ff7aa 100644 --- a/tests/Controller/EnMarche/EventControllerTest.php +++ b/tests/Controller/EnMarche/EventControllerTest.php @@ -8,9 +8,9 @@ use App\Entity\Event\EventInvite; use App\Entity\Event\EventRegistration; use App\Entity\Renaissance\NewsletterSubscription; -use App\Mailer\Message\Ensemble\EnsembleEventRegistrationConfirmationMessage; use App\Mailer\Message\Ensemble\EnsembleNewsletterSubscriptionConfirmationMessage; use App\Mailer\Message\EventInvitationMessage; +use App\Mailer\Message\Renaissance\EventRegistrationConfirmationMessage; use App\Repository\Email\EmailLogRepository; use App\Repository\EventRegistrationRepository; use Cake\Chronos\Chronos; @@ -79,7 +79,7 @@ public function testAnonymousUserCanRegisterToEvent() ])); $this->assertInstanceOf(EventRegistration::class, $this->repository->findGuestRegistration(LoadCommitteeEventData::EVENT_1_UUID, 'paupau75@example.org')); - $this->assertCount(1, $this->getEmailRepository()->findRecipientMessages(EnsembleEventRegistrationConfirmationMessage::class, 'paupau75@example.org')); + $this->assertCount(1, $this->getEmailRepository()->findRecipientMessages(EventRegistrationConfirmationMessage::class, 'paupau75@example.org')); $crawler = $this->client->followRedirect(); @@ -129,7 +129,7 @@ public function testRegisteredAdherentUserCanRegisterToEvent() $this->client->followRedirect(); $this->assertInstanceOf(EventRegistration::class, $this->repository->findGuestRegistration(LoadCommitteeEventData::EVENT_1_UUID, 'deputy@en-marche-dev.fr')); - $this->assertCount(1, $this->getEmailRepository()->findRecipientMessages(EnsembleEventRegistrationConfirmationMessage::class, 'deputy@en-marche-dev.fr')); + $this->assertCount(1, $this->getEmailRepository()->findRecipientMessages(EventRegistrationConfirmationMessage::class, 'deputy@en-marche-dev.fr')); $crawler = $this->client->followRedirect(); diff --git a/tests/Controller/EnMarche/EventManagerControllerTest.php b/tests/Controller/EnMarche/EventManagerControllerTest.php index 758d0dcbb39..9f3565dd3ac 100644 --- a/tests/Controller/EnMarche/EventManagerControllerTest.php +++ b/tests/Controller/EnMarche/EventManagerControllerTest.php @@ -5,10 +5,9 @@ use App\DataFixtures\ORM\LoadCommitteeEventData; use App\DataFixtures\ORM\LoadEventCategoryData; use App\Entity\Event\CommitteeEvent; -use App\Mailer\Message\BesoinDEurope\BesoinDEuropeEventCancellationMessage; -use App\Mailer\Message\Ensemble\EnsembleEventCancellationMessage; -use App\Mailer\Message\Ensemble\EnsembleEventUpdateMessage; use App\Mailer\Message\EventContactMembersMessage; +use App\Mailer\Message\Renaissance\EventCancellationMessage; +use App\Mailer\Message\Renaissance\EventUpdateMessage; use Cake\Chronos\Chronos; use PHPUnit\Framework\Attributes\DataProvider; use PHPUnit\Framework\Attributes\Group; @@ -100,7 +99,7 @@ public function testOrganizerCanEditEvent() ])); $this->assertStatusCode(Response::HTTP_FOUND, $this->client); - $this->assertCountMails(1, EnsembleEventUpdateMessage::class); + $this->assertCountMails(1, EventUpdateMessage::class); // Follow the redirect and check the adherent can see the committee page $crawler = $this->client->followRedirect(); @@ -133,8 +132,7 @@ public function testOrganizerCanCancelEvent() $this->assertStatusCode(Response::HTTP_OK, $this->client); $this->seeFlashMessage($crawler, 'L\'événement a bien été annulé.'); - $messages = $this->getEmailRepository()->findMessages(EnsembleEventCancellationMessage::class); - /** @var BesoinDEuropeEventCancellationMessage $message */ + $messages = $this->getEmailRepository()->findMessages(EventCancellationMessage::class); $message = array_shift($messages); // Two mails have been sent