From 86e61c7ace453dad2d1050056967fd59ffe7a870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Ho=CC=88=C3=9Fl?= <tobias@hoessl.eu>
Date: Sat, 12 Oct 2024 13:38:11 +0200
Subject: [PATCH 1/3] Begin fix for private comment caching

---
 controllers/ConsultationController.php        | 17 +++---
 models/db/AmendmentComment.php                | 39 ------------
 models/db/MotionComment.php                   | 38 ------------
 models/db/User.php                            | 39 ++++++++++++
 views/consultation/LayoutHelper.php           |  7 +--
 .../_index_private_comment_list.php           | 61 +++++++++++++++++++
 views/consultation/index_layout_tags.php      |  7 +--
 views/consultation/tag_motion_list.php        |  9 ++-
 8 files changed, 120 insertions(+), 97 deletions(-)
 create mode 100644 views/consultation/_index_private_comment_list.php

diff --git a/controllers/ConsultationController.php b/controllers/ConsultationController.php
index 4ad5130e9f..b402f28020 100644
--- a/controllers/ConsultationController.php
+++ b/controllers/ConsultationController.php
@@ -312,20 +312,15 @@ public function actionIndex(): ResponseInterface
         $this->consultationSidebar($this->consultation);
 
         $myself = User::getCurrentUser();
-        if ($myself) {
-            $myMotions    = $myself->getMySupportedMotionsByConsultation($this->consultation);
-            $myAmendments = $myself->getMySupportedAmendmentsByConsultation($this->consultation);
-        } else {
-            $myMotions    = null;
-            $myAmendments = null;
-        }
 
         return new HtmlResponse($this->render('index', [
             'cache' => $cache,
             'consultation' => $this->consultation,
             'myself' => $myself,
-            'myMotions' => $myMotions,
-            'myAmendments' => $myAmendments,
+            'myMotions' => $myself?->getMySupportedMotionsByConsultation($this->consultation),
+            'myAmendments' => $myself?->getMySupportedAmendmentsByConsultation($this->consultation),
+            'myMotionComments' => $myself?->getMyPrivatelyCommentedMotionsByConsultation($this->consultation),
+            'myAmendmentComments' => $myself?->getMyPrivatelyCommentedAmendmentsByConsultation($this->consultation),
         ]));
     }
 
@@ -593,10 +588,14 @@ private function tagMotionResolutionList(int $tagId, bool $isResolutionList): Re
             return new HtmlErrorResponse(404, 'Tag not found');
         }
 
+        $myself = User::getCurrentUser();
+
         return new HtmlResponse($this->render('tag_motion_list', [
             'tag' => $tag,
             'cache' => LayoutHelper::getTagMotionListCache($this->consultation, $tag, $isResolutionList),
             'isResolutionList' => $isResolutionList,
+            'myMotionComments' => $myself?->getMyPrivatelyCommentedMotionsByConsultation($this->consultation),
+            'myAmendmentComments' => $myself?->getMyPrivatelyCommentedAmendmentsByConsultation($this->consultation),
         ]));
     }
 
diff --git a/models/db/AmendmentComment.php b/models/db/AmendmentComment.php
index c25e6ff065..2b55a5715e 100644
--- a/models/db/AmendmentComment.php
+++ b/models/db/AmendmentComment.php
@@ -121,45 +121,6 @@ public static function getNewestByConsultation(Consultation $consultation, int $
         }));
     }
 
-    private static array $cachedComments = [];
-
-    /**
-     * @return AmendmentComment[][]
-     */
-    public static function getAllForUserAndConsultationByMotion(Consultation $consultation, ?User $user, int $status): array
-    {
-        if (!$user) {
-            return [];
-        }
-
-        $key = $user->id . '.' . $status;
-        if (isset(self::$cachedComments[$key])) {
-            return self::$cachedComments[$key];
-        }
-
-        $invisibleStatuses = array_map('intval', $consultation->getStatuses()->getInvisibleMotionStatuses());
-        /** @var AmendmentComment[] $allComments */
-        $allComments = static::find()->joinWith('amendment', true)->joinWith('amendment.motionJoin', true)
-            ->where('amendmentComment.status = ' . intval($status))
-            ->andWhere('amendmentComment.userId = ' . intval($user->id))
-            ->andWhere('amendment.status NOT IN (' . implode(', ', $invisibleStatuses) . ')')
-            ->andWhere('motion.status NOT IN (' . implode(', ', $invisibleStatuses) . ')')
-            ->andWhere('motion.consultationId = ' . intval($consultation->id))
-            ->orderBy('amendmentComment.paragraph')
-            ->all();
-
-        $byAmendment = [];
-        foreach ($allComments as $comment) {
-            if (!isset($byAmendment[$comment->amendmentId])) {
-                $byAmendment[$comment->amendmentId] = [];
-            }
-            $byAmendment[$comment->amendmentId][] = $comment;
-        }
-
-        self::$cachedComments[$key] = $byAmendment;
-        return $byAmendment;
-    }
-
     public function getMotionTitle(): string
     {
         $amendment = $this->getIMotion();
diff --git a/models/db/MotionComment.php b/models/db/MotionComment.php
index 6e2ff9ad77..ccb07d038f 100644
--- a/models/db/MotionComment.php
+++ b/models/db/MotionComment.php
@@ -126,44 +126,6 @@ public static function getNewestByConsultation(Consultation $consultation, int $
         }));
     }
 
