+
{% if comment.author.image_cropped %}
function addComment(){
- console.log("aaaaa")
}
{% endblock %}
diff --git a/akarpov/templates/users/history.html b/akarpov/templates/users/history.html
new file mode 100644
index 0000000..eb6a108
--- /dev/null
+++ b/akarpov/templates/users/history.html
@@ -0,0 +1,28 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
Delete all history
+
+ {% for record in userhistory_list %}
+ -
+
+ {% if record.type == 'note' %}
+
{{ record.name }}
+ {% elif record.type == 'create' %}
+ {{ record.name }}
+ {% elif record.type == 'update' %}
+ {{ record.name }}
+ {% elif record.type == 'delete' %}
+ {{ record.name }}
+ {% elif record.type == 'warning' %}
+ {{ record.name }}
+ {% endif %}
+
+
{{ record.description }}
+
{{ record.created | time:"H:i"}} {{ record.created | date:"d.m.Y"}}
+
+
+ {% endfor %}
+
+{% endblock %}
diff --git a/akarpov/test_platform/migrations/0008_alter_form_options.py b/akarpov/test_platform/migrations/0008_alter_form_options.py
new file mode 100644
index 0000000..b988d9a
--- /dev/null
+++ b/akarpov/test_platform/migrations/0008_alter_form_options.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.2 on 2023-07-01 10:43
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("test_platform", "0007_alter_form_short_link"),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name="form",
+ options={"verbose_name": "Form"},
+ ),
+ ]
diff --git a/akarpov/test_platform/models.py b/akarpov/test_platform/models.py
index 7d07903..f8f5aa8 100644
--- a/akarpov/test_platform/models.py
+++ b/akarpov/test_platform/models.py
@@ -8,12 +8,13 @@
from polymorphic.models import PolymorphicModel
from akarpov.common.models import BaseImageModel
-from akarpov.tools.shortener.models import ShortLink
+from akarpov.tools.shortener.models import ShortLinkModel
from akarpov.users.models import User
+from akarpov.users.services.history import UserHistoryModel
from akarpov.utils.base import SubclassesMixin
-class Form(BaseImageModel, ShortLink):
+class Form(BaseImageModel, ShortLinkModel, UserHistoryModel):
name = models.CharField(max_length=200, blank=False)
description = models.TextField(blank=True)
@@ -45,6 +46,9 @@ def get_absolute_url(self):
def __str__(self):
return f"form: {self.name}"
+ class Meta:
+ verbose_name = "Form"
+
class BaseQuestion(PolymorphicModel, SubclassesMixin):
type = "no_type"
diff --git a/akarpov/tools/promocodes/apps.py b/akarpov/tools/promocodes/apps.py
index e0a4848..e23a0cc 100644
--- a/akarpov/tools/promocodes/apps.py
+++ b/akarpov/tools/promocodes/apps.py
@@ -2,5 +2,5 @@
class PromocodesConfig(AppConfig):
- default_auto_field = "django.db.models.BigAutoField"
+ verbose_name = "Promocodes"
name = "akarpov.tools.promocodes"
diff --git a/akarpov/tools/shortener/models.py b/akarpov/tools/shortener/models.py
index 995fb60..6cc8713 100644
--- a/akarpov/tools/shortener/models.py
+++ b/akarpov/tools/shortener/models.py
@@ -9,7 +9,7 @@
class Link(TimeStampedModel):
source = models.URLField(blank=False)
- slug = models.SlugField()
+ slug = models.SlugField(db_index=True)
creator = models.ForeignKey(
"users.User", related_name="links", null=True, on_delete=models.SET_NULL
)
@@ -99,7 +99,7 @@ def update_model_link(sender, instance, **kwargs):
instance.short_link = None
-class ShortLink(SlugModel):
+class ShortLinkModel(SlugModel):
short_link: Link | None = models.ForeignKey(
"shortener.Link", blank=True, null=True, on_delete=models.SET_NULL
)
diff --git a/akarpov/users/migrations/0009_userhistory.py b/akarpov/users/migrations/0009_userhistory.py
new file mode 100644
index 0000000..188bf0e
--- /dev/null
+++ b/akarpov/users/migrations/0009_userhistory.py
@@ -0,0 +1,67 @@
+# Generated by Django 4.2.2 on 2023-07-01 10:43
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("contenttypes", "0002_remove_content_type_name"),
+ ("users", "0008_alter_user_left_file_upload"),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name="UserHistory",
+ fields=[
+ (
+ "id",
+ models.BigAutoField(
+ auto_created=True,
+ primary_key=True,
+ serialize=False,
+ verbose_name="ID",
+ ),
+ ),
+ (
+ "type",
+ models.CharField(
+ choices=[
+ ("note", "note"),
+ ("create", "create"),
+ ("update", "update"),
+ ("delete", "delete"),
+ ("warning", "warning"),
+ ]
+ ),
+ ),
+ ("name", models.CharField(max_length=500)),
+ ("object_id", models.PositiveIntegerField()),
+ (
+ "content_type",
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to="contenttypes.contenttype",
+ ),
+ ),
+ (
+ "user",
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ related_name="history",
+ to=settings.AUTH_USER_MODEL,
+ ),
+ ),
+ ],
+ options={
+ "indexes": [
+ models.Index(
+ fields=["content_type", "object_id"],
+ name="users_userh_content_7e9fa5_idx",
+ )
+ ],
+ },
+ ),
+ ]
diff --git a/akarpov/users/migrations/0010_userhistory_description_alter_userhistory_name.py b/akarpov/users/migrations/0010_userhistory_description_alter_userhistory_name.py
new file mode 100644
index 0000000..dbbc4be
--- /dev/null
+++ b/akarpov/users/migrations/0010_userhistory_description_alter_userhistory_name.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.2 on 2023-07-04 09:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("users", "0009_userhistory"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="userhistory",
+ name="description",
+ field=models.CharField(blank=True, max_length=500),
+ ),
+ migrations.AlterField(
+ model_name="userhistory",
+ name="name",
+ field=models.CharField(max_length=200),
+ ),
+ ]
diff --git a/akarpov/users/migrations/0011_alter_userhistory_options_userhistory_created.py b/akarpov/users/migrations/0011_alter_userhistory_options_userhistory_created.py
new file mode 100644
index 0000000..b97405d
--- /dev/null
+++ b/akarpov/users/migrations/0011_alter_userhistory_options_userhistory_created.py
@@ -0,0 +1,26 @@
+# Generated by Django 4.2.2 on 2023-07-04 09:55
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("users", "0010_userhistory_description_alter_userhistory_name"),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name="userhistory",
+ options={"ordering": ["-created"]},
+ ),
+ migrations.AddField(
+ model_name="userhistory",
+ name="created",
+ field=models.DateTimeField(
+ auto_now_add=True, default=django.utils.timezone.now
+ ),
+ preserve_default=False,
+ ),
+ ]
diff --git a/akarpov/users/models.py b/akarpov/users/models.py
index 035340e..8f40b58 100644
--- a/akarpov/users/models.py
+++ b/akarpov/users/models.py
@@ -1,14 +1,16 @@
from django.contrib.auth.models import AbstractUser
+from django.contrib.contenttypes.fields import GenericForeignKey
+from django.contrib.contenttypes.models import ContentType
from django.core.validators import MinValueValidator
-from django.db.models import BigIntegerField, CharField, TextField
+from django.db import models
from django.urls import reverse
from django.utils.translation import gettext_lazy as _
from akarpov.common.models import BaseImageModel
-from akarpov.tools.shortener.models import ShortLink
+from akarpov.tools.shortener.models import ShortLinkModel
-class User(AbstractUser, BaseImageModel, ShortLink):
+class User(AbstractUser, BaseImageModel, ShortLinkModel):
"""
Default custom user model for akarpov.
If adding fields that need to be filled at user signup,
@@ -16,13 +18,13 @@ class User(AbstractUser, BaseImageModel, ShortLink):
"""
#: First and last name do not cover name patterns around the globe
- name = CharField(_("Name of User"), blank=True, max_length=255)
- about = TextField(_("Description"), blank=True, max_length=100)
+ name = models.CharField(_("Name of User"), blank=True, max_length=255)
+ about = models.TextField(_("Description"), blank=True, max_length=100)
first_name = None # type: ignore
last_name = None # type: ignore
# files
- left_file_upload = BigIntegerField(
+ left_file_upload = models.BigIntegerField(
"Left file upload(in bites)", default=0, validators=[MinValueValidator(0)]
)
@@ -34,3 +36,33 @@ def get_absolute_url(self):
"""
return reverse("users:detail", kwargs={"username": self.username})
+
+
+class UserHistory(models.Model):
+ class RecordType(models.TextChoices):
+ note = "note", "note"
+ create = "create", "create"
+ update = "update", "update"
+ delete = "delete", "delete"
+ warning = "warning", "warning"
+
+ type = models.CharField(choices=RecordType.choices)
+ created = models.DateTimeField(auto_now_add=True)
+ user = models.ForeignKey("User", related_name="history", on_delete=models.CASCADE)
+ name = models.CharField(max_length=200)
+ description = models.CharField(max_length=500, blank=True)
+ content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)
+ object_id = models.PositiveIntegerField()
+ object = GenericForeignKey("content_type", "object_id")
+
+ def get_link(self):
+ if hasattr(self.object, "get_absolute_url"):
+ return self.object.get_absolute_url()
+ return ""
+
+ class Meta:
+ ordering = ["-created"]
+ indexes = [models.Index(fields=["content_type", "object_id"])]
+
+ def __str__(self):
+ return self
diff --git a/akarpov/users/services/history.py b/akarpov/users/services/history.py
new file mode 100644
index 0000000..ce0019f
--- /dev/null
+++ b/akarpov/users/services/history.py
@@ -0,0 +1,112 @@
+from django.db import models
+from django.db.models import Model
+
+from akarpov.users.models import User, UserHistory
+from akarpov.utils.models import get_app_verbose_name, get_object_name, get_object_user
+
+
+def create_history_note(user: User, name: str, description: str, obj: Model):
+ UserHistory.objects.create(
+ type=UserHistory.RecordType.note,
+ user=user,
+ name=name,
+ description=description,
+ object=obj,
+ )
+
+
+def create_history_creation_note(user: User, name: str, description: str, obj: Model):
+ UserHistory.objects.create(
+ type=UserHistory.RecordType.create,
+ user=user,
+ name=name,
+ description=description,
+ object=obj,
+ )
+
+
+def create_history_update_note(user: User, name: str, description: str, obj: Model):
+ UserHistory.objects.create(
+ type=UserHistory.RecordType.update,
+ user=user,
+ name=name,
+ description=description,
+ object=obj,
+ )
+
+
+def create_history_delete_note(user: User, name: str, description: str, obj: Model):
+ UserHistory.objects.create(
+ type=UserHistory.RecordType.delete,
+ user=user,
+ name=name,
+ description=description,
+ object=obj,
+ )
+
+
+def create_history_warning_note(user: User, name: str, description: str, obj: Model):
+ # TODO: notify user here
+ UserHistory.objects.create(
+ type=UserHistory.RecordType.warning,
+ user=user,
+ name=name,
+ description=description,
+ object=obj,
+ )
+
+
+def create_history_creation_note_on_create(sender, instance, created, **kwargs):
+ if created:
+ user = get_object_user(instance)
+ if user:
+ create_history_creation_note(
+ user,
+ get_app_verbose_name(sender._meta.app_label),
+ f"Created {sender._meta.verbose_name.title()} {get_object_name(instance)}",
+ instance,
+ )
+
+
+def create_history_update_note_on_update(sender, instance, **kwargs):
+ if instance.id:
+ user = get_object_user(instance)
+ if not kwargs["update_fields"]:
+ create_history_update_note(
+ user,
+ get_app_verbose_name(sender._meta.app_label),
+ f"Updated {sender._meta.verbose_name.title()} {get_object_name(instance)}",
+ instance,
+ )
+
+
+def create_history_delete_note_on_delete(sender, instance, **kwargs):
+ user = get_object_user(instance)
+ create_history_delete_note(
+ user,
+ get_app_verbose_name(sender._meta.app_label),
+ f"Deleted {sender._meta.verbose_name.title()} {get_object_name(instance)}",
+ instance,
+ )
+
+
+class UserHistoryModel(models.Model):
+ """
+ creates user history records on model change
+ """
+
+ @classmethod
+ def __init_subclass__(cls, **kwargs):
+ super().__init_subclass__(**kwargs)
+ models.signals.pre_save.connect(
+ create_history_update_note_on_update, sender=cls
+ )
+ models.signals.post_save.connect(
+ create_history_creation_note_on_create, sender=cls
+ )
+ models.signals.post_delete.connect(
+ create_history_delete_note_on_delete, sender=cls
+ )
+
+ class Meta:
+ abstract = True
diff --git a/akarpov/users/signals.py b/akarpov/users/signals.py
index b7667cd..2e19442 100644
--- a/akarpov/users/signals.py
+++ b/akarpov/users/signals.py
@@ -1,7 +1,20 @@
+from allauth.account.signals import (
+ email_added,
+ email_changed,
+ email_removed,
+ password_reset,
+ user_logged_in,
+)
+from allauth.socialaccount.signals import social_account_added
+from django.contrib.auth import user_logged_out
from django.db.models.signals import pre_save
from django.dispatch import receiver
from akarpov.users.models import User
+from akarpov.users.services.history import (
+ create_history_note,
+ create_history_warning_note,
+)
@receiver(pre_save, sender=User)
@@ -9,3 +22,42 @@ def user_create(sender, instance: User, **kwargs):
if instance.id is None:
# give user some space on file share on register
instance.left_file_upload += 100 * 1024 * 1024
+
+
+@receiver(user_logged_in)
+def user_logged_in(request, user, **kwargs):
+ create_history_note(user, "User", "log in", user)
+
+
+@receiver(user_logged_out)
+def user_logged_out(request, user, **kwargs):
+ create_history_note(user, "User", "log out", user)
+
+
+@receiver(password_reset)
+def user_password_reset(request, user, **kwargs):
+ create_history_warning_note(user, "User", "password reset", user)
+
+
+@receiver(email_changed)
+def user_email_change(request, user, from_email_address, to_email_address, **kwargs):
+ create_history_warning_note(
+ user, "User", f"user email changed to {to_email_address}", user
+ )
+
+
+@receiver(email_added)
+def user_email_add(request, user, email_address, **kwargs):
+ create_history_warning_note(user, "User", f"email {email_address} added", user)
+
+
+@receiver(email_removed)
+def user_email_remove(request, user, email_address, **kwargs):
+ create_history_warning_note(user, "User", f"email {email_address} removed", user)
+
+
+@receiver(social_account_added)
+def user_account_add(request, sociallogin, **kwargs):
+ create_history_warning_note(
+ request.user, "User", f"added {sociallogin.provider} account", request.user
+ )
diff --git a/akarpov/users/urls.py b/akarpov/users/urls.py
index d841db9..f826ef3 100644
--- a/akarpov/users/urls.py
+++ b/akarpov/users/urls.py
@@ -1,10 +1,18 @@
from django.urls import path
-from akarpov.users.views import user_detail_view, user_redirect_view, user_update_view
+from akarpov.users.views import (
+ user_detail_view,
+ user_history_delete_view,
+ user_history_view,
+ user_redirect_view,
+ user_update_view,
+)
app_name = "users"
urlpatterns = [
path("redirect/", view=user_redirect_view, name="redirect"),
path("update/", view=user_update_view, name="update"),
+ path("history/", view=user_history_view, name="history"),
+ path("history/delete", view=user_history_delete_view, name="history_delete"),
path("
/", view=user_detail_view, name="detail"),
]
diff --git a/akarpov/users/views.py b/akarpov/users/views.py
index 61ecfff..6a52884 100644
--- a/akarpov/users/views.py
+++ b/akarpov/users/views.py
@@ -3,13 +3,15 @@
from django.contrib.messages.views import SuccessMessageMixin
from django.urls import reverse
from django.utils.translation import gettext_lazy as _
-from django.views.generic import DetailView, RedirectView, UpdateView
+from django.views.generic import DetailView, ListView, RedirectView, UpdateView
+
+from akarpov.users.models import UserHistory
+from akarpov.users.services.history import create_history_warning_note
User = get_user_model()
class UserDetailView(DetailView):
-
model = User
slug_field = "username"
slug_url_kwarg = "username"
@@ -19,7 +21,6 @@ class UserDetailView(DetailView):
class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
-
model = User
fields = ["username", "name", "image", "about"]
success_message = _("Information successfully updated")
@@ -38,7 +39,6 @@ def get_object(self):
class UserRedirectView(LoginRequiredMixin, RedirectView):
-
permanent = False
def get_redirect_url(self):
@@ -46,3 +46,30 @@ def get_redirect_url(self):
user_redirect_view = UserRedirectView.as_view()
+
+
+class UserHistoryListView(LoginRequiredMixin, ListView):
+ model = UserHistory
+ template_name = "users/history.html"
+
+ def get_queryset(self):
+ return UserHistory.objects.filter(user=self.request.user)
+
+
+user_history_view = UserHistoryListView.as_view()
+
+
+class UserHistoryDeleteView(LoginRequiredMixin, RedirectView):
+ def get_redirect_url(self):
+ q = UserHistory.objects.filter(user=self.request.user).exclude(
+ type=UserHistory.RecordType.warning
+ )
+ if q:
+ q.delete()
+ create_history_warning_note(
+ self.request.user, "History", "Deleted history", self.request.user
+ )
+ return reverse("users:history")
+
+
+user_history_delete_view = UserHistoryDeleteView.as_view()
diff --git a/akarpov/utils/models.py b/akarpov/utils/models.py
new file mode 100644
index 0000000..23f9775
--- /dev/null
+++ b/akarpov/utils/models.py
@@ -0,0 +1,31 @@
+from functools import lru_cache
+
+from django.apps import apps
+from django.db.models import Model
+
+from akarpov.users.models import User
+
+
+def get_object_name(obj: Model) -> str:
+ if hasattr(obj, "title"):
+ return obj.title
+ elif hasattr(obj, "name"):
+ return obj.name
+ elif hasattr(obj, "__str__"):
+ return obj.__str__()
+ return ""
+
+
+def get_object_user(obj: Model) -> User | None:
+ if hasattr(obj, "creator"):
+ return obj.creator
+ elif hasattr(obj, "user"):
+ return obj.user
+ elif hasattr(obj, "owner"):
+ return obj.owner
+ return None
+
+
+@lru_cache
+def get_app_verbose_name(app: str) -> str:
+ return apps.get_app_config(app).verbose_name