Merge branch...

Merge branch 'hotline#186269_mail_rappel_activite_envoye_a_une_personne_en_liste_d_attente' into 'master'

hotline#186269 : Activity notification are not sent to queued trainees anymore

See merge request !4957

VERSIONS_HOTLINE/186269

+ - correctif #186269 : Activités : Mail rappel activité envoyé à une personne en liste d'attente
\ No newline at end of file

library/Class/SessionActivity/Notification.php

@@ -52,6 +52,9 @@ class Class_SessionActivity_Notification {
     if ($inscription->hasNotifiedAt())
       return $this;
 
+    if ($inscription->getQueue())
+      return $this;
+
     $stagiaire = $inscription->getStagiaire();
     $mailer = new Class_MailHtml();
     if (!$mailer->isMailValid($stagiaire->getMail()))

tests/scenarios/Activities/BatchTest.php

@@ -68,7 +68,7 @@ abstract class Activities_BatchRunTestCase extends ModelTestCase {
   public function setUp() {
     parent::setUp();
 
-    Class_Profil::setCurrentProfil($this->fixture('Class_Profil',
+    Class_Profil::setCurrentProfil($this->fixture(Class_Profil::class,
                                                   ['id' => 1,
                                                    'mail_site' => 'from@server.com']));
 
@@ -102,23 +102,52 @@ abstract class Activities_BatchRunTestCase extends ModelTestCase {
 
 
   protected function _prepare() {
-    $stagiaire_group = $this->fixture('Class_UserGroup',['id' => 23])
+    $stagiaire_group = $this->fixture(Class_UserGroup::class,
+                                      ['id' => 23])
                             ->addRightSuivreActivity();
 
-    $this->fixture('Class_SessionActivity',
+    $apoulain = $this->fixture(Class_Users::class,
+                               ['id' => 9939,
+                                'nom' => 'Poulain',
+                                'prenom' => 'Amelie',
+                                'mail' => 'amelie.poulain@paris.com',
+                                'login' => 'apoulain',
+                                'password' => 's3cr3t',
+                                'user_groups' => [$stagiaire_group]
+                               ]);
+    $this->fixture(Class_Users::class,
+                   ['id' => 9938,
+                    'login' => 'pistache',
+                    'password' => 'OMG',
+                    'mail' => 'pist@a.ch',
+                    'user_groups' => [$stagiaire_group]]);
+
+    $this->fixture(Class_SessionActivity::class,
                    ['id' => 22,
                     'date_debut' => '2021-02-11 00:00:00',
                     'date_limite_inscription' => '2021-02-11',
-                    'activity' => $this->fixture('Class_Activity',
+                    'activity' => $this->fixture(Class_Activity::class,
                                                  ['id' => 12,
                                                   'libelle' => 'Stephanie\'s Birthday Party']),
-                    'stagiaires' => [$this->fixture('Class_Users',
-                                                    ['id' => 9938,
-                                                     'login' => 'pistache',
-                                                     'password' => 'OMG',
-                                                     'mail' => 'pist@a.ch',
-                                                     'user_groups' => [$stagiaire_group]])],
                    ]);
+    $inscription1= $this->fixture(Class_SessionActivityInscription::class,
+                                  ['id' => 12,
+                                   'session_activity_id' => 22,
+                                   'stagiaire_id' => 9938,
+                                   'adults' => 1,
+                                   'queue' => false
+                                  ]);
+    $inscription2 = $this->fixture(Class_SessionActivityInscription::class,
+                                   ['id' => 13,
+                                    'session_activity_id' => 22,
+                                    'stagiaire_id' => 9939,
+                                    'adults' => 1,
+                                    'queue' => true
+                                   ]);
+    Class_SessionActivity::find(22)
+      ->addSessionActivityInscription($inscription1)
+      ->addSessionActivityInscription($inscription2)
+      ->save();
   }