apps/moderatorfeedback: add ai_report serialiser

adhocracy-plus/config/urls.py

@@ -30,6 +30,7 @@
 from apps.interactiveevents.api import LikesViewSet
 from apps.interactiveevents.api import LiveQuestionViewSet
 from apps.interactiveevents.routers import LikesDefaultRouter
+from apps.moderatorfeedback.api import AiCommentFeedbackViewSet
 from apps.moderatorfeedback.api import CommentWithFeedbackViewSet
 from apps.moderatorfeedback.api import ModeratorCommentFeedbackViewSet
 from apps.moderatorremark.api import ModeratorRemarkViewSet
@@ -86,6 +87,7 @@
 comment_router.register(
     r"moderatorfeedback", ModeratorCommentFeedbackViewSet, basename="moderatorfeedback"
 )
+comment_router.register(r"aicomments", AiCommentFeedbackViewSet, basename="aicomments")
 
 urlpatterns = [
     # General platform urls

apps/ai_reports/models.py

@@ -14,3 +14,6 @@ class AiReport(TimeStampedModel):
         on_delete=models.CASCADE,
         related_name="ai_report",
     )
+
+    def __str__(self):
+        return "%s" % (self.explanation)

apps/ai_reports/serializers.py

@@ -0,0 +1,13 @@
+from rest_framework import serializers
+
+from apps.ai_reports.models import AiReport
+
+
+class AiReportSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = AiReport
+        fields = (
+            "explanation",
+            "category",
+            "comment",
+        )

apps/moderatorfeedback/api.py

@@ -4,6 +4,8 @@
 from adhocracy4.api.mixins import CommentMixin
 from adhocracy4.api.permissions import ViewSetRulesPermission
 from adhocracy4.comments_async import api as a4_api
+from apps.ai_reports.models import AiReport
+from apps.ai_reports.serializers import AiReportSerializer
 from apps.moderatorfeedback.models import ModeratorCommentFeedback
 from apps.moderatorfeedback.serializers import ModeratorCommentFeedbackSerializer
 from apps.moderatorfeedback.serializers import ThreadListSerializer
@@ -28,6 +30,21 @@ def get_queryset(self):
         return ModeratorCommentFeedback.objects.filter(comment=self.comment)
 
 
+class AiCommentFeedbackViewSet(
+    CommentMixin,
+    mixins.ListModelMixin,
+    viewsets.GenericViewSet,
+):
+    serializer_class = AiReportSerializer
+    permission_classes = (ViewSetRulesPermission,)
+
+    def get_permission_object(self):
+        return self.comment
+
+    def get_queryset(self):
+        return AiReport.objects.filter(comment=self.comment)
+
+
 class CommentWithFeedbackViewSet(a4_api.CommentViewSet):
     def get_serializer_class(self):
         if self.action == "list":

apps/moderatorfeedback/serializers.py

@@ -34,6 +34,7 @@ def get_last_edit(self, feedback):
 
 class CommentWithFeedbackSerializer(a4_serializers.CommentSerializer):
     moderator_feedback = ModeratorCommentFeedbackSerializer(read_only=True)
+    ai_report = serializers.StringRelatedField(read_only=True)
 
     class Meta:
         model = Comment

apps/userdashboard/api.py

@@ -76,13 +76,6 @@ def get_queryset(self):
             + Count("ai_report", distinct=True),
         )
 
-        reported_by = self.request.query_params.get("reported_by")
-
-        if reported_by == "ai":
-            comments = comments.filter(ai_report__isnull=False)
-        elif reported_by == "users":
-            comments = comments.filter(reports__isnull=False)
-
         return comments
 
     def update(self, request, *args, **kwargs):

changelog/7571.md

@@ -0,0 +1,3 @@
+### Added
+
+- Ai report serializer for comments viewset (#7571)

tests/moderatorfeedback/conftest.py

@@ -1,8 +1,10 @@
 from pytest_factoryboy import register
 
+from tests.ai_reports.factories import AiReportFactory
 from tests.ideas.factories import IdeaFactory
 
 from .factories import ModeratorCommentFeedbackFactory
 
+register(AiReportFactory)
 register(IdeaFactory)
 register(ModeratorCommentFeedbackFactory)

tests/moderatorfeedback/test_moderator_comment_feedback_api.py

@@ -4,6 +4,39 @@
 from apps.moderatorfeedback.models import ModeratorCommentFeedback
 
 
+@pytest.mark.django_db
+def test_moderator_and_ai_report_added_in_comment(
+    idea,
+    comment_factory,
+    apiclient,
+    moderator_comment_feedback_factory,
+    ai_report_factory,
+):
+    comment = comment_factory(content_object=idea)
+    feedback = moderator_comment_feedback_factory(
+        comment=comment,
+    )
+    assert feedback.project == comment.project
+
+    ai_report = ai_report_factory(comment=comment)
+    url = reverse(
+        "comments-detail",
+        kwargs={
+            "pk": comment.pk,
+            "content_type": comment.content_type.pk,
+            "object_pk": comment.object_pk,
+        },
+    )
+    response = apiclient.get(url)
+    assert (
+        feedback.feedback_text in response.data["moderator_feedback"]["feedback_text"]
+    )
+    assert comment.ai_report.explanation == ai_report.explanation
+
+    assert ai_report.explanation in response.data["ai_report"]
+    assert response.status_code == 200
+
+
 @pytest.mark.django_db
 def test_anonymous_cannot_add_feedback(apiclient, idea, comment_factory):
     comment = comment_factory(pk=1, content_object=idea)