Merge branch 'dev'

Author: VeryBigSad

core/services.py

@@ -43,7 +43,7 @@ def get_likes_count(obj):
             likes__content_type=obj_type, likes__object_id=obj.id
         ).count()
         # cache for LIKES_CACHING_TIMEOUT seconds
-        cache.set(f"views_count_{obj_type}_{obj.id}", likes_count, LIKES_CACHING_TIMEOUT)
+        cache.set(f"likes_count_{obj_type}_{obj.id}", likes_count, LIKES_CACHING_TIMEOUT)
     return likes_count
 
 
@@ -85,7 +85,7 @@ def get_viewers(obj):
 def get_views_count(obj):
     obj_type = ContentType.objects.get_for_model(obj)
     # cache this
-    views_count = cache.get(f"views_count_{obj_type}_{obj.id}")
+    views_count = cache.get(f"views_count_{obj_type}_{obj.id}", None)
     if views_count is None:
         views_count = User.objects.filter(
             views__content_type=obj_type, views__object_id=obj.id

partner_programs/serializers.py

@@ -59,7 +59,6 @@ def count_views(self, program):
         return get_views_count(program)
 
     def get_links(self, program):
-        # FIXME
         # TODO: add caching here at least every 5 minutes, otherwise this will be heavy load
         return get_links(program)
 

projects/serializers.py

@@ -86,13 +86,9 @@ def get_short_description(cls, project):
         return project.get_short_description()
 
     def count_likes(self, project):
-        # FIXME
-        # TODO: add caching here at least every 5 minutes, otherwise this will be heavy load
         return get_likes_count(project)
 
     def count_views(self, project):
-        # FIXME
-        # TODO: add caching here at least every 5 minutes, otherwise this will be heavy load
         return get_views_count(project)
 
     def update(self, instance, validated_data):
@@ -135,19 +131,16 @@ class Meta:
 class ProjectListSerializer(serializers.ModelSerializer):
     collaborators = serializers.SerializerMethodField(method_name="get_collaborators")
     likes_count = serializers.SerializerMethodField(method_name="count_likes")
+    views_count = serializers.SerializerMethodField(method_name="count_views")
     collaborator_count = serializers.SerializerMethodField(
         method_name="get_collaborator_count"
     )
     vacancies = ProjectVacancyListSerializer(many=True, read_only=True)
-    views_count = serializers.SerializerMethodField(method_name="count_views")
+    short_description = serializers.SerializerMethodField()
 
     def count_views(self, project):
-        # FIXME
-        # TODO: add caching here at least every 5 minutes, otherwise will be heavy load
         return get_views_count(project)
 
-    short_description = serializers.SerializerMethodField()
-
     @classmethod
     def get_short_description(cls, project):
         return project.get_short_description()
@@ -185,7 +178,7 @@ class Meta:
             "views_count",
         ]
 
-        read_only_fields = ["leader", "views_count"]
+        read_only_fields = ["leader", "views_count", "likes_count"]
 
     def is_valid(self, *, raise_exception=False):
         return super().is_valid(raise_exception=raise_exception)