Merge branch 'dev' of https://github.com/PROCOLLAB-github/api into dev

Author: yakser

news/managers.py

@@ -9,5 +9,8 @@ def get_news(self, obj):
 
     def add_news(self, obj, **kwargs):
         obj_type = ContentType.objects.get_for_model(obj)
+        kwargs = dict(kwargs)
+        files = kwargs.pop("files", [])
         news = self.create(content_type=obj_type, object_id=obj.pk, **kwargs)
+        news.files.set(files)
         return news

projects/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from projects.models import Project, Achievement, Collaborator, ProjectLink, ProjectNews
+from projects.models import DefaultProjectCover, Project, Achievement, Collaborator, ProjectLink, ProjectNews
 
 
 @admin.register(Project)
@@ -54,3 +54,18 @@ class CollaboratorAdmin(admin.ModelAdmin):
         "datetime_updated",
     )
     list_display_links = ("id", "user", "project")
+
+
+@admin.register(DefaultProjectCover)
+class DefaultProjectCoverAdmin(admin.ModelAdmin):
+    list_display = (
+        "id",
+        "image",
+        "datetime_created",
+        "datetime_updated",
+    )
+    list_display_links = (
+        "id",
+        "datetime_created",
+        "datetime_updated",
+    )

projects/migrations/0020_project_cover_defaultprojectcover.py

@@ -0,0 +1,98 @@
+# Generated by Django 4.2.3 on 2023-09-07 07:13
+
+from django.db import migrations, models
+import django.db.models.deletion
+import projects.models
+
+# Generated by Django 4.1.3 on 2023-06-27 11:46
+import django
+from django.db import migrations, models
+import projects.models
+
+
+def create_default_project_cover(apps, schema_editor):
+    # create a random default cover using a random UserFile
+    DefaultProjectCover = apps.get_model("projects", "DefaultProjectCover")
+    default_cover = DefaultProjectCover.objects.create()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("projects", "0018_alter_defaultprojectcover_image_alter_project_cover"),
+    ]
+
+    operations = [
+        migrations.RunPython(create_default_project_cover),
+        migrations.AlterField(
+            model_name="project",
+            name="cover",
+            field=models.ForeignKey(
+                default=projects.models.DefaultProjectCover.get_random_file,
+                on_delete=django.db.models.deletion.SET_DEFAULT,
+                related_name="project_cover",
+                to="files.userfile",
+                null=True,
+                blank=True
+            ),
+        ),
+    ]
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("files", "0005_alter_userfile_options"),
+        ("projects", "0019_alter_project_options_project_hidden_score"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="DefaultProjectCover",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "datetime_created",
+                    models.DateTimeField(auto_now_add=True, verbose_name="Дата создания"),
+                ),
+                (
+                    "datetime_updated",
+                    models.DateTimeField(auto_now=True, verbose_name="Дата изменения"),
+                ),
+                (
+                    "image",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="default_covers",
+                        to="files.userfile",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Обложка проекта",
+                "verbose_name_plural": "Обложки проектов",
+            },
+        ),
+        migrations.RunPython(create_default_project_cover),
+        migrations.AddField(
+            model_name="project",
+            name="cover",
+            field=models.ForeignKey(
+                blank=True,
+                default=projects.models.DefaultProjectCover.get_random_file,
+                null=True,
+                on_delete=django.db.models.deletion.SET_DEFAULT,
+                related_name="project_cover",
+                to="files.userfile",
+            ),
+        ),
+    ]

projects/models.py

@@ -15,6 +15,45 @@
 User = get_user_model()
 
 
+class DefaultProjectCover(models.Model):
+    """
+    Default cover model for projects, is chosen randomly at project creation
+
+    Attributes:
+        image: A ForeignKey referencing the image of the cover.
+        datetime_created: A DateTimeField indicating date of creation.
+        datetime_updated: A DateTimeField indicating date of update.
+    """
+
+    image = models.ForeignKey(
+        UserFile,
+        on_delete=models.CASCADE,
+        related_name="default_covers",
+        null=True,
+        blank=True,
+    )
+
+    datetime_created = models.DateTimeField(
+        verbose_name="Дата создания",
+        null=False,
+        auto_now_add=True,
+    )
+    datetime_updated = models.DateTimeField(
+        verbose_name="Дата изменения",
+        null=False,
+        auto_now=True,
+    )
+
+    @classmethod
+    def get_random_file(cls):
+        # FIXME: this is not efficient, but for ~10 default covers it should be ok
+        return cls.objects.order_by("?").first().image
+
+    class Meta:
+        verbose_name = "Обложка проекта"
+        verbose_name_plural = "Обложки проектов"
+
+
 class Project(models.Model):
     """
     Project model
@@ -30,6 +69,7 @@ class Project(models.Model):
         image_address: A URLField image URL address.
         leader: A ForeignKey referring to the User model.
         draft: A boolean indicating if Project is a draft.
+        cover: A ForeignKey referring to the UserFile model, which is the image cover of the project.
         datetime_created: A DateTimeField indicating date of creation.
         datetime_updated: A DateTimeField indicating date of update.
     """
@@ -58,6 +98,15 @@ class Project(models.Model):
 
     draft = models.BooleanField(blank=False, default=True)
 
+    cover = models.ForeignKey(
+        UserFile,
+        default=DefaultProjectCover.get_random_file,
+        on_delete=models.SET_DEFAULT,
+        related_name="project_cover",
+        null=True,
+        blank=True,
+    )
+
     datetime_created = models.DateTimeField(
         verbose_name="Дата создания", null=False, auto_now_add=True
     )

projects/serializers.py

@@ -3,6 +3,7 @@
 
 from core.fields import CustomListField
 from core.services import get_views_count, get_likes_count, is_fan
+from files.serializers import UserFileSerializer
 from industries.models import Industry
 from projects.models import Project, Achievement, Collaborator, ProjectNews
 from projects.validators import validate_project
@@ -63,6 +64,7 @@ class Meta:
 
 class ProjectDetailSerializer(serializers.ModelSerializer):
     achievements = AchievementListSerializer(many=True, read_only=True)
+    cover = UserFileSerializer(required=False)
     collaborators = CollaboratorSerializer(
         source="collaborator_set", many=True, read_only=True
     )
@@ -127,7 +129,8 @@ class Meta:
             "datetime_updated",
             "views_count",
             "likes_count",
-            "partner_programs_tags",
+            "cover",
+            "partner_programs_tags"
         ]
         read_only_fields = [
             "leader",

projects/views.py

@@ -205,6 +205,7 @@ def get(self, request):
                 "all": self.get_queryset().filter(draft=False).count(),
                 "my": self.get_queryset()
                 .filter(Q(leader_id=request.user.id) | Q(collaborator__user=request.user))
+                .distinct()
                 .count(),
             },
             status=status.HTTP_200_OK,