Merge pull request #362 from PROCOLLAB-github/dev-to-master

Dev

Author: sh1nkey

.github/workflows/dev-ci.yml

@@ -5,7 +5,7 @@ on:
     branches: 
       - dev
   workflow_dispatch:
-  
+
 jobs:
   deploy:
       runs-on: ubuntu-latest

core/fields.py

@@ -2,8 +2,8 @@
 
 
 class CustomListField(serializers.ListField):
-    def to_representation(self, data):
+    def to_representation(self, data) -> list:
         return [value.strip() for value in data.split(",") if value.strip()]
 
-    def to_internal_value(self, data):
+    def to_internal_value(self, data) -> str:
         return ",".join(data)

core/models.py

@@ -3,6 +3,7 @@
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.db.models import Model
+from django_stubs_ext.db.models import TypedModelMeta
 
 User = get_user_model()
 
@@ -23,7 +24,7 @@ class Link(Model):
     object_id = models.PositiveIntegerField()
     content_object = GenericForeignKey("content_type", "object_id")
 
-    class Meta:
+    class Meta(TypedModelMeta):
         unique_together = (
             "link",
             "content_type",
@@ -32,7 +33,7 @@ class Meta:
         verbose_name = "Ссылка"
         verbose_name_plural = "Ссылки"
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f"Link for {self.content_object} - {self.link}"
 
 
@@ -54,7 +55,7 @@ class Like(Model):
     object_id = models.PositiveIntegerField()
     content_object = GenericForeignKey("content_type", "object_id")
 
-    class Meta:
+    class Meta(TypedModelMeta):
         unique_together = (
             "user",
             "content_type",
@@ -63,7 +64,7 @@ class Meta:
         verbose_name = "Лайк"
         verbose_name_plural = "Лайки"
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f"Like<{self.user} - {self.content_object}>"
 
 
@@ -88,7 +89,7 @@ class View(Model):
     object_id = models.PositiveIntegerField()
     content_object = GenericForeignKey("content_type", "object_id")
 
-    class Meta:
+    class Meta(TypedModelMeta):
         unique_together = (
             "user",
             "content_type",
@@ -97,7 +98,7 @@ class Meta:
         verbose_name = "Просмотр"
         verbose_name_plural = "Просмотры"
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f"View<{self.user} - {self.content_object}>"
 
 
@@ -108,10 +109,10 @@ class SkillCategory(models.Model):
 
     name = models.CharField(max_length=256, null=False)
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.name
 
-    class Meta:
+    class Meta(TypedModelMeta):
         verbose_name = "Категория навыка"
         verbose_name_plural = "Категории навыков"
         ordering = ["name"]
@@ -129,13 +130,13 @@ class Skill(models.Model):
         related_name="skills",
     )
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.name
 
-    def __repr__(self):
+    def __repr__(self) -> str:
         return f"Skill<name={self.name},id={self.id}>"
 
-    class Meta:
+    class Meta(TypedModelMeta):
         verbose_name = "Навык"
         verbose_name_plural = "Навыки"
         ordering = ["id", "category", "name"]
@@ -160,18 +161,18 @@ class SkillToObject(models.Model):
     object_id = models.PositiveIntegerField()
     content_object = GenericForeignKey("content_type", "object_id")
 
-    class Meta:
+    class Meta(TypedModelMeta):
         verbose_name = "Ссылка на навык"
         verbose_name_plural = "Ссылки на навыки"
 
 
 class SpecializationCategory(models.Model):
     name = models.TextField()
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.name
 
-    class Meta:
+    class Meta(TypedModelMeta):
         verbose_name = "Категория специализации"
         verbose_name_plural = "Категории специализаций"
 
@@ -182,10 +183,10 @@ class Specialization(models.Model):
         SpecializationCategory, related_name="specializations", on_delete=models.CASCADE
     )
 
-    def __str__(self):
+    def __str__(self) -> str:
         return self.name
 
-    class Meta:
+    class Meta(TypedModelMeta):
         verbose_name = "Специализация"
         verbose_name_plural = "Специализации"
 

invites/models.py

@@ -3,6 +3,7 @@
 from invites.managers import InviteManager
 from projects.models import Project
 from users.models import CustomUser
+from django_stubs_ext.db.models import TypedModelMeta
 
 
 class Invite(models.Model):
@@ -37,10 +38,10 @@ class Invite(models.Model):
 
     objects = InviteManager()
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f'Invite from project "{self.project.name}" to {self.user.get_full_name()}'
 
-    class Meta:
+    class Meta(TypedModelMeta):
         verbose_name = "Приглашение"
         verbose_name_plural = "Приглашения"
         ordering = ["-datetime_created"]

invites/serializers.py

@@ -5,7 +5,7 @@
 from users.serializers import UserDetailSerializer
 
 
-class InviteListSerializer(serializers.ModelSerializer):
+class InviteListSerializer(serializers.ModelSerializer[Invite]):
     class Meta:
         model = Invite
         fields = [
@@ -18,7 +18,7 @@ class Meta:
         ]
 
 
-class InviteDetailSerializer(serializers.ModelSerializer):
+class InviteDetailSerializer(serializers.ModelSerializer[Invite]):
     user = UserDetailSerializer(many=False, read_only=True)
     project = ProjectListSerializer(many=False, read_only=True)
 

news/managers.py

@@ -1,13 +1,17 @@
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
+from django.db.models.query import QuerySet
+import typing
+if typing.TYPE_CHECKING:
+    from news.models import News
 
 
 class NewsManager(models.Manager):
-    def get_news(self, obj):
+    def get_news(self, obj: models.Model) -> QuerySet["News"]:
         obj_type = ContentType.objects.get_for_model(obj)
         return self.get_queryset().filter(content_type=obj_type, object_id=obj.pk)
 
-    def add_news(self, obj, **kwargs):
+    def add_news(self, obj: models.Model, **kwargs) -> "News":
         obj_type = ContentType.objects.get_for_model(obj)
         kwargs = dict(kwargs)
         files = kwargs.pop("files", [])

news/mixins.py

@@ -1,5 +1,5 @@
 from django.contrib.auth import get_user_model
-
+from django.db.models.query import QuerySet
 from news.models import News
 from partner_programs.models import PartnerProgram
 from projects.models import Project
@@ -12,7 +12,7 @@ class NewsQuerysetMixin:
     Mixin for getting queryset for news
     """
 
-    def get_queryset_for_project(self):
+    def get_queryset_for_project(self) -> QuerySet[News]:
         """Returns queryset of news for project"""
         project_pk = self.kwargs.get("project_pk")
         try:
@@ -25,7 +25,7 @@ def get_queryset_for_project(self):
             text="", content_type__model="project"
         )
 
-    def get_queryset_for_program(self):
+    def get_queryset_for_program(self) -> QuerySet[News]:
         """Returns queryset of news for partner program"""
         partnerprogram_pk = self.kwargs.get("partnerprogram_pk")
         try:
@@ -35,7 +35,7 @@ def get_queryset_for_program(self):
             return News.objects.none()
         return News.objects.get_news(obj=program)
 
-    def get_queryset_for_user(self):
+    def get_queryset_for_user(self) -> QuerySet[News]:
         """Returns queryset of news for user"""
         user_pk = self.kwargs.get("user_pk")
         try:
@@ -45,7 +45,7 @@ def get_queryset_for_user(self):
             return News.objects.none()
         return News.objects.get_news(obj=user)
 
-    def get_queryset(self):
+    def get_queryset(self) -> QuerySet[News] | None:
         """Chooses what queryset to return - for project, program or user"""
         if self.kwargs.get("project_pk") is not None:
             return self.get_queryset_for_project()

news/models.py

@@ -6,6 +6,7 @@
 from core.models import Like, View
 from files.models import UserFile
 from news.managers import NewsManager
+from django_stubs_ext.db.models import TypedModelMeta
 
 
 class News(models.Model):
@@ -43,7 +44,7 @@ class News(models.Model):
 
     objects = NewsManager()
 
-    class Meta:
+    class Meta(TypedModelMeta):
         verbose_name = "Новость"
         verbose_name_plural = "Новости"
         ordering = ["-datetime_created"]

news/serializers.py

@@ -10,7 +10,7 @@
 User = get_user_model()
 
 
-class NewsListCreateSerializer(serializers.ModelSerializer):
+class NewsListCreateSerializer(serializers.ModelSerializer[News]):
     class Meta:
         model = News
         fields = [
@@ -19,7 +19,7 @@ class Meta:
         ]
 
 
-class NewsListSerializer(serializers.ModelSerializer):
+class NewsListSerializer(serializers.ModelSerializer[News]):
     views_count = serializers.SerializerMethodField()
     likes_count = serializers.SerializerMethodField()
     name = serializers.SerializerMethodField()
@@ -60,6 +60,71 @@ class Meta:
         ]
 
 
+
+class NewsFeedListSerializer(serializers.ModelSerializer):
+    name = serializers.SerializerMethodField()
+    image_address = serializers.SerializerMethodField()
+    is_user_liked = serializers.SerializerMethodField()
+    files = UserFileSerializer(many=True)
+    views_count = serializers.SerializerMethodField()
+    likes_count = serializers.SerializerMethodField()
+    content_object = serializers.SerializerMethodField()
+    type_model = serializers.SerializerMethodField()
+
+    def get_type_model(self, obj) -> str:
+        model_type = CONTENT_OBJECT_MAPPING[obj.content_type.model]
+        if obj.text != "" and model_type == "project":
+            return "news"
+        return model_type
+
+    def get_content_object(self, obj) -> dict:
+        type_model = obj.content_type.model
+        if obj.text != "" and self.get_type_model(obj) == "project":
+            type_model = "news"
+        serializer = CONTENT_OBJECT_SERIALIZER_MAPPING[type_model](obj.content_object)
+        return serializer.data
+
+    def get_views_count(self, obj):
+        return get_views_count(obj)
+
+    def get_likes_count(self, obj):
+        return get_likes_count(obj)
+
+    def get_name(self, obj):
+        if obj.content_type.model == CustomUser.__name__.lower():
+            return f"{obj.content_object.first_name} {obj.content_object.last_name}"
+        elif obj.text != "" and obj.content_type.model == Project.__name__.lower():
+            return f"{obj.content_object.name}"
+
+    def get_image_address(self, obj):
+        return NewsMapping.get_image_address(obj.content_object)
+
+    def get_is_user_liked(self, obj):
+        user = self.context.get("user")
+        if user:
+            return is_fan(obj, user)
+        return False
+
+    class Meta:
+        model = News
+        fields = [
+            "id",
+            "name",
+            "image_address",
+            "text",
+            "datetime_created",
+            "views_count",
+            "likes_count",
+            "files",
+            "is_user_liked",
+            "content_object",
+            "type_model",
+        ]
+        read_only_fields = ["views_count", "likes_count", "type_model"]
+
+
+
+
 class NewsDetailSerializer(serializers.ModelSerializer):
     views_count = serializers.SerializerMethodField()
     likes_count = serializers.SerializerMethodField()