-    private static array $cachedComments = [];
-
-    /**
-     * @return MotionComment[][]
-     */
-    public static function getAllForUserAndConsultationByMotion(Consultation $consultation, ?User $user, int $status): array
-    {
-        if (!$user) {
-            return [];
-        }
-
-        $key = $user->id . '.' . $status;
-        if (isset(self::$cachedComments[$key])) {
-            return self::$cachedComments[$key];
-        }
-
-        $invisibleStatuses = array_map('intval', $consultation->getStatuses()->getInvisibleMotionStatuses());
-        /** @var MotionComment[] $allComments */
-        $allComments = static::find()->joinWith('motion', true)
-            ->where('motionComment.status = ' . intval($status))
-            ->andWhere('motionComment.userId = ' . intval($user->id))
-            ->andWhere('motion.status NOT IN (' . implode(', ', $invisibleStatuses) . ')')
-            ->andWhere('motion.consultationId = ' . intval($consultation->id))
-            ->orderBy('motionComment.paragraph')
-            ->all();
-
-        $byMotion = [];
-        foreach ($allComments as $comment) {
-            if (!isset($byMotion[$comment->motionId])) {
-                $byMotion[$comment->motionId] = [];
-            }
-            $byMotion[$comment->motionId][] = $comment;
-        }
-
-        self::$cachedComments[$key] = $byMotion;
-        return $byMotion;
-    }
-
     public function getConsultation(): ?Consultation
     {
         $motion = $this->getIMotion();
diff --git a/models/db/User.php b/models/db/User.php
index d4542931fd..bf957a64ef 100644
--- a/models/db/User.php
+++ b/models/db/User.php
@@ -583,6 +583,45 @@ public function getMySupportedAmendmentsByConsultation(Consultation $consultatio
         return $supporters;
     }
 
+    /**
+     * @return MotionComment[]
+     */
+    public function getMyPrivatelyCommentedMotionsByConsultation(Consultation $consultation): array
+    {
+        $query = MotionComment::find();
+        $query->innerJoin(
+            'motion',
+            'motionComment.motionId = motion.id'
+        );
+        $query->where('motion.status != ' . intval(Motion::STATUS_DELETED));
+        $query->andWhere('motion.consultationId = ' . intval($consultation->id));
+        $query->andWhere('motionComment.userId = ' . intval($this->id));
+        $query->andWhere('motionComment.status = ' . MotionComment::STATUS_PRIVATE);
+        $query->orderBy('motion.titlePrefix ASC, motion.dateCreation DESC, motion.id DESC');
+
+        return $query->all();
+    }
+
+    /**
+     * @return AmendmentComment[]
+     */
+    public function getMyPrivatelyCommentedAmendmentsByConsultation(Consultation $consultation): array
+    {
+        $query     = AmendmentComment::find();
+        $query->innerJoin(
+            'amendment',
+            'amendmentComment.amendmentId = amendment.id'
+        );
+        $query->innerJoin('motion', 'motion.id = amendment.motionId');
+        $query->where('motion.status != ' . IntVal(Motion::STATUS_DELETED));
+        $query->andWhere('amendment.status != ' . IntVal(Motion::STATUS_DELETED));
+        $query->andWhere('motion.consultationId = ' . IntVal($consultation->id));
+        $query->andWhere('amendmentComment.userId = ' . IntVal($this->id));
+        $query->andWhere('amendmentComment.status = ' . AmendmentComment::STATUS_PRIVATE);
+        $query->orderBy('motion.titlePrefix ASC, amendment.titlePrefix ASC, amendment.dateCreation DESC');
+
+        return $query->all();
+    }
 
     public function getNotificationUnsubscribeCode(): string
     {
diff --git a/views/consultation/LayoutHelper.php b/views/consultation/LayoutHelper.php
index da5b26520b..ac8f90c98d 100644
--- a/views/consultation/LayoutHelper.php
+++ b/views/consultation/LayoutHelper.php
@@ -96,9 +96,7 @@ public static function flushViewCaches(Consultation $consultation): void
     private static function getMotionLineContent(Motion $motion, Consultation $consultation): string
     {
         $return = '<p class="title">' . "\n";
-
-        $privateMotionComments = MotionComment::getAllForUserAndConsultationByMotion($consultation, User::getCurrentUser(), MotionComment::STATUS_PRIVATE);
-        $return .= LayoutHelper::getPrivateCommentIndicator($motion, $privateMotionComments, []);
+        $return .= '<span class="privateCommentHolder"></span>';
 
         $motionUrl = UrlHelper::createMotionUrl($motion);
         $return    .= '<a href="' . Html::encode($motionUrl) . '" class="motionLink' . $motion->id . '">';
@@ -157,8 +155,7 @@ private static function getAmendmentLineContent(Amendment $amendment): string
         $return = '';
 
         $consultation = $amendment->getMyConsultation();
-        $privateAmendmentComments = AmendmentComment::getAllForUserAndConsultationByMotion($consultation, User::getCurrentUser(), AmendmentComment::STATUS_PRIVATE);
-        $return .= LayoutHelper::getPrivateCommentIndicator($amendment, [], $privateAmendmentComments);
+        $return .= '<span class="privateCommentHolder"></span>';
 
         $title  = ($amendment->showTitlePrefix() ? $amendment->getFormattedTitlePrefix() : \Yii::t('amend', 'amendment'));
         $return .= '<a href="' . Html::encode(UrlHelper::createAmendmentUrl($amendment)) . '" ' .
diff --git a/views/consultation/_index_private_comment_list.php b/views/consultation/_index_private_comment_list.php
new file mode 100644
index 0000000000..0954cfd590
--- /dev/null
+++ b/views/consultation/_index_private_comment_list.php
@@ -0,0 +1,61 @@
+<?php
+
+use app\models\db\{AmendmentComment, MotionComment};
+use yii\helpers\Html;
+
+/**
+ * @var MotionComment[] $myMotionComments
+ * @var AmendmentComment[] $myAmendmentComments
+ */
+
+if (count($myMotionComments) === 0 && count($myAmendmentComments) === 0) {
+    return;
+}
+
+$motionComments = [];
+foreach ($myMotionComments as $comment) {
+    if (!isset($motionComments[$comment->motionId])) {
+        $motionComments[$comment->motionId] = [];
+    }
+    if ($comment->paragraph === -1) {
+        $motionComments[$comment->motionId][] = $comment->text;
+    } else {
+        $motionComments[$comment->motionId][] = str_replace('%NO%', (string) $comment->paragraph, Yii::t('motion', 'private_notes_para')) .
+                   ': ' . $comment->text;
+    }
+}
+
+$amendmentComments = [];
+foreach ($myAmendmentComments as $comment) {
+    if (!isset($amendmentComments[$comment->amendmentId])) {
+        $amendmentComments[$comment->amendmentId] = [];
+    }
+    if ($comment->paragraph === -1) {
+        $amendmentComments[$comment->amendmentId][] = $comment->text;
+    } else {
+        $amendmentComments[$comment->amendmentId][] = str_replace('%NO%', (string) $comment->paragraph, Yii::t('motion', 'private_notes_para')) .
+                                                ': ' . $comment->text;
+    }
+}
+
+echo '<div class="hidden privateCommentList">';
+foreach ($motionComments as $motionId => $commentTexts) {
+    $tooltip = Html::encode(implode(" - ", $commentTexts));
+
+    echo '<a href="#" class="privateCommentsIndicator" data-target-type="motion" data-target-id="' . $motionId . '">';
+    echo '<span class="glyphicon glyphicon-pushpin" data-toggle="tooltip" data-placement="right" ' .
+            'aria-label="' . Html::encode(Yii::t('base', 'aria_tooltip')) . ': ' . $tooltip . '" ' .
+            'data-original-title="' . $tooltip . '"></span>';
+    echo '</a>';
+}
+
+foreach ($amendmentComments as $amendmentId => $commentTexts) {
+    $tooltip = Html::encode(implode(" - ", $commentTexts));
+
+    echo '<a href="#" class="privateCommentsIndicator" data-target-type="amendment" data-target-id="' . $amendmentId . '">';
+    echo '<span class="glyphicon glyphicon-pushpin" data-toggle="tooltip" data-placement="right" ' .
+            'aria-label="' . Html::encode(Yii::t('base', 'aria_tooltip')) . ': ' . $tooltip . '" ' .
+            'data-original-title="' . $tooltip . '"></span>';
+    echo '</a>';
+}
+echo '</div>';
diff --git a/views/consultation/index_layout_tags.php b/views/consultation/index_layout_tags.php
index 7c104e5b87..3b2e2e007a 100644
--- a/views/consultation/index_layout_tags.php
+++ b/views/consultation/index_layout_tags.php
@@ -73,8 +73,6 @@
 /** @var int[] $tagIds */
 $tagIds = [];
 $hasNoTagMotions = false;
-$privateMotionComments = MotionComment::getAllForUserAndConsultationByMotion($consultation, User::getCurrentUser(), MotionComment::STATUS_PRIVATE);
-$privateAmendmentComments = AmendmentComment::getAllForUserAndConsultationByMotion($consultation, User::getCurrentUser(), AmendmentComment::STATUS_PRIVATE);
 
 $layout->addOnLoadJS('$(\'[data-toggle="tooltip"]\').tooltip();');
 
@@ -177,14 +175,13 @@
         if ($imotion->isInScreeningProcess()) {
             $classes[] = 'unscreened';
         }
-        $privateComment = LayoutHelper::getPrivateCommentIndicator($imotion, $privateMotionComments, $privateAmendmentComments);
         echo '<tr class="' . implode(' ', $classes) . '">';
         if (!$consultation->getSettings()->hideTitlePrefix) {
-            echo '<td class="prefixCol">' . $privateComment . Html::encode($imotion->getFormattedTitlePrefix(LayoutHooks::CONTEXT_MOTION_LIST)) . '</td>';
+            echo '<td class="prefixCol"><span class="privateCommentHolder"></span>' . Html::encode($imotion->getFormattedTitlePrefix(LayoutHooks::CONTEXT_MOTION_LIST)) . '</td>';
         }
         echo '<td class="titleCol">';
         if ($consultation->getSettings()->hideTitlePrefix) {
-            echo $privateComment;
+            echo '<span class="privateCommentHolder"></span>';
         }
         echo '<div class="titleLink">';
         if (is_a($imotion, Amendment::class)) {
diff --git a/views/consultation/tag_motion_list.php b/views/consultation/tag_motion_list.php
index 6745ecf631..845639fde8 100644
--- a/views/consultation/tag_motion_list.php
+++ b/views/consultation/tag_motion_list.php
@@ -1,6 +1,6 @@
 <?php
 
-use app\models\db\{ConsultationSettingsTag, IMotion};
+use app\models\db\{AmendmentComment, ConsultationSettingsTag, IMotion, MotionComment};
 use app\components\{MotionSorter, UrlHelper};
 use yii\helpers\Html;
 use app\models\settings\{Consultation as ConsultationSettings};
@@ -10,6 +10,8 @@
  * @var ConsultationSettingsTag $tag
  * @var \app\components\HashedStaticCache $cache
  * @var bool $isResolutionList
+ * @var MotionComment[] $myMotionComments
+ * @var AmendmentComment[] $myAmendmentComments
  */
 
 /** @var \app\controllers\Base $controller */
@@ -80,3 +82,8 @@
     }
     return $output;
 });
+
+echo $this->render('_index_private_comment_list', [
+    'myMotionComments' => $myMotionComments,
+    'myAmendmentComments' => $myAmendmentComments,
+]);

From 3cda1c6d8bbd25b603e5f304246d030442f877cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Ho=CC=88=C3=9Fl?= <tobias@hoessl.eu>
Date: Sat, 12 Oct 2024 14:32:03 +0200
Subject: [PATCH 2/3] Fix caching for private comments

---
 models/db/User.php                            |  4 +--
 .../_index_private_comment_list.php           |  2 +-
 views/consultation/index.php                  |  9 +++++-
 views/consultation/index_layout_tags.php      |  7 +++--
 .../frontend/MotionListPrivateComments.js     |  2 ++
 .../frontend/MotionListPrivateComments.js.map |  1 +
 .../frontend/MotionListPrivateComments.ts     | 28 +++++++++++++++++++
 7 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 web/js/build/frontend/MotionListPrivateComments.js
 create mode 100644 web/js/build/frontend/MotionListPrivateComments.js.map
 create mode 100644 web/typescript/frontend/MotionListPrivateComments.ts

diff --git a/models/db/User.php b/models/db/User.php
index bf957a64ef..a7e8d34424 100644
--- a/models/db/User.php
+++ b/models/db/User.php
@@ -597,7 +597,7 @@ public function getMyPrivatelyCommentedMotionsByConsultation(Consultation $consu
         $query->andWhere('motion.consultationId = ' . intval($consultation->id));
         $query->andWhere('motionComment.userId = ' . intval($this->id));
         $query->andWhere('motionComment.status = ' . MotionComment::STATUS_PRIVATE);
-        $query->orderBy('motion.titlePrefix ASC, motion.dateCreation DESC, motion.id DESC');
+        $query->orderBy('motion.titlePrefix ASC, motion.dateCreation DESC, motion.id DESC, motionComment.paragraph ASC');
 
         return $query->all();
     }
@@ -618,7 +618,7 @@ public function getMyPrivatelyCommentedAmendmentsByConsultation(Consultation $co
         $query->andWhere('motion.consultationId = ' . IntVal($consultation->id));
         $query->andWhere('amendmentComment.userId = ' . IntVal($this->id));
         $query->andWhere('amendmentComment.status = ' . AmendmentComment::STATUS_PRIVATE);
-        $query->orderBy('motion.titlePrefix ASC, amendment.titlePrefix ASC, amendment.dateCreation DESC');
+        $query->orderBy('motion.titlePrefix ASC, amendment.titlePrefix ASC, amendment.dateCreation DESC, amendmentComment.paragraph ASC');
 
         return $query->all();
     }
diff --git a/views/consultation/_index_private_comment_list.php b/views/consultation/_index_private_comment_list.php
index 0954cfd590..42ae8b380f 100644
--- a/views/consultation/_index_private_comment_list.php
+++ b/views/consultation/_index_private_comment_list.php
@@ -38,7 +38,7 @@
     }
 }
 
