Merge pull request #3217 from ResearchHub/financial-activity-scope

gzurowski · web-flow · commit 539e4ea0c60e · 2026-03-23T07:31:03.000+01:00
Add financial scope to activity feed
diff --git a/src/feed/tests/views/test_activity_feed_view.py b/src/feed/tests/views/test_activity_feed_view.py
@@ -1,4 +1,4 @@
-import uuid
+from decimal import Decimal
 
 from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
@@ -9,8 +9,13 @@
 from rest_framework.test import APIClient
 
 from feed.models import FeedEntry
+from purchase.models import Fundraise
 from purchase.related_models.grant_application_model import GrantApplication
 from purchase.related_models.grant_model import Grant
+from purchase.related_models.purchase_model import Purchase
+from purchase.related_models.usd_fundraise_contribution_model import (
+    UsdFundraiseContribution,
+)
 from researchhub_comment.constants.rh_comment_thread_types import (
     COMMUNITY_REVIEW,
     GENERIC_COMMENT,
@@ -28,19 +33,12 @@
 from researchhub_document.related_models.researchhub_unified_document_model import (
     ResearchhubUnifiedDocument,
 )
-from utils.test_helpers import AWSMockTestCase
+from utils.test_helpers import AWSMockTestCase, create_test_user
 
 User = get_user_model()
 ACTIVITY_LIST_URL = reverse("activity_feed-list")
 
 
-def _make_user(username=None):
-    return User.objects.create_user(
-        username=username or uuid.uuid4().hex,
-        password=uuid.uuid4().hex,
-    )
-
-
 def _make_feed_entry(
     content_type_model,
     object_id,
@@ -66,7 +64,7 @@ class ActivityFeedBaseTests(AWSMockTestCase):
 
     def setUp(self):
         super().setUp()
-        self.user = _make_user("activity_user")
+        self.user = create_test_user("activity_user")
         self.client = APIClient()
 
         self.prereg_doc = ResearchhubUnifiedDocument.objects.create(
@@ -194,7 +192,7 @@ class ActivityFeedGrantFilterTests(AWSMockTestCase):
 
     def setUp(self):
         super().setUp()
-        self.user = _make_user()
+        self.user = create_test_user()
         self.client = APIClient()
 
         # Grant document + post + Grant object
@@ -421,7 +419,7 @@ class ActivityFeedScopeGrantsTests(AWSMockTestCase):
 
     def setUp(self):
         super().setUp()
-        self.user = _make_user()
+        self.user = create_test_user()
         self.client = APIClient()
 
         # Grant A with an applied preregistration
@@ -590,7 +588,7 @@ class ActivityFeedActionDateOrderingTests(AWSMockTestCase):
 
     def setUp(self):
         super().setUp()
-        self.user = _make_user()
+        self.user = create_test_user()
         self.client = APIClient()
 
     def test_action_date_determines_order_not_created_date(self):
@@ -654,7 +652,7 @@ class ActivityFeedPeerReviewFilterTests(AWSMockTestCase):
 
     def setUp(self):
         super().setUp()
-        self.user = _make_user()
+        self.user = create_test_user()
         self.client = APIClient()
 
         self.doc = ResearchhubUnifiedDocument.objects.create(
@@ -787,3 +785,106 @@ def test_scope_peer_reviews_empty_when_none_exist(self):
         # Assert
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
         self.assertEqual(len(resp.data["results"]), 0)
+
+
+class ActivityFeedFinancialScopeTests(AWSMockTestCase):
+    """
+    Test financial scope returns fundraise contribution activities.
+    """
+
+    def setUp(self):
+        super().setUp()
+        self.user = create_test_user()
+        self.client = APIClient()
+
+        self.proposal_doc = ResearchhubUnifiedDocument.objects.create(
+            document_type=PREREGISTRATION,
+        )
+        self.proposal_post = ResearchhubPost.objects.create(
+            title="Funding Proposal",
+            created_by=self.user,
+            document_type=PREREGISTRATION,
+            unified_document=self.proposal_doc,
+        )
+        self.fundraise = Fundraise.objects.create(
+            unified_document=self.proposal_doc,
+            created_by=self.user,
+            goal_amount=Decimal("1000.00"),
+            goal_currency="USD",
+            status=Fundraise.OPEN,
+        )
+
+        fundraise_ct = ContentType.objects.get_for_model(Fundraise)
+        self.rsc_contribution = Purchase.objects.create(
+            user=self.user,
+            content_type=fundraise_ct,
+            object_id=self.fundraise.id,
+            purchase_type=Purchase.FUNDRAISE_CONTRIBUTION,
+            purchase_method=Purchase.OFF_CHAIN,
+            amount="100",
+        )
+        self.usd_contribution = UsdFundraiseContribution.objects.create(
+            user=self.user,
+            fundraise=self.fundraise,
+            amount_cents=5500,
+            fee_cents=495,
+            origin_fund_id="test-origin",
+            destination_org_id="test-destination",
+        )
+
+        self.rsc_entry = _make_feed_entry(
+            Purchase,
+            self.rsc_contribution.id,
+            self.proposal_doc,
+            user=self.user,
+        )
+        self.usd_entry = _make_feed_entry(
+            UsdFundraiseContribution,
+            self.usd_contribution.id,
+            self.proposal_doc,
+            user=self.user,
+        )
+
+        self.unrelated_doc = ResearchhubUnifiedDocument.objects.create(
+            document_type="DISCUSSION",
+        )
+        self.unrelated_post = ResearchhubPost.objects.create(
+            title="Unrelated Discussion",
+            created_by=self.user,
+            document_type="DISCUSSION",
+            unified_document=self.unrelated_doc,
+        )
+        self.unrelated_entry = _make_feed_entry(
+            ResearchhubPost,
+            self.unrelated_post.id,
+            self.unrelated_doc,
+            user=self.user,
+        )
+
+        post_ct = ContentType.objects.get_for_model(ResearchhubPost)
+        self.boost_purchase = Purchase.objects.create(
+            user=self.user,
+            content_type=post_ct,
+            object_id=self.unrelated_post.id,
+            purchase_type=Purchase.BOOST,
+            purchase_method=Purchase.OFF_CHAIN,
+            amount="10",
+        )
+        self.boost_entry = _make_feed_entry(
+            Purchase,
+            self.boost_purchase.id,
+            self.unrelated_doc,
+            user=self.user,
+        )
+
+    def test_scope_financial_includes_rsc_and_usd_contributions(self):
+        # Act
+        resp = self.client.get(ACTIVITY_LIST_URL, {"scope": "financial"})
+
+        # Assert
+        self.assertEqual(resp.status_code, status.HTTP_200_OK)
+        ids = {entry["id"] for entry in resp.data["results"]}
+        self.assertIn(self.rsc_entry.id, ids)
+        self.assertIn(self.usd_entry.id, ids)
+        self.assertNotIn(self.unrelated_entry.id, ids)
+        self.assertNotIn(self.boost_entry.id, ids)
diff --git a/src/feed/views/activity_feed_view.py b/src/feed/views/activity_feed_view.py
@@ -1,4 +1,5 @@
 from django.contrib.contenttypes.models import ContentType
+from django.db.models import Q
 from rest_framework.viewsets import ModelViewSet
 
 from feed.models import FeedEntry
@@ -7,6 +8,10 @@
 from feed.views.feed_view_mixin import FeedViewMixin
 from purchase.related_models.grant_application_model import GrantApplication
 from purchase.related_models.grant_model import Grant
+from purchase.related_models.purchase_model import Purchase
+from purchase.related_models.usd_fundraise_contribution_model import (
+    UsdFundraiseContribution,
+)
 from researchhub_comment.constants.rh_comment_thread_types import (
     COMMUNITY_REVIEW,
     PEER_REVIEW,
@@ -23,6 +28,8 @@ class ActivityFeedViewSet(FeedViewMixin, ModelViewSet):
       - scope: "grants" returns all activity across every grant and
         every preregistration that applied to any grant.
         "peer_reviews" returns only peer review comments.
+        "financial" returns only fundraise contribution activity
+        across RSC and USD contributions.
       - document_type: PREREGISTRATION, GRANT, etc.
       - grant_id: all activity on a grant and its applied preregistrations
       - content_type: RHCOMMENTMODEL, RESEARCHHUBPOST, PAPER, etc.
@@ -67,6 +74,8 @@ def get_queryset(self):
             queryset = self._filter_all_grants(queryset)
         elif scope == "peer_reviews":
             queryset = self._filter_peer_reviews(queryset)
+        elif scope == "financial":
+            queryset = self._filter_financial_activities(queryset)
         else:
             document_type = self.request.query_params.get("document_type")
             if document_type:
@@ -138,6 +147,27 @@ def _filter_peer_reviews(queryset):
             object_id__in=peer_review_ids,
         )
 
+    @staticmethod
+    def _filter_financial_activities(queryset):
+        """
+        Return feed entries for fundraise contributions.
+        """
+        purchase_type = ContentType.objects.get_for_model(Purchase)
+        usd_contribution_type = ContentType.objects.get_for_model(
+            UsdFundraiseContribution
+        )
+        contribution_purchase_ids = Purchase.objects.filter(
+            purchase_type=Purchase.FUNDRAISE_CONTRIBUTION
+        ).values_list("id", flat=True)
+
+        return queryset.filter(
+            Q(
+                content_type=purchase_type,
+                object_id__in=contribution_purchase_ids,
+            )
+            | Q(content_type=usd_contribution_type)
+        )
+
     @staticmethod
     def _filter_by_content_type(queryset, content_type_name):
         """Filter feed entries by the model name of their content_type."""
