Merge pull request #2466 from HyphaApp/fix/gh-2461-applicant-activity-feed

Fix Applicant Activity Feed(Review)

hypha/apply/activity/messaging.py

@@ -266,6 +266,7 @@ class ActivityAdapter(AdapterBase):
                 MESSAGES.APPROVE_PROJECT,
                 MESSAGES.REQUEST_PROJECT_CHANGE,
                 MESSAGES.SEND_FOR_APPROVAL,
+                MESSAGES.NEW_REVIEW,
         ]:
             return {'visibility': TEAM}
 

hypha/apply/activity/models.py

@@ -41,6 +41,15 @@ VISIBILITY = {
 
 class BaseActivityQuerySet(models.QuerySet):
     def visible_to(self, user):
+        # To hide reviews from the applicant's activity feed
+        # Todo: It is just for historic data and not be needed for new data after this.
+        from .messaging import ActivityAdapter
+        messages = ActivityAdapter.messages
+        if user.is_applicant:
+            return self.exclude(
+                message=messages.get(MESSAGES.NEW_REVIEW)
+            ).filter(visibility__in=self.model.visibility_for(user))
+
         return self.filter(visibility__in=self.model.visibility_for(user))
 
     def newer(self, activity):