-echo '<div class="hidden privateCommentList">';
+echo '<div class="hidden privateCommentList" data-antragsgruen-widget="frontend/MotionListPrivateComments">';
 foreach ($motionComments as $motionId => $commentTexts) {
     $tooltip = Html::encode(implode(" - ", $commentTexts));
 
diff --git a/views/consultation/index.php b/views/consultation/index.php
index feaddf6568..75a232a72d 100644
--- a/views/consultation/index.php
+++ b/views/consultation/index.php
@@ -1,6 +1,6 @@
 <?php
 
-use app\models\db\{Amendment, AmendmentSupporter, Consultation, Motion, MotionSupporter, User};
+use app\models\db\{Amendment, AmendmentComment, AmendmentSupporter, Consultation, Motion, MotionComment, MotionSupporter, User};
 use app\components\{HashedStaticCache, MotionSorter, UrlHelper};
 use app\models\settings\{Privileges, Consultation as ConsultationSettings};
 use yii\helpers\Html;
@@ -12,6 +12,8 @@
  * @var User|null $myself
  * @var MotionSupporter[] $myMotions
  * @var AmendmentSupporter[] $myAmendments
+ * @var MotionComment[] $myMotionComments
+ * @var AmendmentComment[] $myAmendmentComments
  * @var HashedStaticCache $cache
  */
 
@@ -170,3 +172,8 @@
     }
     return $output;
 });
