Merge pull request #496 from PROCOLLAB-github/dev

Dev

Author: pavuchara

core/utils.py

@@ -1,6 +1,13 @@
+import os
+import logging
+import pandas as pd
+
 from django.core.mail import EmailMultiAlternatives
 
 
+logger = logging.getLogger()
+
+
 class Email:
     """
     Send email messages
@@ -24,3 +31,36 @@ def get_user_online_cache_key(user) -> str:
 
 def get_users_online_cache_key() -> str:
     return "online_users"
+
+
+class XlsxFileToExport:
+    """
+    Writing data to `xlsx` file.
+    `filename` must contain `.xlsx` format prefix.
+    All data on 1 page.
+    """
+
+    def __init__(self, filename="output.xlsx"):
+        self.filename = filename
+
+    def write_data_to_xlsx(self, data: list[dict], sheet_name: str = "scores") -> None:
+        try:
+            data_frames = pd.DataFrame(data)
+            with pd.ExcelWriter(self.filename) as writer:
+                data_frames.to_excel(writer, sheet_name=sheet_name, index=False)
+        except Exception as e:
+            logger.error(f"Write export rates data error: {str(e)}", exc_info=True)
+            raise
+
+    def get_binary_data_from_self_file(self) -> bytes:
+        try:
+            with open(self.filename, "rb") as f:
+                binary_data = f.read()
+            return binary_data
+        except Exception as e:
+            logger.error(f"Read export rates data error: {str(e)}", exc_info=True)
+            raise
+
+    def delete_self_xlsx_file_from_local_machine(self) -> None:
+        if os.path.isfile(self.filename) and self.filename.endswith(".xlsx"):
+            os.remove(self.filename)

news/filters.py

@@ -18,7 +18,6 @@ class NewsFilter(filters.FilterSet):
             .filter(datetime_created__gt=datetime.datetime(...))
     """
 
-    # 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"

partner_programs/admin.py

@@ -8,10 +8,11 @@
 from django.utils import timezone
 
 from mailing.views import MailingTemplateRender
+from core.utils import XlsxFileToExport
 from partner_programs.models import PartnerProgram, PartnerProgramUserProfile
 from project_rates.models import Criteria, ProjectScore
 from projects.models import Project
-from partner_programs.services import XlsxFileToExport, ProjectScoreDataPreparer
+from partner_programs.services import ProjectScoreDataPreparer
 
 
 @admin.register(PartnerProgram)

partner_programs/services.py

@@ -1,6 +1,4 @@
 import logging
-import os
-import pandas as pd
 
 from partner_programs.models import PartnerProgramUserProfile
 from project_rates.models import Criteria, ProjectScore
@@ -9,39 +7,6 @@
 logger = logging.getLogger()
 
 
