[smarcet]

* updated speaker announcement email process
OpenStackweb · Aug 16, 2017 · 0d24489 · 0d24489
1 parent e0558d7
commit 0d24489
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 20 deletions.
diff --git a/summit/code/cron_tasks/SpeakerSelectionAnnouncementEmailSenderTask.php b/summit/code/cron_tasks/SpeakerSelectionAnnouncementEmailSenderTask.php
@@ -35,7 +35,7 @@ public function run()
     {
         try
         {
-            $batch_size = 100;
+            $batch_size = 1000;
             $init_time  = time();
             $summit     = null;
 
@@ -52,7 +52,6 @@ public function run()
 
             if(is_null($summit)) throw new Exception('summit_id is not valid!');
 
-
             $processed1  = $this->manager->sendSpeakersSelectionAnnouncementBySummit($summit, $batch_size);
             $processed2  = $this->manager->sendModeratorsSelectionAnnouncementBySummit($summit, $batch_size);
 

diff --git a/summit/code/infrastructure/active_records/events/SummitEvent.php b/summit/code/infrastructure/active_records/events/SummitEvent.php
@@ -169,7 +169,7 @@ public function getLink($type ='show', $absolute = true) {
             $page = SummitAppSchedPage::getBy($this->Summit());
             if ($page) {
                 if($absolute)
-                    return $page->getAbsoluteLiveLink(false) . 'events/' . $this->getIdentifier() . '/' . $this->getTitleForUrl();
+                    return $page->AbsoluteLink() . 'events/' . $this->getIdentifier() . '/' . $this->getTitleForUrl();
                 return $page->RelativeLink(false) . 'events/' . $this->getIdentifier() . '/' . $this->getTitleForUrl();
             }
         }

diff --git a/summit/code/infrastructure/active_records/events/presentations/Presentation.php b/summit/code/infrastructure/active_records/events/presentations/Presentation.php
@@ -270,7 +270,7 @@ public function getLink($type ='voting', $absolute = true)
             $page =  SummitAppSchedPage::getBy($this->Summit());
             if ($page) {
                 if($absolute)
-                    return $page->getAbsoluteLiveLink(false) . 'events/' . $this->getIdentifier() . '/' . $this->getTitleForUrl();
+                    return $page->AbsoluteLink() . 'events/' . $this->getIdentifier() . '/' . $this->getTitleForUrl();
                 return $page->RelativeLink(false) . 'events/' . $this->getIdentifier() . '/' . $this->getTitleForUrl();
             }
         }

diff --git a/summit/code/infrastructure/active_records/events/presentations/PresentationSpeaker.php b/summit/code/infrastructure/active_records/events/presentations/PresentationSpeaker.php
@@ -385,7 +385,7 @@ public function PublishedPresentations($summit_id = null, $role = IPresentationS
      * @param null $summit_id
      * @param string $role
      * @param bool $include_sub_roles
-     * @return DataList
+     * @return ArrayList
      */
     public function PublishedRegularPresentations
     (
@@ -399,26 +399,29 @@ public function PublishedRegularPresentations
             $summit_id,
             $role,
             [IPresentationType::Keynotes, IPresentationType::Panel, IPresentationType::Presentation]
-        );
+        )->toArray();
 
         if($include_sub_roles && $role == IPresentationSpeaker::RoleModerator){
-            foreach($this->PublishedPresentationsByType
+            $presentations = $this->PublishedPresentationsByType
             (
                 $summit_id,
                 IPresentationSpeaker::RoleSpeaker,
                 [IPresentationType::Keynotes, IPresentationType::Panel, IPresentationType::Presentation]
-            ) as $speaker_presentation)
-                $list->push($speaker_presentation);
+            );
+            if($presentations) {
+                foreach ($presentations as $speaker_presentation)
+                    $list[]= $speaker_presentation;
+            }
         }
 
-        return $list;
+        return new ArrayList($list);
     }
 
     /**
      * @param null $summit_id
      * @param string $role
      * @param bool $include_sub_roles
-     * @return DataList
+     * @return bool
      */
     public function hasPublishedRegularPresentations
     (
@@ -434,7 +437,7 @@ public function hasPublishedRegularPresentations
      * @param null $summit_id
      * @param string $role
      * @param bool $include_sub_roles
-     * @return DataList
+     * @return ArrayList
      */
     public function PublishedLightningPresentations
     (
@@ -443,15 +446,18 @@ public function PublishedLightningPresentations
         $include_sub_roles = false
     )
     {
-        $list = $this->PublishedPresentationsByType($summit_id, $role, [IPresentationType::LightingTalks]);
+        $list = $this->PublishedPresentationsByType($summit_id, $role, [IPresentationType::LightingTalks])->toArray();
 
         if($include_sub_roles && $role == IPresentationSpeaker::RoleModerator){
-            foreach ($this->PublishedPresentationsByType($summit_id, IPresentationSpeaker::RoleSpeaker, [IPresentationType::LightingTalks]) as $speaker_presentation){
-                $list->push($speaker_presentation);
+            $presentations = $this->PublishedPresentationsByType($summit_id, IPresentationSpeaker::RoleSpeaker, [IPresentationType::LightingTalks]) ;
+            if($presentations) {
+                foreach ($presentations as $speaker_presentation) {
+                    $list[] = $speaker_presentation;
+                }
             }
         }
 
-        return $list;
+        return new ArrayList($list);
     }
 
     /**
@@ -858,8 +864,11 @@ public function AlternatePresentations
 
         // if role is moderator, add also the ones that belongs to role speaker ( if $include_sub_roles is true)
         if($include_sub_roles && $role == IPresentationSpeaker::RoleModerator){
-            foreach($this->AlternatePresentations(IPresentationSpeaker::RoleSpeaker) as $speaker_presentation)
-                $alternatePresentations->push($speaker_presentation);
+            $presentations = $this->AlternatePresentations($summit_id,IPresentationSpeaker::RoleSpeaker);
+            if($presentations) {
+                foreach ($presentations as $speaker_presentation)
+                    $alternatePresentations->push($speaker_presentation);
+            }
         }
 
         return $alternatePresentations;
@@ -1016,8 +1025,11 @@ public function registerAnnouncementEmailTypeSent($email_type, $summit_id)
     public function RejectedPresentations($summit_id = null, $role = IPresentationSpeaker::RoleSpeaker, $include_sub_roles = false){
         $list = $this->UnacceptedPresentations($summit_id, $role);
         if($include_sub_roles && $role == IPresentationSpeaker::RoleModerator){
-            foreach($this->UnacceptedPresentations($summit_id, IPresentationSpeaker::RoleSpeaker) as $speaker_presentation){
-                $list->push($speaker_presentation);
+            $presentations = $this->UnacceptedPresentations($summit_id, IPresentationSpeaker::RoleSpeaker);
+            if($presentations) {
+                foreach ($presentations as $speaker_presentation) {
+                    $list->push($speaker_presentation);
+                }
             }
         }
         return $list;