+
+echo $this->render('_index_private_comment_list', [
+    'myMotionComments' => $myMotionComments,
+    'myAmendmentComments' => $myAmendmentComments,
+]);
diff --git a/views/consultation/index_layout_tags.php b/views/consultation/index_layout_tags.php
index 3b2e2e007a..02e3458f84 100644
--- a/views/consultation/index_layout_tags.php
+++ b/views/consultation/index_layout_tags.php
@@ -161,8 +161,11 @@
     }
     echo '</tr></thead>';
     foreach ($sortedIMotions as $imotion) {
-        /** @var IMotion $imotion */
-        $classes = ['motion'];
+        if (is_a($imotion, Motion::class)) {
+            $classes = ['motion', 'motionRow' . $imotion->id];
+        } else {
+            $classes = ['motion', 'amendmentRow' . $imotion->id];
+        }
         if ($imotion->getMyMotionType()->getSettingsObj()->cssIcon) {
             $classes[] = $imotion->getMyMotionType()->getSettingsObj()->cssIcon;
         }
diff --git a/web/js/build/frontend/MotionListPrivateComments.js b/web/js/build/frontend/MotionListPrivateComments.js
new file mode 100644
index 0000000000..d87f72495b
--- /dev/null
+++ b/web/js/build/frontend/MotionListPrivateComments.js
@@ -0,0 +1,2 @@
+define(["require","exports"],(function(e,t){"use strict";Object.defineProperty(t,"__esModule",{value:!0}),t.MotionListPrivateComments=void 0;t.MotionListPrivateComments=class{constructor(e){this.$element=e;e[0].childNodes.forEach((e=>{if(e.nodeType!==Node.ELEMENT_NODE)return;const t=e,o="."+t.attributes["data-target-type"].value+"Row"+t.attributes["data-target-id"].value;document.querySelectorAll(o).forEach((t=>{const o=t.querySelector(".privateCommentHolder");if(!o)return;const r=e.cloneNode(!0),i=t.querySelector(".titleLink a");i&&r.setAttribute("href",i.getAttribute("href")),o.parentNode.insertBefore(r,o),o.parentNode.removeChild(o),$(r).find('[data-toggle="tooltip"]').tooltip()}))}))}}}));
+//# sourceMappingURL=MotionListPrivateComments.js.map
diff --git a/web/js/build/frontend/MotionListPrivateComments.js.map b/web/js/build/frontend/MotionListPrivateComments.js.map
new file mode 100644
index 0000000000..391362ae6d
--- /dev/null
+++ b/web/js/build/frontend/MotionListPrivateComments.js.map
@@ -0,0 +1 @@
+{"version":3,"sources":["frontend/MotionListPrivateComments.js","frontend/MotionListPrivateComments.ts"],"names":["define","require","exports","Object","defineProperty","value","MotionListPrivateComments","constructor","$element","this","childNodes","forEach","comment","nodeType","Node","ELEMENT_NODE","commentNode","selector","attributes","document","querySelectorAll","motionRow","commentHolder","querySelector","clonedComment","cloneNode","link","setAttribute","getAttribute","parentNode","insertBefore","removeChild","$","find","tooltip"],"mappings":"AAAAA,OAAO,CAAC,UAAW,YAAY,SAAUC,EAASC,GAC9C,aACAC,OAAOC,eAAeF,EAAS,aAAc,CAAEG,OAAO,IACtDH,EAAQI,+BAA4B,ECHxCJ,EAAAI,0BAAA,MACI,WAAAC,CAAoBC,GAAAC,KAAAD,SAAAA,EACDA,EAAS,GACjBE,WAAWC,SAAQC,IACtB,GAAIA,EAAQC,WAAaC,KAAKC,aAC1B,OAEJ,MAAMC,EAAcJ,EACdK,EAAW,IAAMD,EAAYE,WAAW,oBAAoBb,MAAQ,MAAQW,EAAYE,WAAW,kBAAkBb,MAC3Hc,SAASC,iBAAiBH,GAAUN,SAAQU,IACxC,MAAMC,EAAgBD,EAAUE,cAAc,yBAC9C,IAAKD,EACD,OAEJ,MAAME,EAAgBZ,EAAQa,WAAU,GAClCC,EAAOL,EAAUE,cAAc,gBACjCG,GACAF,EAAcG,aAAa,OAAQD,EAAKE,aAAa,SAGzDN,EAAcO,WAAWC,aAAaN,EAAeF,GACrDA,EAAcO,WAAWE,YAAYT,GAErCU,EAAER,GAAeS,KAAK,2BAA6BC,SAAS,GAC9D,GAEV,EDMJ","file":"MotionListPrivateComments.js","sourcesContent":[null,"export class MotionListPrivateComments {\n    constructor(private $element: JQuery) {\n        const holder = $element[0];\n        holder.childNodes.forEach(comment => {\n            if (comment.nodeType !== Node.ELEMENT_NODE) {\n                return;\n            }\n            const commentNode = comment as HTMLElement;\n            const selector = '.' + commentNode.attributes['data-target-type'].value + 'Row' + commentNode.attributes['data-target-id'].value;\n            document.querySelectorAll(selector).forEach(motionRow => {\n                const commentHolder = motionRow.querySelector('.privateCommentHolder');\n                if (!commentHolder) {\n                    return;\n                }\n                const clonedComment = comment.cloneNode(true) as HTMLElement;\n                const link = motionRow.querySelector('.titleLink a');\n                if (link) {\n                    clonedComment.setAttribute('href', link.getAttribute('href'));\n                }\n\n                commentHolder.parentNode.insertBefore(clonedComment, commentHolder);\n                commentHolder.parentNode.removeChild(commentHolder);\n\n                $(clonedComment).find(\"[data-toggle=\\\"tooltip\\\"]\").tooltip();\n            });\n        });\n    }\n}\n"]}
\ No newline at end of file
diff --git a/web/typescript/frontend/MotionListPrivateComments.ts b/web/typescript/frontend/MotionListPrivateComments.ts
new file mode 100644
index 0000000000..25d831b511
--- /dev/null
+++ b/web/typescript/frontend/MotionListPrivateComments.ts
@@ -0,0 +1,28 @@
+export class MotionListPrivateComments {
+    constructor(private $element: JQuery) {
+        const holder = $element[0];
+        holder.childNodes.forEach(comment => {
+            if (comment.nodeType !== Node.ELEMENT_NODE) {
+                return;
+            }
+            const commentNode = comment as HTMLElement;
+            const selector = '.' + commentNode.attributes['data-target-type'].value + 'Row' + commentNode.attributes['data-target-id'].value;
+            document.querySelectorAll(selector).forEach(motionRow => {
+                const commentHolder = motionRow.querySelector('.privateCommentHolder');
+                if (!commentHolder) {
+                    return;
+                }
+                const clonedComment = comment.cloneNode(true) as HTMLElement;
+                const link = motionRow.querySelector('.titleLink a');
+                if (link) {
+                    clonedComment.setAttribute('href', link.getAttribute('href'));
+                }
+
+                commentHolder.parentNode.insertBefore(clonedComment, commentHolder);
+                commentHolder.parentNode.removeChild(commentHolder);
+
+                $(clonedComment).find("[data-toggle=\"tooltip\"]").tooltip();
+            });
+        });
+    }
+}

From 7ac4b2aa40224ed47889da8e725748acad4708a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20Ho=CC=88=C3=9Fl?= <tobias@hoessl.eu>
Date: Sat, 12 Oct 2024 17:00:35 +0200
Subject: [PATCH 3/3] Move methods to comment classes

---
 controllers/ConsultationController.php |  8 +++---
 models/db/AmendmentComment.php         | 28 ++++++++++++++++++
 models/db/MotionComment.php            | 26 +++++++++++++++++
 models/db/User.php                     | 40 --------------------------
 4 files changed, 58 insertions(+), 44 deletions(-)

diff --git a/controllers/ConsultationController.php b/controllers/ConsultationController.php
index b402f28020..f25c999fda 100644
--- a/controllers/ConsultationController.php
+++ b/controllers/ConsultationController.php
@@ -319,8 +319,8 @@ public function actionIndex(): ResponseInterface
             'myself' => $myself,
             'myMotions' => $myself?->getMySupportedMotionsByConsultation($this->consultation),
             'myAmendments' => $myself?->getMySupportedAmendmentsByConsultation($this->consultation),
-            'myMotionComments' => $myself?->getMyPrivatelyCommentedMotionsByConsultation($this->consultation),
-            'myAmendmentComments' => $myself?->getMyPrivatelyCommentedAmendmentsByConsultation($this->consultation),
+            'myMotionComments' => MotionComment::getPrivatelyCommentedByConsultation($myself, $this->consultation),
+            'myAmendmentComments' => AmendmentComment::getPrivatelyCommentedByConsultation($myself, $this->consultation),
         ]));
     }
 
