fix: issue on submitter presentation numbers

OpenStackweb · Aug 15, 2024 · 3dba1ee · 3dba1ee
1 parent ffc1f99
commit 3dba1ee
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 12 deletions.
diff --git a/app/Models/Foundation/Main/Member.php b/app/Models/Foundation/Main/Member.php
@@ -2710,15 +2710,16 @@ public function getAcceptedPresentations
             if($filter->hasFilter("is_speaker")){
                 $value = to_boolean($filter->getValue("is_speaker")[0]);
                 if($value)
-                    $extraWhere .= " AND spk.member = :member_id";
+                    $extraWhere .= " AND ( spk.member = :member_id OR mod.member = :member_id)";
                 else
-                    $extraWhere .= " AND spk.member <> :member_id";
+                    $extraWhere .= " AND ( (spk.member <> :member_id OR spk.member IS NULL) AND (mod.member <> :member_id OR mod.member IS NULL) )";
             }
         }
         $query = $this->createQuery(sprintf("
-            SELECT p from models\summit\Presentation p 
+            SELECT DISTINCT p from models\summit\Presentation p 
             JOIN p.summit s 
             LEFT JOIN p.speakers a_spk 
+            LEFT JOIN p.moderator mod
             LEFT JOIN a_spk.speaker spk 
             JOIN p.created_by cb 
             LEFT JOIN p.selection_plan sel_p  
@@ -2904,15 +2905,16 @@ public function getAlternatePresentations
             if($filter->hasFilter("is_speaker")){
                 $value = to_boolean($filter->getValue("is_speaker")[0]);
                 if($value)
-                    $extraWhere .= " AND spk.member = :member_id";
+                    $extraWhere .= " AND ( spk.member = :member_id OR mod.member = :member_id)";
                 else
-                    $extraWhere .= " AND spk.member <> :member_id";
+                    $extraWhere .= " AND ( (spk.member <> :member_id OR spk.member IS NULL) AND (mod.member <> :member_id OR mod.member IS NULL) )";
             }
         }
 
         $query = $this->createQuery("
-        SELECT p from models\summit\Presentation p 
+        SELECT DISTINCT p from models\summit\Presentation p 
         JOIN p.summit s 
+        LEFT JOIN p.moderator mod
         LEFT JOIN p.speakers a_spk 
         LEFT JOIN a_spk.speaker spk 
         JOIN p.created_by cb 
@@ -3060,14 +3062,15 @@ public function getRejectedPresentations
             if($filter->hasFilter("is_speaker")){
                 $value = to_boolean($filter->getValue("is_speaker")[0]);
                 if($value)
-                    $extraWhere .= " AND spk.member = :member_id";
+                    $extraWhere .= " AND ( spk.member = :member_id OR mod.member = :member_id)";
                 else
-                    $extraWhere .= " AND spk.member <> :member_id";
+                    $extraWhere .= " AND ( (spk.member <> :member_id OR spk.member IS NULL) AND (mod.member <> :member_id OR mod.member IS NULL) )";
             }
         }
 
-        $query = $this->createQuery("SELECT p from models\summit\Presentation p 
-            JOIN p.summit s 
+        $query = $this->createQuery("SELECT DISTINCT p from models\summit\Presentation p 
+            JOIN p.summit s
+            LEFT JOIN p.moderator mod 
             LEFT JOIN p.speakers a_spk 
             LEFT JOIN a_spk.speaker spk 
             LEFT JOIN p.materials m 

diff --git a/app/Repositories/Summit/DoctrineMemberRepository.php b/app/Repositories/Summit/DoctrineMemberRepository.php
@@ -397,14 +397,14 @@ protected function getFilterMappings()
                                     SELECT __p61.id FROM models\summit\Presentation __p61 
                                     JOIN __p61.created_by __c61 WITH __c61 = e.id 
                                     JOIN __p61.speakers __pspk61
-                                    JOIN __pspk61.speaker __spk61 WITH __spk61.member = e.id 
+                                    JOIN __pspk61.speaker __spk61 WITH __spk61.member = e
                                     WHERE __p61.summit = :summit
                                 ) 
                                 AND  
                                 NOT EXISTS (
                                     SELECT __p62.id FROM models\summit\Presentation __p62 
                                     JOIN __p62.created_by __c62 WITH __c62 = e.id 
-                                    JOIN __p62.moderator __md62 WITH __md62.member = e.id 
+                                    JOIN __p62.moderator __md62 WITH __md62.member = e
                                     WHERE __p62.summit = :summit
                                 ))'
                         ),