fix: use Forum v2 for learner threads to exclude deleted items from abuse count

Author: Alam-2U

lms/djangoapps/discussion/rest_api/api.py

@@ -1316,8 +1316,13 @@ def get_learner_active_thread_list(request, course_key, query_params):
         filtered_threads = []
         for thread in threads:
             try:
+                # Fetch thread with responses to recalculate abuse_flagged_count if needed
+                params = {}
+                if count_flagged and "abuse_flagged_count" in thread:
+                    params = {"with_responses": True, "recursive": False}
+
                 forum_thread = forum_api.get_thread(
-                    thread.get("id"), course_id=str(course_key)
+                    thread.get("id"), params=params, course_id=str(course_key)
                 )
                 is_deleted = forum_thread.get("is_deleted", False)
 
@@ -1327,6 +1332,20 @@ def get_learner_active_thread_list(request, course_key, query_params):
                     thread["deleted_by"] = forum_thread.get("deleted_by")
                     filtered_threads.append(thread)
                 elif not show_deleted and not is_deleted:
+                    # Fix abuse_flagged_count to exclude soft-deleted comments
+                    if count_flagged and "abuse_flagged_count" in thread:
+                        try:
+                            # Recalculate abuse count from Forum v2 data excluding soft-deleted items
+                            abuse_count = 0
+                            for response_type in ["endorsed_responses", "non_endorsed_responses", "children"]:
+                                if response_type in forum_thread:
+                                    for child in forum_thread.get(response_type, []):
+                                        if child.get("abuse_flaggers", []) and not child.get("is_deleted", False):
+                                            abuse_count += 1
+                            thread["abuse_flagged_count"] = abuse_count
+                        except (KeyError, TypeError):
+                            # If structure is unexpected, keep original count
+                            pass
                     filtered_threads.append(thread)
             except Exception as e:  # pylint: disable=broad-exception-caught
                 log.warning(