@@ -594,8 +594,8 @@ private function tagMotionResolutionList(int $tagId, bool $isResolutionList): Re
             'tag' => $tag,
             'cache' => LayoutHelper::getTagMotionListCache($this->consultation, $tag, $isResolutionList),
             'isResolutionList' => $isResolutionList,
-            'myMotionComments' => $myself?->getMyPrivatelyCommentedMotionsByConsultation($this->consultation),
-            'myAmendmentComments' => $myself?->getMyPrivatelyCommentedAmendmentsByConsultation($this->consultation),
+            'myMotionComments' => MotionComment::getPrivatelyCommentedByConsultation($myself, $this->consultation),
+            'myAmendmentComments' => AmendmentComment::getPrivatelyCommentedByConsultation($myself, $this->consultation),
         ]));
     }
 
diff --git a/models/db/AmendmentComment.php b/models/db/AmendmentComment.php
index 2b55a5715e..35d6a9c29f 100644
--- a/models/db/AmendmentComment.php
+++ b/models/db/AmendmentComment.php
@@ -121,6 +121,34 @@ public static function getNewestByConsultation(Consultation $consultation, int $
         }));
     }
 
+    /**
+     * @return AmendmentComment[]
+     */
+    public static function getPrivatelyCommentedByConsultation(?User $user, Consultation $consultation): array
+    {
+        if (!$user) {
+            return [];
+        }
+
+        $query     = AmendmentComment::find();
+        $query->innerJoin(
+            'amendment',
+            'amendmentComment.amendmentId = amendment.id'
+        );
+        $query->innerJoin('motion', 'motion.id = amendment.motionId');
+        $query->where('motion.status != ' . IntVal(Motion::STATUS_DELETED));
+        $query->andWhere('amendment.status != ' . IntVal(Motion::STATUS_DELETED));
+        $query->andWhere('motion.consultationId = ' . IntVal($consultation->id));
+        $query->andWhere('amendmentComment.userId = ' . IntVal($user->id));
+        $query->andWhere('amendmentComment.status = ' . AmendmentComment::STATUS_PRIVATE);
+        $query->orderBy('motion.titlePrefix ASC, amendment.titlePrefix ASC, amendment.dateCreation DESC, amendmentComment.paragraph ASC');
+
+        /** @var AmendmentComment[] $comments */
+        $comments =  $query->all();
+
+        return $comments;
+    }
+
     public function getMotionTitle(): string
     {
         $amendment = $this->getIMotion();
diff --git a/models/db/MotionComment.php b/models/db/MotionComment.php
index ccb07d038f..de03c3a71d 100644
--- a/models/db/MotionComment.php
+++ b/models/db/MotionComment.php
@@ -126,6 +126,32 @@ public static function getNewestByConsultation(Consultation $consultation, int $
         }));
     }
 
