renamed columns and tables in sql statements for the new calendar, fixes #3715

Closes #3715

Merge request studip/studip!2625

2 files changed, 9 insertions, 16 deletions

diff --git a/lib/classes/Score.class.php b/lib/classes/Score.class.php
index 51bd7dc..8f038f9 100644
--- a/lib/classes/Score.class.php
+++ b/lib/classes/Score.class.php
@@ -35,11 +35,12 @@ class Score
         }
 
         // Events
-        $query = "SELECT range_id as user_id, COUNT(*) AS eventcount
-                  FROM calendar_event
-                  INNER JOIN event_data ON (calendar_event.event_id = event_data.event_id AND class = 'PUBLIC')
-                  WHERE range_id IN (?) AND UNIX_TIMESTAMP() <= end
-                  GROUP BY range_id
+        $query = "SELECT `range_id` AS user_id, COUNT(*) AS eventcount
+                  FROM `calendar_date_assignments`
+                  INNER JOIN `calendar_dates`
+                  ON (`calendar_date_assignments`.`calendar_date_id` = `calendar_dates`.`id` AND `access` = 'PUBLIC')
+                  WHERE `range_id` IN (?) AND UNIX_TIMESTAMP() <= `end`
+                  GROUP BY `range_id`
                   ORDER BY NULL";
         $statement = DBManager::get()->prepare($query);
         $statement->execute([$user_ids]);
diff --git a/lib/models/User.class.php b/lib/models/User.class.php
index dfd4d18..79de864 100644
--- a/lib/models/User.class.php
+++ b/lib/models/User.class.php
@@ -1191,23 +1191,15 @@ class User extends AuthUserMd5 implements Range, PrivacyObject, Studip\Calendar\
         $statement->execute([$new_id, $old_id]);
 
         //Kalender
-        $query = "UPDATE IGNORE calendar_event SET range_id = ? WHERE range_id = ?";
+        $query = "UPDATE IGNORE `calendar_date_assignments` SET `range_id` = ? WHERE `range_id` = ?";
         $statement = DBManager::get()->prepare($query);
         $statement->execute([$new_id, $old_id]);
 
-        $query = "UPDATE IGNORE calendar_user SET owner_id = ? WHERE owner_id = ?";
+        $query = "UPDATE IGNORE `calendar_dates` SET `author_id` = ? WHERE `author_id` = ?";
         $statement = DBManager::get()->prepare($query);
         $statement->execute([$new_id, $old_id]);
 
-        $query = "UPDATE IGNORE calendar_user SET user_id = ? WHERE user_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        $query = "UPDATE IGNORE event_data SET author_id = ? WHERE author_id = ?";
-        $statement = DBManager::get()->prepare($query);
-        $statement->execute([$new_id, $old_id]);
-
-        $query = "UPDATE IGNORE event_data SET editor_id = ? WHERE editor_id = ?";
+        $query = "UPDATE IGNORE `calendar_dates` SET `editor_id` = ? WHERE `editor_id` = ?";
         $statement = DBManager::get()->prepare($query);
         $statement->execute([$new_id, $old_id]);