Merge pull request #175 from PROCOLLAB-github/dev

Фильтры по программам, небольшие оптимизации запросов

Author: VeryBigSad

news/admin.py

@@ -1,21 +1,59 @@
 from django.contrib import admin
 
-from news.models import News, NewsTag
+from news.models import News
 
 
 @admin.register(News)
 class NewsAdmin(admin.ModelAdmin):
-    list_display = ("id", "title", "tags_str")
-    list_display_links = (
+    # todo
+    list_display = (
         "id",
-        "title",
+        "content_type",
+        "object_id",
+        "text",
+        "datetime_created",
+        "datetime_updated",
     )
-
-
-@admin.register(NewsTag)
-class NewsTagAdmin(admin.ModelAdmin):
-    list_display = ("name", "description", "datetime_created", "datetime_updated", "id")
     list_display_links = (
         "id",
-        "name",
+        "content_type",
+        "object_id",
+        "text",
+        "datetime_created",
+        "datetime_updated",
+    )
+    list_filter = (
+        "datetime_created",
+        "datetime_updated",
+    )
+    search_fields = ("text",)
+    readonly_fields = (
+        "datetime_created",
+        "datetime_updated",
     )
+    # fieldsets = (
+    #     (
+    #         None,
+    #         {
+    #             "fields": (
+    #                 "content_type",
+    #                 "object_id",
+    #                 "text",
+    #                 "files",
+    #             )
+    #         },
+    #     ),
+    #     (
+    #         "Даты",
+    #         {
+    #             "fields": (
+    #                 "datetime_created",
+    #                 "datetime_updated",
+    #             )
+    #         },
+    #     ),
+    # )
+    # filter_horizontal = (
+    #     "files",
+    # )
+    # save_on_top = True

news/filters.py

@@ -18,12 +18,16 @@ class NewsFilter(filters.FilterSet):
             .filter(datetime_created__gt=datetime.datetime(...))
     """
 
-    title__contains = filters.Filter(field_name="title", lookup_expr="contains")
+    # title__contains = filters.Filter(field_name="title", lookup_expr="contains")
     text__contains = filters.Filter(field_name="text", lookup_expr="contains")
     datetime_created__gt = filters.DateTimeFilter(
         field_name="datetime_created", lookup_expr="gt"
     )
 
     class Meta:
         model = News
-        fields = ("title__contains", "text__contains", "datetime_created__gt")
+        fields = (
+            # "title__contains",
+            "text__contains",
+            "datetime_created__gt",
+        )

news/managers.py

@@ -5,9 +5,9 @@
 class NewsManager(models.Manager):
     def get_news(self, obj):
         obj_type = ContentType.objects.get_for_model(obj)
-        return self.get_queryset().filter(content_type=obj_type, object_id=obj.id)
+        return self.get_queryset().filter(content_type=obj_type, object_id=obj.pk)
 
     def add_news(self, obj, **kwargs):
         obj_type = ContentType.objects.get_for_model(obj)
-        news = self.create(content_type=obj_type, object_id=obj.id, **kwargs)
+        news = self.create(content_type=obj_type, object_id=obj.pk, **kwargs)
         return news

news/migrations/0006_alter_news_options_remove_news_cover_url_and_more.py

@@ -0,0 +1,64 @@
+# Generated by Django 4.2.3 on 2023-07-18 23:25
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("files", "0005_alter_userfile_options"),
+        ("contenttypes", "0002_remove_content_type_name"),
+        ("news", "0005_news_content_type_news_object_id"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="news",
+            options={
+                "ordering": ["-datetime_created"],
+                "verbose_name": "Новость",
+                "verbose_name_plural": "Новости",
+            },
+        ),
+        migrations.RemoveField(
+            model_name="news",
+            name="cover_url",
+        ),
+        migrations.RemoveField(
+            model_name="news",
+            name="short_text",
+        ),
+        migrations.RemoveField(
+            model_name="news",
+            name="tags",
+        ),
+        migrations.RemoveField(
+            model_name="news",
+            name="title",
+        ),
+        migrations.AddField(
+            model_name="news",
+            name="files",
+            field=models.ManyToManyField(
+                blank=True, related_name="news", to="files.userfile"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="news",
+            name="content_type",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="news",
+                to="contenttypes.contenttype",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="news",
+            name="object_id",
+            field=models.PositiveIntegerField(),
+        ),
+        migrations.DeleteModel(
+            name="NewsTag",
+        ),
+    ]

news/migrations/0007_project_news_2_news_news.py

@@ -0,0 +1,37 @@
+# Generated by Django 4.2.3 on 2023-07-20 18:34
+
+from django.db import migrations
+from django.db.migrations import RunPython
+
+
+def project_news_to_news_news(apps, schema_editor):
+    # add ProjectNews model to news app via schema_editor
+    ProjectNews = apps.get_model("projects.ProjectNews")
+    News = apps.get_model("news", "News")
+    ContentType = apps.get_model("contenttypes", "ContentType")
+    for project_news in ProjectNews.objects.all():
+        project_content_type = ContentType.objects.get(
+            app_label="projects", model="project"
+        )
+        News.objects.create(
+            text=project_news.text,
+            content_type=project_content_type,
+            object_id=project_news.project.id,
+            files=project_news.files.all(),
+            views=project_news.views.all(),
+            likes=project_news.likes.all(),
+            datetime_created=project_news.datetime_created,
+            datetime_updated=project_news.datetime_updated
+        )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("news", "0006_alter_news_options_remove_news_cover_url_and_more"),
+        ("projects", "0013_projectnews")
+    ]
+
+    operations = [
+        RunPython(project_news_to_news_news)
+    ]

news/models.py

@@ -1,88 +1,50 @@
-from django.contrib.contenttypes.fields import GenericForeignKey
+from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 
+from core.models import Like, View
+from files.models import UserFile
 from news.managers import NewsManager
 
 
-class NewsTag(models.Model):
-    """News tag model
-
-    Attributes:
-        name: A CharField for the tag's name
-        description: A CharField for the tag's description
-        datetime_created: A DateTimeField indicating date of creation.
-        datetime_updated: A DateTimeField indicating date of update.
-    """
-
-    name = models.CharField("Название тега", max_length=256, blank=False, null=False)
-    # hopefully 512 characters are enough for any tag description
-    description = models.CharField("Описание тега", max_length=512, blank=True, null=True)
-
-    # probably not really needed here but won't hurt
-    datetime_created = models.DateTimeField(
-        verbose_name="Дата создания", null=False, auto_now_add=True
-    )
-    datetime_updated = models.DateTimeField(
-        verbose_name="Дата изменения", null=False, auto_now=True
-    )
-
-    def __str__(self):
-        return f"NewsTag<{self.id}> - {self.name}"
-
-    class Meta:
-        verbose_name = "Тег"
-        verbose_name_plural = "Теги"
-
-
 class News(models.Model):
-    """
-    News model
-
-     Attributes:
-        title: A CharField news title.
-        text: A TextField news text content.
-        short_text: A TextField news short text content.
-        cover_url: A URLField link to news cover image.
-        tags: A ManyToManyField listing all tags of this news object
-        datetime_created: A DateTimeField indicating date of creation.
-        datetime_updated: A DateTimeField indicating date of update.
-    """
-
-    title = models.CharField(max_length=256, null=False)
-    text = models.TextField(null=False)
-    short_text = models.TextField(max_length=256, blank=True)
-    cover_url = models.URLField(null=False)
-
-    tags = models.ManyToManyField(NewsTag, blank=True, verbose_name="Список тегов")
-
-    # generic relation to project/program/ something else possibly
     content_type = models.ForeignKey(
-        ContentType, on_delete=models.CASCADE, related_name="news", null=True, blank=True
+        ContentType,
+        on_delete=models.CASCADE,
+        related_name="news",
     )
-    object_id = models.PositiveIntegerField(null=True, blank=True)
+    object_id = models.PositiveIntegerField()
     content_object = GenericForeignKey("content_type", "object_id")
 
+    text = models.TextField(
+        null=False,
+        blank=False,
+    )
+    files = models.ManyToManyField(UserFile, related_name="news", blank=True)
+
+    views = GenericRelation(
+        View,
+        related_query_name="project_views",
+    )
+    likes = GenericRelation(
+        Like,
+        related_query_name="project_news",
+    )
+
     datetime_created = models.DateTimeField(
-        verbose_name="Дата создания", null=False, auto_now_add=True
+        verbose_name="Дата создания",
+        null=False,
+        auto_now_add=True,
     )
     datetime_updated = models.DateTimeField(
-        verbose_name="Дата изменения", null=False, auto_now=True
+        verbose_name="Дата изменения",
+        null=False,
+        auto_now=True,
     )
 
     objects = NewsManager()
 
-    @property
-    def tags_str(self):
-        """Formats tags to string
-
-        Returns: List of tags' names separated by a comma
-        """
-        return ", ".join([i.name for i in self.tags.all()])
-
-    def __str__(self):
-        return f"News<{self.id}> - {self.title}"
-
     class Meta:
         verbose_name = "Новость"
         verbose_name_plural = "Новости"
+        ordering = ["-datetime_created"]

news/pagination.py

@@ -0,0 +1,15 @@
+from rest_framework import pagination
+
+
+class NewsPagination(pagination.LimitOffsetPagination):
+    """
+    Pagination for News
+
+    For example:
+        /news/?limit=10&offset=10
+        gets the next 10 news after the first 10 news.
+    """
+
+    default_limit = 10
+    limit_query_param = "limit"
+    offset_query_param = "offset"

news/permissions.py

@@ -0,0 +1,45 @@
+from rest_framework import permissions
+from rest_framework.permissions import SAFE_METHODS
+
+from projects.models import Project
+
+
+class IsNewsCreatorOrReadOnly(permissions.BasePermission):
+    def has_object_permission(self, request, view, obj):
+        """
+        read/update/delete permission
+        currently can only be updated/deleted in admin panel
+        """
+        if request.method in SAFE_METHODS:
+            return True
+        if isinstance(obj.content_object, Project):
+            # it's a project
+            if obj.content_object.leader == request.user:
+                return True
+        else:
+            # it's a partner program
+            # TODO: implement
+            pass
+        return False
+
+    def has_permission(self, request, view):
+        """
+        Creation permission
+        Currently can only be created via admin panel
+        """
+        # everybody can read this
+        if request.method in SAFE_METHODS:
+            return True
+
+        try:
+            # try to judge it as a project
+            project = Project.objects.get(pk=view.kwargs["project_pk"])
+            if request.method in SAFE_METHODS or (request.user == project.leader):
+                return True
+        except Project.DoesNotExist:
+            return False
+        except KeyError:
+            # It's a partner program, currently can only be created via admin
+            # TODO: implement
+            pass
+        return False