Merge pull request #427 from PROCOLLAB-github/dev

Dev

Author: pavuchara

feed/views.py

@@ -17,7 +17,7 @@ class NewSimpleFeed(APIView):
     serializator_class = NewsFeedListSerializer
     pagination_class = FeedPagination
 
-    def get_filter_data(self) -> list[str]:
+    def _get_filter_data(self) -> list[str]:
         filter_queries: str | None = self.request.query_params.get("type")
         filter_queries: str = filter_queries if filter_queries else ""  # existence check
 
@@ -27,7 +27,7 @@ def get_filter_data(self) -> list[str]:
         return news_types
 
     def get_queryset(self) -> QuerySet[News]:
-        filters = self.get_filter_data()
+        filters = self._get_filter_data()
         queryset = (
             News.objects.select_related("content_type")
             .prefetch_related("content_object", "files")

news/admin.py

@@ -14,6 +14,7 @@ class NewsAdmin(admin.ModelAdmin):
         "content_type",
         "object_id",
         "text",
+        "pin",
         "datetime_created",
         "datetime_updated",
     )
@@ -22,6 +23,7 @@ class NewsAdmin(admin.ModelAdmin):
         "content_type",
         "object_id",
         "text",
+        "pin",
         "datetime_created",
         "datetime_updated",
     )

news/migrations/0009_news_pin.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.11 on 2024-08-07 10:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("news", "0008_alter_news_datetime_created"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="news",
+            name="pin",
+            field=models.BooleanField(
+                blank=True,
+                default=False,
+                help_text="Закрепить новость (пока только для профиля программ)",
+                verbose_name="Закрепить новость",
+            ),
+        ),
+    ]

news/mixins.py

@@ -33,7 +33,7 @@ def get_queryset_for_program(self) -> QuerySet[News]:
         except PartnerProgram.DoesNotExist:
             # TODO: raise http 404 here
             return News.objects.none()
-        return News.objects.get_news(obj=program)
+        return News.objects.get_news(obj=program).order_by("-pin", "-datetime_created")
 
     def get_queryset_for_user(self) -> QuerySet[News]:
         """Returns queryset of news for user"""

news/models.py

@@ -32,7 +32,12 @@ class News(models.Model):
         Like,
         related_query_name="project_news",
     )
-
+    pin = models.BooleanField(
+        blank=True,
+        default=False,
+        verbose_name="Закрепить новость",
+        help_text="Закрепить новость (пока только для профиля программ)",
+    )
     datetime_created = models.DateTimeField(
         verbose_name="Дата создания", null=False, default=timezone.now
     )

news/serializers.py

@@ -50,6 +50,7 @@ class Meta:
         fields = [
             "id",
             "name",
+            "pin",
             "image_address",
             "text",
             "datetime_created",
@@ -58,7 +59,7 @@ class Meta:
             "files",
             "is_user_liked",
         ]
-
+        read_only_fields = ["pin"]
 
 
 class NewsFeedListSerializer(serializers.ModelSerializer):
@@ -123,8 +124,6 @@ class Meta:
         read_only_fields = ["views_count", "likes_count", "type_model"]
 
 
-
-
 class NewsDetailSerializer(serializers.ModelSerializer):
     views_count = serializers.SerializerMethodField()
     likes_count = serializers.SerializerMethodField()
@@ -155,6 +154,7 @@ class Meta:
         fields = [
             "id",
             "name",
+            "pin",
             "image_address",
             "text",
             "datetime_created",
@@ -164,3 +164,4 @@ class Meta:
             "is_user_liked",
             "files",
         ]
+        read_only_fields = ["pin"]

projects/admin.py

@@ -16,6 +16,7 @@ class ProjectAdmin(admin.ModelAdmin):
         "id",
         "name",
         "draft",
+        "is_company",
     )
     list_display_links = (
         "id",

projects/filters.py

@@ -15,7 +15,8 @@ class ProjectFilter(filters.FilterSet):
         industry (int), step (int), region (str), name__contains (str),
          description__contains (str), collaborator__user__in (List[int]),
          datetime_created__gt (datetime.datetime), step (int), any_vacancies (bool),
-         member_count__gt (int), member_count__lt (int), leader (int), partner_program (int)
+         member_count__gt (int), member_count__lt (int), leader (int), partner_program (int),
+         is_company (bool).
 
     Examples:
         ?industry=1&name__contains=clown
@@ -26,6 +27,7 @@ class ProjectFilter(filters.FilterSet):
         ?step=1 equals to .filter(step=1)
         ?any_vacancies=true equals to .filter(any_vacancies=True)
         ?collaborator__count__gt=1 equals to .filter(collaborator__count__gt=1)
+        ?is_company=0/?is_company=false equals .filter(is_company=False)
     """
 
     @classmethod
@@ -84,6 +86,10 @@ def filter_by_partner_program(self, queryset, name, value):
     datetime_created__gt = filters.DateTimeFilter(
         field_name="datetime_created", lookup_expr="gt"
     )
+    is_company = filters.BooleanFilter(
+        field_name="is_company",
+        label="is_company\n`1`/`true` is company\n`0`/`false` is not company"
+    )
 
     # filters by whether there are any vacancies in the project
     any_vacancies = filters.BooleanFilter(field_name="vacancies", method="vacancy_filter")
@@ -107,4 +113,5 @@ class Meta:
             "leader",
             "step",
             "partner_program",
+            "is_company",
         )

projects/migrations/0022_alter_project_options_project_is_company.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.11 on 2024-08-23 12:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("projects", "0021_project_subscribers"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="project",
+            options={
+                "ordering": ["-is_company", "-hidden_score", "-datetime_created"],
+                "verbose_name": "Проект",
+                "verbose_name_plural": "Проекты",
+            },
+        ),
+        migrations.AddField(
+            model_name="project",
+            name="is_company",
+            field=models.BooleanField(default=False),
+        ),
+    ]

projects/models.py

@@ -70,6 +70,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.
+        is_company: A boolean indicating if Project is a company.
         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.
@@ -98,6 +99,7 @@ class Project(models.Model):
     )
 
     draft = models.BooleanField(blank=False, default=True)
+    is_company = models.BooleanField(null=False, default=False)
 
     cover = models.ForeignKey(
         UserFile,
@@ -135,7 +137,7 @@ def __str__(self):
         return f"Project<{self.id}> - {self.name}"
 
     class Meta:
-        ordering = ["-hidden_score", "-datetime_created"]
+        ordering = ["-is_company", "-hidden_score", "-datetime_created"]
         verbose_name = "Проект"
         verbose_name_plural = "Проекты"