-class XlsxFileToExport:
-    """
-    Writing data to `xlsx` file.
-    `filename` must contain `.xlsx` format prefix.
-    All data on 1 page.
-    """
-
-    def __init__(self, filename="output.xlsx"):
-        self.filename = filename
-
-    def write_data_to_xlsx(self, data: list[dict], sheet_name="scores") -> None:
-        try:
-            data_frames = pd.DataFrame(data)
-            with pd.ExcelWriter(self.filename) as writer:
-                data_frames.to_excel(writer, sheet_name=sheet_name, index=False)
-        except Exception as e:
-            logger.error(f"Write export rates data error: {str(e)}", exc_info=True)
-            raise
-
-    def get_binary_data_from_self_file(self) -> bytes:
-        try:
-            with open(self.filename, "rb") as f:
-                binary_data = f.read()
-            return binary_data
-        except Exception as e:
-            logger.error(f"Read export rates data error: {str(e)}", exc_info=True)
-            raise
-
-    def delete_self_xlsx_file_from_local_machine(self) -> None:
-        if os.path.isfile(self.filename) and self.filename.endswith(".xlsx"):
-            os.remove(self.filename)
-
-
 class ProjectScoreDataPreparer:
     """
     Data preparer about project_rates by experts.

projects/migrations/0023_project_cover_image_address.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.11 on 2024-12-02 11:40
+
+from django.db import migrations, models
+import projects.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("projects", "0022_alter_project_options_project_is_company"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="project",
+            name="cover_image_address",
+            field=models.URLField(
+                blank=True,
+                default=projects.models.DefaultProjectCover.get_random_file_link,
+                help_text="If left blank, will set a link to the image from the 'Обложки проектов'",
+                null=True,
+            ),
+        ),
+    ]

projects/models.py

@@ -50,6 +50,11 @@ 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
 
+    @classmethod
+    def get_random_file_link(cls):
+        # FIXME: this is not efficient, but for ~10 default covers it should be ok
+        return cls.objects.order_by("?").first().image.link if cls.objects.order_by("?").first().image else None
+
     class Meta:
         verbose_name = "Обложка проекта"
         verbose_name_plural = "Обложки проектов"
@@ -71,6 +76,7 @@ class Project(models.Model):
         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_image_address: A URLField cover image URL address.
         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.
@@ -101,6 +107,14 @@ class Project(models.Model):
     draft = models.BooleanField(blank=False, default=True)
     is_company = models.BooleanField(null=False, default=False)
 
+    cover_image_address = models.URLField(
+        null=True,
+        blank=True,
+        default=DefaultProjectCover.get_random_file_link,
+        help_text="If left blank, will set a link to the image from the 'Обложки проектов'",
+    )
+
+    # TODO DELETE (deprecated field) after full migrate `cover_image_address`.
     cover = models.ForeignKey(
         UserFile,
         default=DefaultProjectCover.get_random_file,
@@ -136,6 +150,12 @@ def get_collaborators_user_list(self) -> list[User]:
     def __str__(self):
         return f"Project<{self.id}> - {self.name}"
 
+    def save(self, *args, **kwargs):
+        """Set random cover image if `cover_image_address` blank."""
+        if self.cover_image_address is None:
+            self.cover_image_address = DefaultProjectCover.get_random_file_link()
+        super().save(*args, **kwargs)
+
     class Meta:
         ordering = ["-is_company", "-hidden_score", "-datetime_created"]
         verbose_name = "Проект"

projects/serializers.py

@@ -128,6 +128,7 @@ class Meta:
             "datetime_updated",
             "views_count",
             "cover",
+            "cover_image_address",
             "partner_programs_tags",
         ]
         read_only_fields = [

templates/users/admin/users_change_list.html

@@ -3,13 +3,24 @@
 
 {% block object-tools-items %}
     {{ block.super }}
-    <a href="#" class="addlink" previewlistener="true" onclick="get_users()">
-      Выгрузка ФИО|Email всех пользователей
-    </a>
+    <li>
+        <a href="#" class="addlink" previewlistener="true" onclick="get_users()">
+        Выгрузка ФИО|Email всех пользователей
+        </a>
+    </li>
+    <li>
+        <a href="#" class="addlink" previewlistener="true" onclick="get_users_activity()">
+            Выгрузка активности
+        </a>
+    </li>
 
     <script>
         function get_users() {
             window.open("{% url 'admin:users_email_excel' %}", '_blank').focus();
         }
+
+        function get_users_activity() {
+            window.open("{% url 'admin:users_activity_excel' %}", '_blank').focus();
+        }
     </script>
-{% endblock %}
+{% endblock %}

users/admin.py

@@ -1,14 +1,17 @@
 from datetime import date
 
 import tablib
+import urllib.parse
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.auth.models import Permission
 from django.http import HttpResponse
 from django.shortcuts import redirect
 from django.urls import path
 
+from core.utils import XlsxFileToExport
 from mailing.views import MailingTemplateRender
+from users.services.users_activity import UserActivityDataPreparer
 from .helpers import send_verification_completed_email, force_verify_user
 from .models import (
     CustomUser,
@@ -227,6 +230,11 @@ def get_urls(self):
                 self.admin_site.admin_view(self.all_users_email_excel),
                 name="users_email_excel",
             ),
+            path(
+                "users-activity-excel/",
+                self.admin_site.admin_view(self.get_users_activity),
+                name="users_activity_excel",
+            ),
         ]
         return custom_urls + default_urls
 
@@ -248,6 +256,22 @@ def force_verify(self, request, object_id):
         force_verify_user(user)
         return redirect("admin:users_customuser_change", object_id)
 
+    def get_users_activity(self, _) -> HttpResponse:
+        activity_prepare = UserActivityDataPreparer()
+        xlsx_file_writer = XlsxFileToExport("активность_пользователей.xlsx")
+        xlsx_file_writer.write_data_to_xlsx(activity_prepare.get_users_prepared_data())
+        binary_data_to_export: bytes = xlsx_file_writer.get_binary_data_from_self_file()
+        xlsx_file_writer.delete_self_xlsx_file_from_local_machine()
+
+        encoded_file_name: str = urllib.parse.quote("активность_пользователей.xlsx")
+        response = HttpResponse(
+            binary_data_to_export,
+            content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+        )
+        response["Content-Disposition"] = f'attachment; filename*=UTF-8\'\'{encoded_file_name}'
+
+        return response
+
     def get_export_users_emails(self, users):
         response_data = tablib.Dataset(
             headers=[

users/models.py

@@ -1,12 +1,13 @@
-from django.contrib.auth.models import AbstractUser
 from django.db import models
 from django.db.models import QuerySet
+from django.utils import timezone
 from django.core.exceptions import ValidationError
-from django_stubs_ext.db.models import TypedModelMeta
+from django.contrib.auth.models import AbstractUser
 from django.contrib.contenttypes.fields import GenericRelation
 
-from users import constants
+from django_stubs_ext.db.models import TypedModelMeta
 
+from users import constants
 from users.managers import (
     CustomUserManager,
     UserAchievementManager,
@@ -186,6 +187,13 @@ def get_project_chats(self) -> QuerySet:
     def get_full_name(self) -> str:
         return f"{self.first_name} {self.last_name}"
 
+    def get_user_age(self) -> int:
+        if self.birthday is None:
+            return None
+        today = timezone.now()
+        birthday = self.birthday
+        return today.year - birthday.year - ((today.month, today.day) < (birthday.month, birthday.day))
+
     def __str__(self) -> str:
         return f"User<{self.id}> - {self.first_name} {self.last_name}"