fetchEmailBdd => par nouvelle (af4ed421) · Commits · open-source / sygal

module/Application/src/Application/Entity/Db/Variable.php

+0 −2

Original line number	Diff line number	Diff line
		@@ -15,8 +15,6 @@ class Variable implements HistoriqueAwareInterface
		use HistoriqueAwareTrait;
		use SourceAwareTrait;

		const CODE_EMAIL_BDD = 'EMAIL_BDD';
		const CODE_EMAIL_BU = 'EMAIL_BU';
		const CODE_EMAIL_ASSISTANCE = 'EMAIL_ASSISTANCE';
		const CODE_ETB_ART_ETB_LIB = 'ETB_ART_ETB_LIB'; // Ex: "L'"
		const CODE_ETB_LIB = 'ETB_LIB'; // Ex: "Université de Caen Normandie"

module/Application/src/Application/Service/Email/EmailTheseService.php

+0 −22

Original line number	Diff line number	Diff line
		@@ -23,28 +23,6 @@ class EmailTheseService
		use IndividuServiceAwareTrait;
		use MembreServiceAwareTrait;

		/**
		* @param These $these
		* @return string
		* @deprecated Utiliser fetchEmailMaisonDuDoctorat() à la place.
		*/
		public function fetchEmailBdd(These $these) : string
		{
		$variable = $this->variableService->getRepository()->findOneByCodeAndThese(Variable::CODE_EMAIL_BDD, $these);
		return $variable->getValeur();
		}

		/**
		* @param These $these
		* @return string
		* @deprecated Utiliser fetchEmailBibliothequeUniv() à la place.
		*/
		public function fetchEmailBu(These $these) : string
		{
		$variable = $this->variableService->getRepository()->findOneByCodeAndThese(Variable::CODE_EMAIL_BU, $these);
		return $variable->getValeur();
		}

		/**
		* @param IndividuRole[] $individuRoles
		* @param These $these

module/Application/src/Application/Service/Notification/NotifierService.php

+15 −34

Original line number	Diff line number	Diff line
		@@ -6,6 +6,7 @@ use Application\Entity\Db\MailConfirmation;
		use Application\Entity\Db\Role;
		use Application\Entity\Db\Utilisateur;
		use Application\Entity\Db\Variable;
		use Application\Service\Email\EmailTheseServiceAwareTrait;
		use Application\Service\Role\RoleServiceAwareTrait;
		use Application\Service\Variable\VariableServiceAwareTrait;
		use Depot\Notification\ChangementCorrectionAttendueNotification;
		@@ -16,6 +17,7 @@ use Individu\Entity\Db\Individu;
		use Individu\Service\IndividuServiceAwareTrait;
		use Laminas\Mvc\Plugin\FlashMessenger\FlashMessenger;
		use Laminas\View\Helper\Url as UrlHelper;
		use Notification\Exception\NotificationException;
		use Notification\Notification;
		use Structure\Service\EcoleDoctorale\EcoleDoctoraleServiceAwareTrait;
		use Structure\Service\UniteRecherche\UniteRechercheServiceAwareTrait;
		@@ -32,6 +34,7 @@ class NotifierService extends \Notification\Service\NotifierService
		use UniteRechercheServiceAwareTrait;
		use RoleServiceAwareTrait;
		use IndividuServiceAwareTrait;
		use EmailTheseServiceAwareTrait;

		/**
		* @var UrlHelper
		@@ -43,14 +46,14 @@ class NotifierService extends \Notification\Service\NotifierService
		*
		* @param array $data Données concernant les thèses dont le résultat a changé
		* @return ChangementsResultatsThesesNotification
		* @throws \Notification\Exception\NotificationException
		* @throws NotificationException
		*/
		public function triggerChangementResultatTheses(array $data): ChangementsResultatsThesesNotification
		{
		$these = current($data)['these'];

		$emailBdd = $this->fetchEmailBdd($these);
		$emailBu = $this->fetchEmailBu($these);
		$emailBdd = $this->emailTheseService->fetchEmailMaisonDuDoctorat($these);
		$emailBu = $this->emailTheseService->fetchEmailBibliothequeUniv($these);

		$notif = new ChangementsResultatsThesesNotification();
		$notif->setData($data);
		@@ -66,7 +69,7 @@ class NotifierService extends \Notification\Service\NotifierService
		*
		* @param array $data
		* @return ResultatTheseAdmisNotification[]
		* @throws \Notification\Exception\NotificationException
		* @throws NotificationException
		*/
		public function triggerChangementResultatThesesAdmis(array $data): array
		{
		@@ -76,7 +79,7 @@ class NotifierService extends \Notification\Service\NotifierService
		$these = $array['these'];
		/* @var These $these */

		$emailBdd = $this->fetchEmailBdd($these);
		$emailBdd = $this->emailTheseService->fetchEmailMaisonDuDoctorat($these);

		$notif = new ResultatTheseAdmisNotification();
		$notif->setThese($these);
		@@ -97,7 +100,7 @@ class NotifierService extends \Notification\Service\NotifierService
		* @param These $these
		* @param string $message
		* @return ChangementCorrectionAttendueNotification\|null
		* @throws \Notification\Exception\NotificationException
		* @throws NotificationException
		*/
		public function triggerCorrectionAttendue(ImportObservResult $record, These $these, &$message = null): ?ChangementCorrectionAttendueNotification
		{
		@@ -136,11 +139,11 @@ class NotifierService extends \Notification\Service\NotifierService
		* Notification à propos du dépassement de la date butoir de dépôt de la version corrigée de la thèse.
		*
		* @param These $these
		* @throws \Notification\Exception\NotificationException
		* @throws NotificationException
		*/
		public function triggerDateButoirCorrectionDepassee(These $these)
		{
		$to = $this->fetchEmailBdd($these);
		$to = $this->emailTheseService->fetchEmailMaisonDuDoctorat($these);

		$notif = new Notification();
		$notif
		@@ -159,14 +162,14 @@ class NotifierService extends \Notification\Service\NotifierService
		*
		* @param These $these
		* @param Acteur\|null $president
		* @throws \Notification\Exception\NotificationException
		* @throws NotificationException
		*/
		public function triggerPasDeMailPresidentJury(These $these, ?Acteur $president)
		{
		$notif = new PasDeMailPresidentJury();
		$notif
		->setThese($these)
		->setEmailBdd($this->fetchEmailBdd($these))
		->setEmailBdd($this->emailTheseService->fetchEmailMaisonDuDoctorat($these))
		->setPresident($president)
		->setTemplateVariables([
		'these' => $these,
		@@ -191,7 +194,7 @@ class NotifierService extends \Notification\Service\NotifierService
		*
		* @param MailConfirmation $mailConfirmation
		* @param string $confirmUrl
		* @throws \Notification\Exception\NotificationException
		* @throws NotificationException
		*/
		public function triggerMailConfirmation(MailConfirmation $mailConfirmation, string $confirmUrl)
		{
		@@ -208,28 +211,6 @@ class NotifierService extends \Notification\Service\NotifierService
		$this->trigger($notif);
		}

		/**
		* @param These $these
		* @return string
		*/
		protected function fetchEmailBdd(These $these)
		{
		$variable = $this->variableService->getRepository()->findOneByCodeAndThese(Variable::CODE_EMAIL_BDD, $these);

		return $variable->getValeur();
		}

		/**
		* @param These $these
		* @return string
		*/
		protected function fetchEmailBu(These $these)
		{
		$variable = $this->variableService->getRepository()->findOneByCodeAndThese(Variable::CODE_EMAIL_BU, $these);

		return $variable->getValeur();
		}

		/**
		* @param UrlHelper $urlHelper
		*/
		@@ -260,7 +241,7 @@ class NotifierService extends \Notification\Service\NotifierService
		* @var string $type
		* @var Role $role
		* @var Individu $individu
		* @throws \Notification\Exception\NotificationException
		* @throws NotificationException
		*/
		public function triggerChangementRole($type, $role, $individu)
		{

module/Application/src/Application/Service/Notification/NotifierServiceFactory.php

+8 −2

Original line number	Diff line number	Diff line
		@@ -2,11 +2,14 @@

		namespace Application\Service\Notification;

		use Application\Service\Email\EmailTheseService;
		use Application\Service\Role\RoleService;
		use Application\Service\Variable\VariableService;
		use Individu\Service\IndividuService;
		use Interop\Container\ContainerInterface;
		use Laminas\View\Helper\Url as UrlHelper;
		use Psr\Container\ContainerExceptionInterface;
		use Psr\Container\NotFoundExceptionInterface;
		use Structure\Service\EcoleDoctorale\EcoleDoctoraleService;
		use Structure\Service\UniteRecherche\UniteRechercheService;

		@@ -18,8 +21,8 @@ class NotifierServiceFactory extends \Notification\Service\NotifierServiceFactor
		protected string $notifierServiceClass = NotifierService::class;

		/**
		* @throws \Psr\Container\ContainerExceptionInterface
		* @throws \Psr\Container\NotFoundExceptionInterface
		* @throws ContainerExceptionInterface
		* @throws NotFoundExceptionInterface
		*/
		public function __invoke(ContainerInterface $container): NotifierService
		{
		@@ -29,12 +32,14 @@ class NotifierServiceFactory extends \Notification\Service\NotifierServiceFactor
		/**
		* @var VariableService $variableService
		* @var EcoleDoctoraleService $ecoleDoctoraleService
		* @var EmailTheseService $emailTheseService
		* @var UniteRechercheService $uniteRechercheService
		* @var IndividuService $individuService
		* @var RoleService $roleService
		*/
		$variableService = $container->get('VariableService');
		$ecoleDoctoraleService = $container->get('EcoleDoctoraleService');
		$emailTheseService = $container->get(EmailTheseService::class);
		$uniteRechercheService = $container->get('UniteRechercheService');
		$individuService = $container->get(IndividuService::class);
		$roleService = $container->get('RoleService');
		@@ -44,6 +49,7 @@ class NotifierServiceFactory extends \Notification\Service\NotifierServiceFactor

		$service->setVariableService($variableService);
		$service->setEcoleDoctoraleService($ecoleDoctoraleService);
		$service->setEmailTheseService($emailTheseService);
		$service->setUniteRechercheService($uniteRechercheService);
		$service->setUrlHelper($urlHelper);
		$service->setIndividuService($individuService);

module/Depot/src/Depot/Notification/ValidationPageDeCouvertureNotification.php

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,10 +24,10 @@ class ValidationPageDeCouvertureNotification extends Notification
		private $emailBu;

		/**
		* @param string $emailBu
		* @param string[] $emailBu
		* @return self
		*/
		public function setEmailBu(string $emailBu): self
		public function setEmailBu(array $emailBu): self
		{
		$this->emailBu = $emailBu;