Feedbacks | Events | guest events to not include following events | user/org events to include its repo/version events

Author: snyaggarwal

core/common/mixins.py

@@ -19,7 +19,7 @@
 from core.common.constants import HEAD, ACCESS_TYPE_NONE, INCLUDE_FACETS, \
     LIST_DEFAULT_LIMIT, HTTP_COMPRESS_HEADER, CSV_DEFAULT_LIMIT, FACETS_ONLY, INCLUDE_RETIRED_PARAM, \
     SEARCH_STATS_ONLY, INCLUDE_SEARCH_STATS, UPDATED_BY_USERNAME_PARAM, CHECKSUM_STANDARD_HEADER, \
-    CHECKSUM_SMART_HEADER, SEARCH_LATEST_REPO_VERSION, SAME_STANDARD_CHECKSUM_ERROR
+    CHECKSUM_SMART_HEADER, SEARCH_LATEST_REPO_VERSION, SAME_STANDARD_CHECKSUM_ERROR, ACCESS_TYPE_VIEW, ACCESS_TYPE_EDIT
 from core.common.permissions import HasPrivateAccess, HasOwnership, CanViewConceptDictionary, \
     CanViewConceptDictionaryVersion
 from .checksums import ChecksumModel
@@ -508,6 +508,26 @@ def sources_url(self):
     def collections_url(self):
         return self.uri + 'collections/'
 
+    def get_repo_events(self, private=False):
+        def get_events_for(entity):
+            return entity.events.filter(public=True) if private else entity.events
+
+        queryset = self.__class__.objects.none()
+
+        sources = self.source_set.filter(is_active=True)
+        collections = self.collection_set.filter(is_active=True)
+
+        if not private:
+            sources = self.source_set.filter(public_access__in=[ACCESS_TYPE_VIEW, ACCESS_TYPE_EDIT])
+            collections = self.collection_set.filter(public_access__in=[ACCESS_TYPE_VIEW, ACCESS_TYPE_EDIT])
+
+        for source in sources:
+            queryset = queryset.union(get_events_for(source))
+        for collection in collections:
+            queryset = queryset.union(get_events_for(collection))
+
+        return queryset
+
 
 class SourceChildMixin(ChecksumModel):
     class Meta:

core/events/models.py

@@ -17,7 +17,7 @@ class Event(models.Model):
     FOLLOWED = 'Followed'
     UNFOLLOWED = 'Unfollowed'
     JOINED = 'Joined'
-    HIGHLIGHT_EVENT_TYPES = [CREATED, RELEASED, FOLLOWED]
+    HIGHLIGHT_EVENT_TYPES = [CREATED, RELEASED]
 
     @property
     def is_joined_ocl(self):
@@ -49,16 +49,17 @@ def get_events_for_following(cls, following_queryset, private=False, **event_kwa
     def get_user_organization_events(cls, user, private=False):
         queryset = cls.objects.none()
         for org in user.organizations.filter():
-            events = org.events
-            if not private:
-                events = events.filter(public=True)
-            queryset = queryset.union(events)
+            queryset = queryset.union(
+                org.events.filter(public=True) if private else org.events
+            ).union(org.get_repo_events(private))
+
         return queryset
 
     @classmethod
     def get_user_all_events(cls, user, private=False):
         return cls.get_user_organization_events(user, private).union(
-            cls.get_user_following_events(user, private))
+            cls.get_user_following_events(user, private)
+        ).union(user.get_repo_events(private))
 
     @property
     def type(self):