+    /**
+     * @return MotionComment[]
+     */
+    public static function getPrivatelyCommentedByConsultation(?User $user, Consultation $consultation): array
+    {
+        if (!$user) {
+            return [];
+        }
+
+        $query = MotionComment::find();
+        $query->innerJoin(
+            'motion',
+            'motionComment.motionId = motion.id'
+        );
+        $query->where('motion.status != ' . intval(Motion::STATUS_DELETED));
+        $query->andWhere('motion.consultationId = ' . intval($consultation->id));
+        $query->andWhere('motionComment.userId = ' . intval($user->id));
+        $query->andWhere('motionComment.status = ' . MotionComment::STATUS_PRIVATE);
+        $query->orderBy('motion.titlePrefix ASC, motion.dateCreation DESC, motion.id DESC, motionComment.paragraph ASC');
+
+        /** @var MotionComment[] $comments */
+        $comments = $query->all();
+
+        return $comments;
+    }
+
     public function getConsultation(): ?Consultation
     {
         $motion = $this->getIMotion();
diff --git a/models/db/User.php b/models/db/User.php
index a7e8d34424..bf5d655f95 100644
--- a/models/db/User.php
+++ b/models/db/User.php
@@ -583,46 +583,6 @@ public function getMySupportedAmendmentsByConsultation(Consultation $consultatio
         return $supporters;
     }
 
-    /**
-     * @return MotionComment[]
-     */
-    public function getMyPrivatelyCommentedMotionsByConsultation(Consultation $consultation): array
-    {
-        $query = MotionComment::find();
-        $query->innerJoin(
-            'motion',
-            'motionComment.motionId = motion.id'
-        );
-        $query->where('motion.status != ' . intval(Motion::STATUS_DELETED));
-        $query->andWhere('motion.consultationId = ' . intval($consultation->id));
-        $query->andWhere('motionComment.userId = ' . intval($this->id));
-        $query->andWhere('motionComment.status = ' . MotionComment::STATUS_PRIVATE);
-        $query->orderBy('motion.titlePrefix ASC, motion.dateCreation DESC, motion.id DESC, motionComment.paragraph ASC');
-
-        return $query->all();
-    }
-
-    /**
-     * @return AmendmentComment[]
-     */
-    public function getMyPrivatelyCommentedAmendmentsByConsultation(Consultation $consultation): array
-    {
-        $query     = AmendmentComment::find();
-        $query->innerJoin(
-            'amendment',
-            'amendmentComment.amendmentId = amendment.id'
-        );
-        $query->innerJoin('motion', 'motion.id = amendment.motionId');
-        $query->where('motion.status != ' . IntVal(Motion::STATUS_DELETED));
-        $query->andWhere('amendment.status != ' . IntVal(Motion::STATUS_DELETED));
-        $query->andWhere('motion.consultationId = ' . IntVal($consultation->id));
-        $query->andWhere('amendmentComment.userId = ' . IntVal($this->id));
-        $query->andWhere('amendmentComment.status = ' . AmendmentComment::STATUS_PRIVATE);
-        $query->orderBy('motion.titlePrefix ASC, amendment.titlePrefix ASC, amendment.dateCreation DESC, amendmentComment.paragraph ASC');
-
-        return $query->all();
-    }
-
     public function getNotificationUnsubscribeCode(): string
     {
         return $this->id . '-' . $this->createConfirmationCode('unsubscribe');