Add additional roles, removed needless slash in password reset url

Author: yakser

.gitignore

@@ -135,4 +135,5 @@ dmypy.json
 
 cache
 
-static
+static
+staticfiles

users/migrations/0011_expert_additional_role_investor_additional_role_and_more.py

@@ -0,0 +1,34 @@
+# Generated by Django 4.1.2 on 2022-11-04 17:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0010_alter_expert_user_alter_investor_user_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="expert",
+            name="additional_role",
+            field=models.PositiveSmallIntegerField(
+                choices=[(2, "Ментор"), (3, "Эксперт"), (4, "Инвестор")], null=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="investor",
+            name="additional_role",
+            field=models.PositiveSmallIntegerField(
+                choices=[(2, "Ментор"), (3, "Эксперт"), (4, "Инвестор")], null=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="mentor",
+            name="additional_role",
+            field=models.PositiveSmallIntegerField(
+                choices=[(2, "Ментор"), (3, "Эксперт"), (4, "Инвестор")], null=True
+            ),
+        ),
+    ]

users/models.py

@@ -86,6 +86,26 @@ def __str__(self):
         return f"User<{self.id}> - {self.first_name} {self.last_name}"
 
 
+class AbstractUserWithRole(models.Model):
+    MENTOR = 2
+    EXPERT = 3
+    INVESTOR = 4
+
+    VERBOSE_ROLE_TYPES = (
+        (MENTOR, "Ментор"),
+        (EXPERT, "Эксперт"),
+        (INVESTOR, "Инвестор"),
+    )
+
+    additional_role = models.PositiveSmallIntegerField(
+        choices=VERBOSE_ROLE_TYPES,
+        null=True,
+    )
+
+    class Meta:
+        abstract = True
+
+
 class Member(models.Model):
     user = models.OneToOneField(
         CustomUser, on_delete=models.CASCADE, related_name="member"
@@ -99,7 +119,7 @@ def __str__(self):
         return f"Member<{self.id}> - {self.user.first_name} {self.user.last_name}"
 
 
-class Mentor(models.Model):
+class Mentor(AbstractUserWithRole):
     """
     Mentor model
 
@@ -119,7 +139,7 @@ def __str__(self):
         return f"Mentor<{self.id}> - {self.user.first_name} {self.user.last_name}"
 
 
-class Expert(models.Model):
+class Expert(AbstractUserWithRole):
     """
     Expert model
 
@@ -143,7 +163,7 @@ def __str__(self):
         return f"Expert<{self.id}> - {self.user.first_name} {self.user.last_name}"
 
 
-class Investor(models.Model):
+class Investor(AbstractUserWithRole):
     """
     Investor model
 

users/serializers.py

@@ -20,6 +20,7 @@ class Meta:
         fields = [
             "job",
             "useful_to_project",
+            "additional_role",
         ]
 
 
@@ -29,6 +30,7 @@ class Meta:
         fields = [
             "preferred_industries",
             "useful_to_project",
+            "additional_role",
         ]
 
 
@@ -38,6 +40,7 @@ class Meta:
         fields = [
             "interaction_process_description",
             "preferred_industries",
+            "additional_role",
         ]
 
 

users/urls.py

@@ -31,7 +31,7 @@
         name="password_reset_sent",
     ),
     re_path(
-        r"^password-reset//(?P<key>[-:\w]+)/$",
+        r"^password-reset/(?P<key>[-:\w]+)/$",
         ResetPassword.as_view(),
         name="password_reset",
     ),