Resolve #3893 "Performance des persönlichen Kalenders / Gruppenkalender ist schlecht"

Closes #3893

Merge request studip/studip!2746

1 files changed, 19 insertions, 13 deletions

diff --git a/lib/models/calendar/CalendarDateAssignment.class.php b/lib/models/calendar/CalendarDateAssignment.class.php
index 18cd610..fbd21a7 100644
--- a/lib/models/calendar/CalendarDateAssignment.class.php
+++ b/lib/models/calendar/CalendarDateAssignment.class.php
@@ -232,29 +232,35 @@ class CalendarDateAssignment extends SimpleORMap implements Event
         $sql = "JOIN `calendar_dates`
             ON calendar_date_id = `calendar_dates`.`id`
             WHERE
-            `calendar_date_assignments`.`range_id` = :range_id ";
+            `calendar_date_assignments`.`range_id` = :range_id
+            AND
+            `access` IN ( :access_levels ) ";
         if (!$with_declined) {
             $sql .= "AND `calendar_date_assignments`.`participation` <> 'DECLINED' ";
         }
-        $sql .= "AND (
-                `calendar_dates`.`begin` BETWEEN :begin AND :end
-                OR
-                (`calendar_dates`.`begin` <= :end AND `calendar_dates`.`repetition_type` <> ''
-                    AND `calendar_dates`.`repetition_end` > :begin)
-                OR
-                :begin BETWEEN `calendar_dates`.`begin` AND `calendar_dates`.`end`
-            )
-            AND
-            `access` IN ( :access_levels )
-            ORDER BY `calendar_dates`.`begin` ASC";
+        $sql_single = $sql . " AND
+                `calendar_dates`.`begin` < :end  AND :begin < `calendar_dates`.`end`
+            ";
 
-        $events = self::findBySql($sql, [
+        $events = self::findBySql($sql_single, [
             'range_id'      => $range_id,
             'begin'         => $begin->getTimestamp(),
             'end'           => $end->getTimestamp(),
             'access_levels' => $access_levels
         ]);
 
+
+        $sql_repetition = $sql . " AND `calendar_dates`.`begin` < :end AND `calendar_dates`.`repetition_type` IN ('DAYLY', 'WEEKLY', 'MONTHLY', 'YEARLY')
+                    AND `calendar_dates`.`repetition_end` > :begin
+            ";
+
+        $events = array_merge($events, self::findBySql($sql_repetition, [
+            'range_id'      => $range_id,
+            'begin'         => $begin->getTimestamp(),
+            'end'           => $end->getTimestamp(),
+            'access_levels' => $access_levels
+        ]));
+
         $m_start = clone $begin;
         $m_end = clone $end;
         $events_created = [];