Merge remote-tracking branch 'origin/dev' into dev

VeryBigSad · VeryBigSad · commit c12920025bcf · 2022-11-17T20:01:49.000+03:00
diff --git a/projects/migrations/0006_alter_project_name_alter_project_step.py b/projects/migrations/0006_alter_project_name_alter_project_step.py
@@ -0,0 +1,33 @@
+# Generated by Django 4.1.2 on 2022-11-17 13:58
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("projects", "0005_alter_project_collaborators_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="project",
+            name="name",
+            field=models.CharField(blank=True, max_length=256, null=True),
+        ),
+        migrations.AlterField(
+            model_name="project",
+            name="step",
+            field=models.PositiveSmallIntegerField(
+                blank=True,
+                choices=[
+                    (0, "Идея"),
+                    (1, "Прототип"),
+                    (2, "MVP(Минимально жизнеспособный продукт)"),
+                    (3, "Первые продажи"),
+                    (4, "Масштабирование"),
+                ],
+                null=True,
+            ),
+        ),
+    ]
diff --git a/projects/models.py b/projects/models.py
@@ -30,11 +30,11 @@ class Project(models.Model):
         datetime_updated: A DateTimeField indicating date of update.
     """
 
-    name = models.CharField(max_length=256, null=False)
+    name = models.CharField(max_length=256, null=True, blank=True)
     description = models.TextField(blank=True)
     short_description = models.TextField(blank=True)
     region = models.CharField(max_length=256, blank=True)
-    step = models.PositiveSmallIntegerField(choices=VERBOSE_STEPS, null=False)
+    step = models.PositiveSmallIntegerField(choices=VERBOSE_STEPS, null=True, blank=True)
 
     industry = models.ForeignKey(
         Industry,
diff --git a/projects/serializers.py b/projects/serializers.py
@@ -14,6 +14,7 @@ class Meta:
             "title",
             "status",
         ]
+        ref_name = "Projects"
 
 
 class ProjectAchievementListSerializer(serializers.ModelSerializer):
@@ -168,3 +169,4 @@ class Meta:
             "status",
             "projects",
         ]
+        ref_name = "Projects"
diff --git a/users/admin.py b/users/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import CustomUser
+from .models import CustomUser, UserAchievement
 
 
 @admin.register(CustomUser)
@@ -91,3 +91,8 @@ class CustomUserAdmin(admin.ModelAdmin):
     def save_model(self, request, obj, form, change):
         obj.set_password(form.cleaned_data["password"])
         obj.save()
+
+
+@admin.register(UserAchievement)
+class UserAchievementAdmin(admin.ModelAdmin):
+    list_display = ("id", "title", "status", "user")
diff --git a/users/managers.py b/users/managers.py
@@ -1,5 +1,6 @@
 from django.contrib.auth.hashers import make_password
 from django.contrib.auth.models import UserManager
+from django.db.models import Manager
 
 
 class CustomUserManager(UserManager):
@@ -32,6 +33,7 @@ def get_users_for_detail_view(self):
                 "member__preferred_industries",
                 "expert__preferred_industries",
                 "investor__preferred_industries",
+                "achievements",
             )
             .all()
         )
@@ -42,3 +44,19 @@ def _create_user(self, email, password, **extra_fields):
         user.password = make_password(password)
         user.save()
         return user
+
+
+class UserAchievementManager(Manager):
+    def get_achievements_for_list_view(self):
+        return (
+            self.get_queryset()
+            .select_related("user")
+            .only("id", "title", "status", "user__id")
+        )
+
+    def get_achievements_for_detail_view(self):
+        return (
+            self.get_queryset()
+            .select_related("user")
+            .only("id", "title", "status", "user")
+        )
diff --git a/users/migrations/0016_userachievement.py b/users/migrations/0016_userachievement.py
@@ -0,0 +1,44 @@
+# Generated by Django 4.1.2 on 2022-11-16 16:01
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0015_customuser_speciality"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="UserAchievement",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("title", models.CharField(max_length=256)),
+                ("status", models.CharField(max_length=256)),
+                (
+                    "user",
+                    models.ForeignKey(
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="achievements",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Достижение",
+                "verbose_name_plural": "Достижения",
+            },
+        ),
+    ]
diff --git a/users/models.py b/users/models.py
@@ -13,7 +13,7 @@
     VERBOSE_ROLE_TYPES,
     VERBOSE_USER_TYPES,
 )
-from users.managers import CustomUserManager
+from users.managers import CustomUserManager, UserAchievementManager
 
 
 def get_default_user_type():
@@ -91,6 +91,36 @@ def __str__(self):
         return f"User<{self.id}> - {self.first_name} {self.last_name}"
 
 
+class UserAchievement(models.Model):
+    """
+    UserAchievement model
+
+     Attributes:
+        title: A CharField title of the achievement.
+        status: A CharField place or status of the achievement.
+        user: A ForeignKey referring to the CustomUser model.
+    """
+
+    title = models.CharField(max_length=256, null=False)
+    status = models.CharField(max_length=256, null=False)
+
+    user = models.ForeignKey(
+        CustomUser,
+        on_delete=models.SET_NULL,
+        null=True,
+        related_name="achievements",
+    )
+
+    objects = UserAchievementManager()
+
+    def __str__(self):
+        return f"UserAchievement<{self.id}>"
+
+    class Meta:
+        verbose_name = "Достижение"
+        verbose_name_plural = "Достижения"
+
+
 class AbstractUserWithRole(models.Model):
     """
     AbstractUserWithRole abstract model
