Merge pull request #450 from PROCOLLAB-github/feature/rework_user_profile

PRO-471: New profile fields

Author: sh1nkey

.flake8

@@ -1,6 +1,11 @@
 [flake8]
 max-line-length = 120
 
+ignore =
+  VNE002
+  VNE003
+  W503
+
 exclude =
   ./.cache,
   ./.git,

news/serializers.py

@@ -5,6 +5,9 @@
 from files.serializers import UserFileSerializer
 from news.mapping import NewsMapping
 from news.models import News
+from projects.models import Project
+from users.models import CustomUser
+from feed.mapping import CONTENT_OBJECT_MAPPING, CONTENT_OBJECT_SERIALIZER_MAPPING
 
 
 User = get_user_model()

poetry.lock

@@ -17,7 +17,6 @@
     ProjectSubscribers,
     SwitchLeaderRole,
     LeaveProject,
-    SwitchLeaderRole,
 )
 
 app_name = "projects"

projects/urls.py

@@ -70,6 +70,7 @@ celery = "^5.4.0"
 django-celery-beat = "^2.6.0"
 weasyprint = "^62.3"
 django-anymail = "^12.0"
+phonenumbers = "^8.13.47"
 
 
 [build-system]

pyproject.toml

@@ -19,7 +19,9 @@
     Investor,
     UserLink,
     UserEducation,
+    UserWorkExperience,
     UserSkillConfirmation,
+    UserLanguages,
 )
 
 from core.admin import SkillToObjectInline
@@ -30,8 +32,22 @@
 class UserEducationInline(admin.TabularInline):
     model = UserEducation
     extra = 1
-    verbose_name = "Образование"
-    verbose_name_plural = "Образования"
+    verbose_name = "Образование пользователя"
+    verbose_name_plural = "Образование пользователя"
+
+
+class UserWorkExperienceInline(admin.TabularInline):
+    model = UserWorkExperience
+    extra = 1
+    verbose_name = "Работа пользователя"
+    verbose_name_plural = "Работа пользователя"
+
+
+class UserLanguagesInline(admin.TabularInline):
+    model = UserLanguages
+    extra = 1
+    verbose_name = "Знание языка"
+    verbose_name_plural = "Знание языков"
 
 
 @admin.register(CustomUser)
@@ -54,6 +70,7 @@ class CustomUserAdmin(admin.ModelAdmin):
                 "fields": (
                     "email",
                     "password",
+                    "phone_number",
                 )
             },
         ),
@@ -134,6 +151,8 @@ class CustomUserAdmin(admin.ModelAdmin):
     inlines = [
         SkillToObjectInline,
         UserEducationInline,
+        UserWorkExperienceInline,
+        UserLanguagesInline,
     ]
 
     readonly_fields = ("ordering_score",)
@@ -334,6 +353,20 @@ class UserEducationAdmin(admin.ModelAdmin):
     search_fields = ("user__first_name", "user__email")
 
 
+@admin.register(UserWorkExperience)
+class UserWorkExperienceAdmin(admin.ModelAdmin):
+    list_display = ("id", "user", "organization_name", "entry_year")
+    list_display_links = ("id", "organization_name")
+    search_fields = ("user__first_name", "user__email")
+
+
+@admin.register(UserLanguages)
+class UserLanguagesAdmin(admin.ModelAdmin):
+    list_display = ("id", "user", "language", "language_level")
+    list_display_links = ("id", "user")
+    search_fields = ("user__first_name", "user__email")
+
+
 @admin.register(UserSkillConfirmation)
 class UserSkillConfirmationAdmin(admin.ModelAdmin):
     list_display = ("id", "get_user_and_skill", "confirmed_by", "confirmed_at")

users/admin.py

@@ -35,3 +35,86 @@ class OnboardingStage(Enum):
 PROTOCOL = "https"
 if settings.DEBUG:
     PROTOCOL = "http"
+
+
+NOT_VALID_NUMBER_MESSAGE: str = (
+    "Номер телефона должен соответствовать международному стандарту. "
+    "Пример: +7 XXX XX-XX-XX | +375XXXXXXXXX | +995 (XXX) XX-XX-XX"
+)
+
+
+class UserEducationLevels(Enum):
+    """User education level lists to select from."""
+
+    SCHOOL = "Среднее общее образование"
+    COLLEGE = "Среднее профессиональное образование"
+    HIGHER_BACALAVR = "Высшее образование – бакалавриат, специалитет"
+    HIGHER_MAGISTRACY = "Высшее образование – магистратура"
+    HIGHER_POSTGRADUATE = "Высшее образование – аспирантура"
+
+    @classmethod
+    def choices(cls):
+        """Return a list of tuples (value, display_name) for choices."""
+        return [(item.value, item.value) for item in cls]
+
+
+class UserEducationStatuses(Enum):
+    """User education status lists to select from."""
+
+    APPRENTICE = "Ученик"
+    STUDENT = "Студент"
+    GRADUATE = "Выпускник"
+
+    @classmethod
+    def choices(cls):
+        """Return a list of tuples (value, display_name) for choices."""
+        return [(item.value, item.value) for item in cls]
+
+
+USER_EXPERIENCE_YEAR_VALIDATION_MESSAGE: str = "Год начала не может быть больше года завершения"
+
+# Working with user languages:
+USER_MAX_LANGUAGES_COUNT: int = 4
+COUNT_LANGUAGES_VALIDATION_MESSAGE: str = "Пользователь не может указать более 4 языков."
+UNIQUE_LANGUAGES_VALIDATION_MESSAGE: str = "Нельзя добавлять дубликаты языков"
+
+
+class UserLanguagesEnum(Enum):
+    """User languages lists to select from."""
+
+    ENGLISH = "Английский"
+    SPANISCH = "Испанский"
+    ITALIAN = "Итальянский"
+    GERMAN = "Немецкий"
+    JAPANESE = "Японский"
+    CHINESE = "Китайский"
+    ARABIC = "Арабский"
+    SWEDISH = "Шведский"
+    POLISH = "Польский"
+    CZECH = "Чешский"
+    RUSSIAN = "Русский"
+    FRENCH = "Французский"
+
+    @classmethod
+    def choices(cls):
+        """Return a list of tuples (value, display_name) for choices."""
+        return [(item.value, item.value) for item in cls]
+
+
+class UserLanguagesLevels(Enum):
+    """
+    User languages levels lists to select from.
+    (Level value in Cyrillic)
+    """
+
+    А1 = "А1"
+    А2 = "А2"
+    B1 = "B1"
+    B2 = "B2"
+    С1 = "С1"
+    С2 = "С2"
+
+    @classmethod
+    def choices(cls):
+        """Return a list of tuples (value, display_name) for choices."""
+        return [(item.value, item.value) for item in cls]

users/constants.py

@@ -75,7 +75,8 @@ class Migration(migrations.Migration):
                     models.PositiveSmallIntegerField(
                         blank=True,
                         null=True,
-                        validators=[users.validators.user_entry_year_education_validator],
+                        # Unable to perform new migrations due to missing validator:
+                        # validators=[users.validators.user_entry_year_education_validator],
                         verbose_name="Год поступления",
                     ),
                 ),