fix: 500 error on order by owner_company at orders repo

OpenStackweb · Oct 25, 2024 · f42ab8b · f42ab8b
1 parent 5401611
commit f42ab8b
Show file tree

Hide file tree

Showing 41 changed files with 87 additions and 48 deletions.
diff --git a/app/Repositories/ConfigDoctrineRepository.php b/app/Repositories/ConfigDoctrineRepository.php
@@ -17,6 +17,7 @@
 use Doctrine\ORM\QueryBuilder;
 use LaravelDoctrine\ORM\Facades\Registry;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class ConfigDoctrineRepository
@@ -49,7 +50,7 @@ protected function applyExtraFilters(QueryBuilder $query)
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null)
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null,  ?Order $order = null)
     {
         return $query;
     }

diff --git a/app/Repositories/DoctrineRepository.php b/app/Repositories/DoctrineRepository.php
@@ -127,9 +127,10 @@ protected abstract function applyExtraFilters(QueryBuilder $query);
     /**
      * @param QueryBuilder $query
      * @param Filter|null $filter
-     * @return QueryBuilder
+     * @param Order|null $order
+     * @return mixed
      */
-    protected abstract function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null);
+    protected abstract function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null);
 
     /**
      * @param QueryBuilder $query
@@ -161,7 +162,7 @@ protected function getParametrizedAllByPage
 
         $query  = call_user_func($fnQuery);
 
-        $query = $this->applyExtraJoins($query, $filter);
+        $query = $this->applyExtraJoins($query, $filter, $order);
 
         $query = $this->applyExtraSelects($query, $filter, $order);
 
@@ -224,7 +225,7 @@ public function getParametrizedAllIdsByPage(callable $fnQuery,PagingInfo $paging
 
         $query  = call_user_func($fnQuery);
 
-        $query = $this->applyExtraJoins($query, $filter);
+        $query = $this->applyExtraJoins($query, $filter, $order);
 
         $query = $this->applyExtraSelects($query, $filter, $order);
 
@@ -261,7 +262,7 @@ public function getAllByPage(PagingInfo $paging_info, Filter $filter = null, Ord
             ->select("e")
             ->from($this->getBaseEntity(), "e");
 
-        $query = $this->applyExtraJoins($query, $filter);
+        $query = $this->applyExtraJoins($query, $filter, $order);
 
         $query = $this->applyExtraSelects($query, $filter, $order);
 
@@ -310,7 +311,7 @@ public function getAllIdsByPage(PagingInfo $paging_info, Filter $filter = null,
             ->select("e.id")
             ->from($this->getBaseEntity(), "e");
 
-        $query = $this->applyExtraJoins($query, $filter);
+        $query = $this->applyExtraJoins($query, $filter, $order);
 
         $query = $this->applyExtraSelects($query, $filter, $order);
 

diff --git a/app/Repositories/Main/DoctrineAuditLogRepository.php b/app/Repositories/Main/DoctrineAuditLogRepository.php
@@ -27,6 +27,7 @@
 use utils\DoctrineFilterMapping;
 use utils\DoctrineInstanceOfFilterMapping;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrineAuditLogRepository
@@ -49,7 +50,7 @@ protected function getBaseEntity()
      * @param Filter|null $filter
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null): QueryBuilder
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null): QueryBuilder
     {
         $query = $query->leftJoin(Member::class, 'u', 'WITH', 'e.user = u.id');
 

diff --git a/app/Repositories/Main/DoctrineExtraQuestionTypeRepository.php b/app/Repositories/Main/DoctrineExtraQuestionTypeRepository.php
@@ -22,6 +22,7 @@
 use utils\DoctrineCaseFilterMapping;
 use utils\DoctrineSwitchFilterMapping;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrineExtraQuestionTypeRepository
@@ -36,7 +37,7 @@ abstract class DoctrineExtraQuestionTypeRepository
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null){
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null){
         return $query;
     }
 

diff --git a/app/Repositories/Main/DoctrineProjectSponsorshipTypeRepository.php b/app/Repositories/Main/DoctrineProjectSponsorshipTypeRepository.php
@@ -16,6 +16,7 @@
 use Doctrine\ORM\QueryBuilder;
 use models\main\ProjectSponsorshipType;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrineProjectSponsorshipTypeRepository
@@ -45,7 +46,7 @@ protected function getFilterMappings()
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null){
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null){
         $query = $query->innerJoin("e.sponsored_project", "sp");
         return $query;
     }

diff --git a/app/Repositories/Main/DoctrineSummitAdministratorPermissionGroupRepository.php b/app/Repositories/Main/DoctrineSummitAdministratorPermissionGroupRepository.php
@@ -16,6 +16,7 @@
 use Doctrine\ORM\QueryBuilder;
 use models\main\SummitAdministratorPermissionGroup;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrineSummitAdministratorPermissionGroupRepository
@@ -58,7 +59,7 @@ protected function getOrderMappings()
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null)
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null)
     {
         $query = $query->join('e.summits', 's')
             ->join('e.members', 'm');

diff --git a/app/Repositories/Main/DoctrineSupportingCompanyRepository.php b/app/Repositories/Main/DoctrineSupportingCompanyRepository.php
@@ -17,6 +17,7 @@
 use Doctrine\ORM\QueryBuilder;
 use models\main\SupportingCompany;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrineSupportingCompanyRepository
@@ -56,7 +57,7 @@ protected function getOrderMappings()
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null)
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null)
     {
         $query = $query->innerJoin("e.sponsorship_type", "st");
         $query = $query->innerJoin("e.company", "c");

diff --git a/app/Repositories/SilverStripeDoctrineRepository.php b/app/Repositories/SilverStripeDoctrineRepository.php
@@ -18,6 +18,7 @@
 use models\utils\SilverstripeBaseModel;
 use LaravelDoctrine\ORM\Facades\Registry;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class SilverStripeDoctrineRepository
@@ -64,9 +65,11 @@ protected function applyExtraFilters(QueryBuilder $query){
 
     /**
      * @param QueryBuilder $query
+     * @param Filter|null $filter
+     * @param Order|null $order
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null){
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null){
         return $query;
     }
 

diff --git a/app/Repositories/Summit/DoctrineMemberRepository.php b/app/Repositories/Summit/DoctrineMemberRepository.php
@@ -54,7 +54,7 @@ protected function getBaseEntity()
      * @param Filter|null $filter
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null): QueryBuilder
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null): QueryBuilder
     {
         if($filter->hasFilter("summit_id") || $filter->hasFilter("schedule_event_id")){
             $query

diff --git a/app/Repositories/Summit/DoctrinePresentationActionTypeRepository.php b/app/Repositories/Summit/DoctrinePresentationActionTypeRepository.php
@@ -20,6 +20,7 @@
 use models\summit\PresentationActionType;
 use utils\DoctrineLeftJoinFilterMapping;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrinePresentationActionTypeRepository
@@ -43,7 +44,7 @@ protected function getBaseEntity(): string
      * @param Filter|null $filter
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null): QueryBuilder
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null): QueryBuilder
     {
         return $query->leftJoin("e.assigned_selection_plans", "asp")
             ->leftJoin("asp.selection_plan", "sp");

diff --git a/app/Repositories/Summit/DoctrinePresentationMediaUploadRepository.php b/app/Repositories/Summit/DoctrinePresentationMediaUploadRepository.php
@@ -17,6 +17,7 @@
 use Doctrine\ORM\QueryBuilder;
 use models\summit\PresentationMediaUpload;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrinePresentationMediaUploadRepository
@@ -57,7 +58,7 @@ protected function getOrderMappings()
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null){
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null){
         $query = $query->innerJoin("e.media_upload_type", "t");
         return $query;
     }

diff --git a/app/Repositories/Summit/DoctrinePresentationTrackChairRatingTypeRepository.php b/app/Repositories/Summit/DoctrinePresentationTrackChairRatingTypeRepository.php
@@ -17,6 +17,7 @@
 use App\Repositories\SilverStripeDoctrineRepository;
 use Doctrine\ORM\QueryBuilder;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrinePresentationTrackChairRatingTypeRepository
@@ -39,7 +40,7 @@ protected function getBaseEntity()
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null)
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null)
     {
         if($filter->hasFilter('selection_plan_id'))
             $query->join('e.selection_plan', 'sp');

diff --git a/app/Repositories/Summit/DoctrinePresentationTrackChairScoreTypeRepository.php b/app/Repositories/Summit/DoctrinePresentationTrackChairScoreTypeRepository.php
@@ -17,6 +17,7 @@
 use App\Repositories\SilverStripeDoctrineRepository;
 use Doctrine\ORM\QueryBuilder;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrinePresentationScoreTypeRepository
@@ -39,7 +40,7 @@ protected function getBaseEntity()
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null)
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null)
     {
         if($filter->hasFilter('type_id'))
             $query->join('e.type', 't');

diff --git a/app/Repositories/Summit/DoctrineSelectionPlanRepository.php b/app/Repositories/Summit/DoctrineSelectionPlanRepository.php
@@ -48,7 +48,7 @@ protected function getBaseEntity()
      * @param Filter|null $filter
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null)
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null)
     {
         if ($filter->hasFilter("summit_id")) {
             $query = $query->join('e.summit', 's');

diff --git a/app/Repositories/Summit/DoctrineSponsorRepository.php b/app/Repositories/Summit/DoctrineSponsorRepository.php
@@ -20,6 +20,7 @@
 use utils\DoctrineJoinFilterMapping;
 use utils\DoctrineLeftJoinFilterMapping;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrineSponsorRepository
@@ -50,7 +51,7 @@ protected function getFilterMappings()
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null){
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null){
         if($filter->hasFilter("badge_scans_count"))
             $query = $query->leftJoin("e.user_info_grants", "bs");
         return $query;

diff --git a/app/Repositories/Summit/DoctrineSponsorUserInfoGrantRepository.php b/app/Repositories/Summit/DoctrineSponsorUserInfoGrantRepository.php
@@ -18,6 +18,7 @@
 use models\summit\SponsorUserInfoGrant;
 use utils\DoctrineFilterMapping;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrineSponsorUserInfoGrantRepository
@@ -85,7 +86,7 @@ protected function getOrderMappings()
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null){
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null){
         $query = $query->join('e.sponsor', 'sp')
             ->join('sp.summit', 's')
             ->join('sp.company', 'c')

diff --git a/app/Repositories/Summit/DoctrineSummitAttendeeBadgePrintRepository.php b/app/Repositories/Summit/DoctrineSummitAttendeeBadgePrintRepository.php
@@ -19,6 +19,7 @@
 use models\summit\SummitAttendeeBadgePrint;
 use models\utils\SilverstripeBaseModel;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrineSummitAttendeeBadgePrintRepository
@@ -34,7 +35,7 @@ protected function getBaseEntity()
         return SummitAttendeeBadgePrint::class;
     }
 
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null)
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null)
     {
         $query = $query->innerJoin("e.badge", "b");
         $query = $query->innerJoin("e.requestor", "r");

diff --git a/app/Repositories/Summit/DoctrineSummitAttendeeBadgeRepository.php b/app/Repositories/Summit/DoctrineSummitAttendeeBadgeRepository.php
@@ -76,7 +76,7 @@ protected function getOrderMappings()
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null){
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null){
         $query = $query->join('e.ticket', 't')
             ->leftJoin('t.owner', 'o')
             ->leftJoin('o.member', 'm')

diff --git a/app/Repositories/Summit/DoctrineSummitAttendeeNoteRepository.php b/app/Repositories/Summit/DoctrineSummitAttendeeNoteRepository.php
@@ -40,7 +40,7 @@ protected function getBaseEntity()
         return SummitAttendeeNote::class;
     }
 
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null)
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null)
     {
         $query = $query->leftJoin("e.author", "a");
         $query = $query->innerJoin("e.owner", "o");

diff --git a/app/Repositories/Summit/DoctrineSummitAttendeeRepository.php b/app/Repositories/Summit/DoctrineSummitAttendeeRepository.php
@@ -48,7 +48,7 @@ final class DoctrineSummitAttendeeRepository
      * @param Filter|null $filter
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null){
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null){
         $query =  $query->join('e.summit', 's')
             ->leftJoin('e.member', 'm')
             ->leftJoin('e.tickets', 't')

diff --git a/app/Repositories/Summit/DoctrineSummitAttendeeTicketRepository.php b/app/Repositories/Summit/DoctrineSummitAttendeeTicketRepository.php
@@ -230,7 +230,7 @@ protected function getFilterMappings()
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null)
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null)
     {
         $query->join("e.order", "o");
         $query = $query->join("o.summit", "s");

diff --git a/app/Repositories/Summit/DoctrineSummitCategoryChangeRepository.php b/app/Repositories/Summit/DoctrineSummitCategoryChangeRepository.php
@@ -16,6 +16,7 @@
 use Doctrine\ORM\QueryBuilder;
 use models\summit\SummitCategoryChange;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrineSummitCategoryChangeRepository
@@ -39,7 +40,7 @@ protected function getBaseEntity()
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null){
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null){
         $query->join("e.presentation","p");
         $query->join("p.selection_plan","sp");
         $query->join("p.summit","s");

diff --git a/app/Repositories/Summit/DoctrineSummitDocumentRepository.php b/app/Repositories/Summit/DoctrineSummitDocumentRepository.php
@@ -17,6 +17,7 @@
 use models\summit\SummitDocument;
 use utils\DoctrineLeftJoinFilterMapping;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrineSummitDocumentRepository
@@ -37,7 +38,7 @@ protected function getBaseEntity()
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null){
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null){
 
         $query = $query->join('e.summit', 's')
             ->leftJoin('e.event_types', 'et');

diff --git a/app/Repositories/Summit/DoctrineSummitEmailEventFlowRepository.php b/app/Repositories/Summit/DoctrineSummitEmailEventFlowRepository.php
@@ -17,6 +17,7 @@
 use Doctrine\ORM\QueryBuilder;
 use utils\DoctrineLeftJoinFilterMapping;
 use utils\Filter;
+use utils\Order;
 
 /**
  * Class DoctrineSummitEmailEventFlowRepository
@@ -39,7 +40,7 @@ protected function getBaseEntity()
      * @param QueryBuilder $query
      * @return QueryBuilder
      */
-    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null){
+    protected function applyExtraJoins(QueryBuilder $query, ?Filter $filter = null, ?Order $order = null){
         $query = $query->join('e.event_type', 'et')
             ->join('et.flow', 'f');
         return $query;