Merge branch 'dev' into feature/linter-print-short

Author: LolAnthony

core/migrations/0005_skill_userskilltag_skilltoobject.py

@@ -0,0 +1,94 @@
+# Generated by Django 4.2.3 on 2023-12-16 12:16
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("contenttypes", "0002_remove_content_type_name"),
+        ("core", "0004_alter_link_unique_together"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Skill",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("skill", models.CharField(max_length=256)),
+            ],
+            options={
+                "verbose_name": "Навык",
+                "verbose_name_plural": "Навыки",
+                "ordering": ["skill"],
+            },
+        ),
+        migrations.CreateModel(
+            name="UserSkillTag",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("skill_tag", models.CharField(max_length=256)),
+                (
+                    "skill",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="tags",
+                        to="core.skill",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Тег навыка",
+                "verbose_name_plural": "Теги навыков",
+                "ordering": ["skill_tag"],
+            },
+        ),
+        migrations.CreateModel(
+            name="SkillToObject",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("object_id", models.PositiveIntegerField()),
+                (
+                    "content_type",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="skills",
+                        to="contenttypes.contenttype",
+                    ),
+                ),
+                (
+                    "skill",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="skills",
+                        to="core.skill",
+                    ),
+                ),
+            ],
+        ),
+    ]

core/models.py

@@ -1,8 +1,8 @@
 from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import Model
 from django.db import models
+from django.db.models import Model
 
 User = get_user_model()
 
@@ -99,3 +99,54 @@ class Meta:
 
     def __str__(self):
         return f"View<{self.user} - {self.content_object}>"
+
+
+class Skill(models.Model):
+    """
+    Skill model
+    """
+
+    skill = models.CharField(max_length=256, null=False)
+
+    class Meta:
+        verbose_name = "Навык"
+        verbose_name_plural = "Навыки"
+        ordering = ["skill"]
+
+
+class UserSkillTag(models.Model):
+    """
+    User skill tag model
+    """
+
+    skill_tag = models.CharField(max_length=256, null=False)
+    skill = models.ForeignKey(
+        Skill,
+        on_delete=models.CASCADE,
+        related_name="tags",
+    )
+
+    class Meta:
+        verbose_name = "Тег навыка"
+        verbose_name_plural = "Теги навыков"
+        ordering = ["skill_tag"]
+
+
+class SkillToObject(models.Model):
+    """
+    Skill model for skill_2_user/vacancy/project/etc relation
+    """
+
+    skill = models.ForeignKey(
+        Skill,
+        on_delete=models.CASCADE,
+        related_name="skills",
+    )
+
+    content_type = models.ForeignKey(
+        ContentType,
+        on_delete=models.CASCADE,
+        related_name="skills",
+    )
+    object_id = models.PositiveIntegerField()
+    content_object = GenericForeignKey("content_type", "object_id")

poetry.lock

@@ -1,3 +1,4 @@
+import datetime
 from django.contrib.auth import get_user_model
 from django.db.models import Q
 from django_filters import rest_framework as filters
@@ -43,6 +44,21 @@ def filter_by_partner_program(cls, queryset, name, value):
         except PartnerProgram.DoesNotExist:
             return User.objects.none()
 
+    @classmethod
+    def filter_age(cls, queryset, name, value):
+        start, stop = map(int, value.split(","))
+        start, stop = min(start, stop), max(start, stop)
+        return queryset.filter(
+            Q(
+                birthday__gte=datetime.datetime.now()
+                - datetime.timedelta(days=365.24 * int(stop))
+            )
+            & Q(
+                birthday__lte=datetime.datetime.now()
+                - datetime.timedelta(days=365.24 * int(start))
+            )
+        )
+
     @classmethod
     def filter_by_fullname(cls, queryset, name, value):
         words = value.split()
@@ -77,8 +93,7 @@ def filter_by_fullname(cls, queryset, name, value):
     )
     fullname = filters.CharFilter(method="filter_by_fullname")
 
-    age__gte = filters.NumberFilter(field_name="age", lookup_expr="gte")
-    age__lte = filters.NumberFilter(field_name="age", lookup_expr="lte")
+    age = filters.Filter(field_name="age", method="filter_age")
 
     class Meta:
         model = User