Merge pull request #89 from PROCOLLAB-github/dev

Dev

Author: yakser

industries/tests.py

@@ -1,5 +1,6 @@
 from django.test import TestCase
 from rest_framework.test import APIRequestFactory, force_authenticate
+from tests.constants import USER_CREATE_DATA
 from users.models import CustomUser
 from users.views import UserList
 
@@ -90,15 +91,7 @@ def test_industry_update_with_wrong_data(self):
         self.assertEqual(response.status_code, 400)
 
     def _user_create(self):
-        request = self.factory.post(
-            "auth/users/",
-            {
-                "email": "only_for_test@test.test",
-                "password": "test_password",
-                "first_name": "Test_first_name",
-                "last_name": "Test_last_name",
-            },
-        )
+        request = self.factory.post("auth/users/", USER_CREATE_DATA)
         response = self.user_list_view(request)
         user_id = response.data["id"]
         user = CustomUser.objects.get(id=user_id)

news/tests.py

@@ -1,5 +1,6 @@
 from django.test import TestCase
 from rest_framework.test import APIRequestFactory, force_authenticate
+from tests.constants import USER_CREATE_DATA
 from users.models import CustomUser
 from users.views import UserList
 
@@ -118,15 +119,7 @@ def test_news_update_with_wrong_data(self):
         self.assertEqual(response.status_code, 400)
 
     def _user_create(self, is_staff=False):
-        request = self.factory.post(
-            "auth/users/",
-            {
-                "email": "only_for_test@test.test",
-                "password": "test_password",
-                "first_name": "Test_first_name",
-                "last_name": "Test_last_name",
-            },
-        )
+        request = self.factory.post("auth/users/", USER_CREATE_DATA)
         response = self.user_list_view(request)
         user_id = response.data["id"]
         user = CustomUser.objects.get(id=user_id)

projects/filters.py

@@ -27,12 +27,16 @@ class ProjectFilter(filters.FilterSet):
     """
 
     @classmethod
-    def filter_collaborator_count_lt(cls, queryset, name, value):
-        return queryset.alias(Count("collaborator")).filter(collaborator__count__lt=value)
+    def filter_collaborator_count_lte(cls, queryset, name, value):
+        return queryset.alias(Count("collaborator")).filter(
+            collaborator__count__lte=value
+        )
 
     @classmethod
-    def filter_collaborator_count_gt(cls, queryset, name, value):
-        return queryset.alias(Count("collaborator")).filter(collaborator__count__gt=value)
+    def filter_collaborator_count_gte(cls, queryset, name, value):
+        return queryset.alias(Count("collaborator")).filter(
+            collaborator__count__gte=value
+        )
 
     name__contains = filters.Filter(field_name="name", lookup_expr="contains")
     description__contains = filters.Filter(
@@ -50,10 +54,10 @@ def filter_collaborator_count_gt(cls, queryset, name, value):
         field_name="vacancies", lookup_expr="isnull", exclude=True
     )
     collaborator__count__gt = filters.NumberFilter(
-        field_name="collaborator", method="filter_collaborator_count_gt"
+        field_name="collaborator", method="filter_collaborator_count_gte"
     )
-    collaborator__count__lt = filters.NumberFilter(
-        field_name="collaborator", method="filter_collaborator_count_lt"
+    collaborator__count__lte = filters.NumberFilter(
+        field_name="collaborator", method="filter_collaborator_count_lte"
     )
     step = filters.NumberFilter(field_name="step")
 

projects/tests.py

@@ -4,6 +4,7 @@
 from industries.models import Industry
 from projects.models import Project
 from projects.views import ProjectList, ProjectDetail
+from tests.constants import USER_CREATE_DATA
 from users.models import CustomUser
 from users.views import UserList
 
@@ -63,15 +64,7 @@ def test_project_update(self):
         self.assertEqual(response.data["name"], "Test2")
 
     def user_create(self):
-        request = self.factory.post(
-            "auth/users/",
-            {
-                "email": "only_for_test@test.test",
-                "password": "very_strong_password",
-                "first_name": "Test",
-                "last_name": "Test",
-            },
-        )
+        request = self.factory.post("auth/users/", USER_CREATE_DATA)
         response = self.user_list_view(request)
         user_id = response.data["id"]
         user = CustomUser.objects.get(id=user_id)

tests/constants.py

@@ -0,0 +1,7 @@
+USER_CREATE_DATA = {
+    "email": "only_for_test@test.test",
+    "password": "very_strong_password",
+    "first_name": "Test",
+    "last_name": "Test",
+    "birthday": "2000-01-01",
+}

users/migrations/0023_alter_customuser_options_alter_customuser_birthday_and_more.py

@@ -0,0 +1,40 @@
+# Generated by Django 4.1.3 on 2022-12-11 14:17
+
+import datetime
+from django.db import migrations, models
+import django.db.models.expressions
+
+
+def set_birthday_defaults(apps, schema_editor):
+    CustomUser = apps.get_model("users", "CustomUser")
+    for user in CustomUser.objects.all():
+        if not user.birthday:
+            user.birthday = "2000-01-01"
+            user.save()
+
+
+def rev(apps, schema_editor):
+    pass
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0022_alter_customuser_user_type_and_more"),
+    ]
+
+    operations = [
+        migrations.RunPython(set_birthday_defaults, rev),
+        migrations.AlterModelOptions(
+            name="customuser",
+            options={
+                "verbose_name": "Пользователь",
+                "verbose_name_plural": "Пользователи",
+            },
+        ),
+        migrations.AlterField(
+            model_name="customuser",
+            name="birthday",
+            field=models.DateField(null=False, default="2000-01-01"),
+        ),
+    ]

users/migrations/0024_alter_customuser_birthday.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.1.3 on 2022-12-11 20:54
+
+from django.db import migrations, models
+import users.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0023_alter_customuser_options_alter_customuser_birthday_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="customuser",
+            name="birthday",
+            field=models.DateField(validators=[users.validators.user_birthday_validator]),
+        ),
+    ]

users/models.py

@@ -14,6 +14,7 @@
     VERBOSE_USER_TYPES,
 )
 from users.managers import CustomUserManager, UserAchievementManager
+from users.validators import user_birthday_validator
 
 
 def get_default_user_type():
@@ -67,7 +68,11 @@ class CustomUser(AbstractUser):
     patronymic = models.CharField(max_length=255, null=True, blank=True)
     key_skills = models.CharField(max_length=512, null=True, blank=True)
     avatar = models.URLField(null=True, blank=True)
-    birthday = models.DateField(null=True, blank=True)
+    birthday = models.DateField(
+        null=False,
+        blank=False,
+        validators=[user_birthday_validator],
+    )
     about_me = models.TextField(null=True, blank=True)
     status = models.CharField(max_length=255, null=True, blank=True)
     region = models.CharField(max_length=255, null=True, blank=True)
@@ -88,6 +93,10 @@ def get_key_skills(self) -> list[str]:
     def __str__(self):
         return f"User<{self.id}> - {self.first_name} {self.last_name}"
 
+    class Meta:
+        verbose_name = "Пользователь"
+        verbose_name_plural = "Пользователи"
+
 
 class UserAchievement(models.Model):
     """

