Adding blocked code project info to watched like and voted

taiga/users/serializers.py

@@ -198,6 +198,7 @@ class HighLightedContentSerializer(serializers.Serializer):
     project_name = serializers.SerializerMethodField("get_project_name")
     project_slug = serializers.SerializerMethodField("get_project_slug")
     project_is_private = serializers.SerializerMethodField("get_project_is_private")
+    project_blocked_code = serializers.SerializerMethodField("get_project_blocked_code")
 
     assigned_to_username = serializers.CharField()
     assigned_to_full_name = serializers.CharField()
@@ -245,6 +246,9 @@ class HighLightedContentSerializer(serializers.Serializer):
     def get_project_is_private(self, obj):
         return self._none_if_project(obj, "project_is_private")
 
+    def get_project_blocked_code(self, obj):
+        return self._none_if_not_project(obj, "project_blocked_code")
+
     def get_logo_small_url(self, obj):
         logo = self._none_if_not_project(obj, "logo")
         if logo:

taiga/users/services.py

@@ -322,7 +322,7 @@ def get_watched_list(for_user, from_user, type=None, q=None):
     -- BEGIN Basic info: we need to mix info from different tables and denormalize it
     SELECT entities.*,
            projects_project.name as project_name, projects_project.description as description, projects_project.slug as project_slug, projects_project.is_private as project_is_private,
-           projects_project.tags_colors, projects_project.logo,
+           projects_project.blocked_code as projects_project_blocked_code, projects_project.tags_colors, projects_project.logo,
            users_user.username assigned_to_username, users_user.full_name assigned_to_full_name, users_user.photo assigned_to_photo, users_user.email assigned_to_email
         FROM (
             {userstories_sql}
@@ -417,7 +417,7 @@ def get_liked_list(for_user, from_user, type=None, q=None):
     -- BEGIN Basic info: we need to mix info from different tables and denormalize it
     SELECT entities.*,
            projects_project.name as project_name, projects_project.description as description, projects_project.slug as project_slug, projects_project.is_private as project_is_private,
-           projects_project.tags_colors, projects_project.logo,
+           projects_project.blocked_code as projects_project_blocked_code, projects_project.tags_colors, projects_project.logo,
            users_user.username assigned_to_username, users_user.full_name assigned_to_full_name, users_user.photo assigned_to_photo, users_user.email assigned_to_email
         FROM (
             {projects_sql}
@@ -500,7 +500,7 @@ def get_voted_list(for_user, from_user, type=None, q=None):
     -- BEGIN Basic info: we need to mix info from different tables and denormalize it
     SELECT entities.*,
            projects_project.name as project_name, projects_project.description as description, projects_project.slug as project_slug, projects_project.is_private as project_is_private,
-           projects_project.tags_colors, projects_project.logo,
+           projects_project.blocked_code as projects_project_blocked_code, projects_project.tags_colors, projects_project.logo,
            users_user.username assigned_to_username, users_user.full_name assigned_to_full_name, users_user.photo assigned_to_photo, users_user.email assigned_to_email
         FROM (
             {userstories_sql}

tests/integration/test_users.py

@@ -498,6 +498,7 @@ def test_get_watched_list_valid_info_for_project():
     assert project_watch_info["project_name"] == None
     assert project_watch_info["project_slug"] == None
     assert project_watch_info["project_is_private"] == None
+    assert project_watch_info["project_blocked_code"] == None
     assert project_watch_info["assigned_to_username"] == None
     assert project_watch_info["assigned_to_full_name"] == None
     assert project_watch_info["assigned_to_photo"] == None
@@ -557,6 +558,7 @@ def test_get_liked_list_valid_info():
     assert project_like_info["project_name"] == None
     assert project_like_info["project_slug"] == None
     assert project_like_info["project_is_private"] == None
+    assert project_like_info["project_blocked_code"] == None
     assert project_like_info["assigned_to_username"] == None
     assert project_like_info["assigned_to_full_name"] == None
     assert project_like_info["assigned_to_photo"] == None
@@ -610,6 +612,7 @@ def test_get_watched_list_valid_info_for_not_project_types():
         assert instance_watch_info["project_name"] == instance.project.name
         assert instance_watch_info["project_slug"] == instance.project.slug
         assert instance_watch_info["project_is_private"] == instance.project.is_private
+        assert instance_watch_info["project_blocked_code"] == instance.project.blocked_code
         assert instance_watch_info["assigned_to_username"] == instance.assigned_to.username
         assert instance_watch_info["assigned_to_full_name"] == instance.assigned_to.full_name
         assert instance_watch_info["assigned_to_photo"] != ""
@@ -666,6 +669,7 @@ def test_get_voted_list_valid_info():
         assert instance_vote_info["project_name"] == instance.project.name
         assert instance_vote_info["project_slug"] == instance.project.slug
         assert instance_vote_info["project_is_private"] == instance.project.is_private
+        assert instance_vote_info["project_blocked_code"] == instance.project.blocked_code
         assert instance_vote_info["assigned_to_username"] == instance.assigned_to.username
         assert instance_vote_info["assigned_to_full_name"] == instance.assigned_to.full_name
         assert instance_vote_info["assigned_to_photo"] != ""