diff --git a/users/permissions.py b/users/permissions.py
@@ -0,0 +1,19 @@
+from rest_framework.permissions import BasePermission, SAFE_METHODS
+
+
+class IsAchievementOwnerOrReadOnly(BasePermission):
+    """
+    Allows access to update only to himself.
+    """
+
+    def has_permission(self, request, view) -> bool:
+        if request.method in SAFE_METHODS or (
+            request.user and request.user.id == request.data.get("user")
+        ):
+            return True
+        return False
+
+    def has_object_permission(self, request, view, obj):
+        if request.method in SAFE_METHODS or (obj.user == request.user):
+            return True
+        return False
diff --git a/users/serializers.py b/users/serializers.py
@@ -1,7 +1,18 @@
 from django.forms.models import model_to_dict
 from rest_framework import serializers
 
-from .models import CustomUser, Expert, Investor, Member, Mentor
+from .models import CustomUser, Expert, Investor, Member, Mentor, UserAchievement
+
+
+class AchievementListSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = UserAchievement
+        fields = [
+            "id",
+            "title",
+            "status",
+        ]
+        ref_name = "Users"
 
 
 class MemberSerializer(serializers.ModelSerializer):
@@ -45,6 +56,7 @@ class UserDetailSerializer(serializers.ModelSerializer):
     investor = InvestorSerializer(required=False)
     expert = ExpertSerializer(required=False)
     mentor = MentorSerializer(required=False)
+    achievements = AchievementListSerializer(required=False, many=True)
 
     class Meta:
         model = CustomUser
@@ -55,6 +67,7 @@ class Meta:
             "first_name",
             "last_name",
             "patronymic",
+            "birthday",
             "speciality",
             "avatar",
             "city",
@@ -63,6 +76,7 @@ class Meta:
             "investor",
             "expert",
             "mentor",
+            "achievements",
         ]
 
     def update(self, instance, validated_data):
@@ -90,9 +104,9 @@ def update(self, instance, validated_data):
         # maybe it's better to write ALLOWED_UPDATABLE_FIELDS = ["first_name", "last_name", ...]
         IMMUTABLE_FIELDS = ("email", "user_type", "is_active", "password")
         USER_TYPE_FIELDS = ("member", "investor", "expert", "mentor")
-
+        RELATED_FIELDS = ("achievements",)
         for attr, value in validated_data.items():
-            if attr in IMMUTABLE_FIELDS + USER_TYPE_FIELDS:
+            if attr in IMMUTABLE_FIELDS + USER_TYPE_FIELDS + RELATED_FIELDS:
                 continue
             setattr(instance, attr, value)
 
@@ -113,18 +127,32 @@ class Meta:
         model = CustomUser
         fields = [
             "id",
-            "user_type",
             "email",
+            "user_type",
             "first_name",
             "last_name",
             "patronymic",
             "avatar",
+            "speciality",
+            "birthday",
             "is_active",
             "password",
         ]
         extra_kwargs = {"password": {"write_only": True}}
 
 
+class AchievementDetailSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = UserAchievement
+        fields = [
+            "id",
+            "title",
+            "status",
+            "user",
+        ]
+        ref_name = "Users"
+
+
 class EmailSerializer(serializers.Serializer):
     email = serializers.EmailField()
 
diff --git a/users/urls.py b/users/urls.py
@@ -1,14 +1,16 @@
 from django.urls import path, re_path
 
 from users.views import (
+    AchievementDetail,
+    AchievementList,
     CurrentUser,
     EmailResetPassword,
     ResetPassword,
     SpecialistsList,
-    UserAdditionalRoles,
+    UserAdditionalRolesView,
     UserDetail,
     UserList,
-    UserTypes,
+    UserTypesView,
     VerifyEmail,
 )
 
@@ -19,11 +21,13 @@
         "specialists/", SpecialistsList.as_view()
     ),  # this url actually returns  mentors, experts and investors
     path("users/", UserList.as_view()),
-    path("users/roles/", UserAdditionalRoles.as_view()),
-    path("users/types/", UserTypes.as_view()),
+    path("users/roles/", UserAdditionalRolesView.as_view()),
+    path("users/types/", UserTypesView.as_view()),
     path("users/<int:pk>/", UserDetail.as_view()),
     path("users/reset-password/", EmailResetPassword.as_view()),
     path("users/current/", CurrentUser.as_view()),
+    path("users/achievements/", AchievementList.as_view()),
+    path("users/achievements/<int:pk>/", AchievementDetail.as_view()),
     re_path(
         r"^account-confirm-email/",
         VerifyEmail.as_view(),
diff --git a/users/views.py b/users/views.py
diff --git a/vacancy/serializers.py b/vacancy/serializers.py
diff --git a/vacancy/urls.py b/vacancy/urls.py
diff --git a/vacancy/views.py b/vacancy/views.py

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ class Meta:`
`14`	`14`	`"title",`
`15`	`15`	`"status",`
`16`	`16`	`]`
	`17`	`+ ref_name = "Projects"`
`17`	`18`
`18`	`19`
`19`	`20`	`class ProjectAchievementListSerializer(serializers.ModelSerializer):`
`@@ -168,3 +169,4 @@ class Meta:`
`168`	`169`	`"status",`
`169`	`170`	`"projects",`
`170`	`171`	`]`
	`172`	`+ ref_name = "Projects"`