users/tests.py

@@ -1,5 +1,6 @@
 from django.test import TestCase
 from rest_framework.test import APIRequestFactory, force_authenticate
+from tests.constants import USER_CREATE_DATA
 
 from users.models import CustomUser
 from users.views import UserList, UserDetail
@@ -10,15 +11,9 @@ def setUp(self):
         self.factory = APIRequestFactory()
         self.user_list_view = UserList.as_view()
         self.user_detail_view = UserDetail.as_view()
-        self.user_create_data = {
-            "email": "only_for_test@test.test",
-            "password": "very_strong_password",
-            "first_name": "Test",
-            "last_name": "Test",
-        }
 
     def test_user_creation(self):
-        request = self.factory.post("auth/users/", self.user_create_data)
+        request = self.factory.post("auth/users/", USER_CREATE_DATA)
         response = self.user_list_view(request)
         self.assertEqual(response.status_code, 201)
         self.assertEqual(response.data["email"], "only_for_test@test.test")
@@ -38,14 +33,14 @@ def test_user_creation_with_wrong_data(self):
         self.assertEqual(response.status_code, 400)
 
     def test_user_creation_with_existing_email(self):
-        request = self.factory.post("auth/users/", self.user_create_data)
+        request = self.factory.post("auth/users/", USER_CREATE_DATA)
         response = self.user_list_view(request)
         self.assertEqual(response.status_code, 201)
         response = self.user_list_view(request)
         self.assertEqual(response.status_code, 400)
 
     def test_user_update(self):
-        request = self.factory.post("auth/users/", self.user_create_data)
+        request = self.factory.post("auth/users/", USER_CREATE_DATA)
         response = self.user_list_view(request)
         user_id = response.data["id"]
         user = CustomUser.objects.get(id=user_id)

users/validators.py

@@ -0,0 +1,9 @@
+from django.utils import timezone
+from django.core.exceptions import ValidationError
+
+
+def user_birthday_validator(birthday):
+    """returns true if person > 14 years old"""
+    if (timezone.now().date() - birthday).days >= 14 * 365:
+        return True
+    raise ValidationError("Человек младше 14 лет")