Merge pull request #561 from PROCOLLAB-github/release/user-profile-validation-fixes

Мелкие правки профиля пользователя

Author: Toksi86

news/mapping.py

@@ -14,7 +14,7 @@ class NewsMapping:
     @classmethod
     def get_name(cls, content_object) -> str:
         if isinstance(content_object, User):
-            f"{content_object.first_name} {content_object.last_name}"
+            return f"{content_object.first_name} {content_object.last_name}"
         if isinstance(content_object, Project) or isinstance(
             content_object, PartnerProgram
         ):

users/serializers.py

@@ -446,10 +446,11 @@ class Meta:
 
 class UserProgramsSerializer(serializers.ModelSerializer):
     year = serializers.SerializerMethodField()
+    logo = serializers.CharField(source="image_address", read_only=True)
 
     class Meta:
         model = PartnerProgram
-        fields = ["id", "tag", "name", "year"]
+        fields = ["id", "tag", "name", "year", "logo"]
 
     def get_year(self, program: PartnerProgram) -> int | None:
         user_program_profile = PartnerProgramUserProfile.objects.filter(

users/validators.py

@@ -45,11 +45,11 @@ def specialization_exists_validator(pk: int):
 def user_experience_years_range_validator(value: int):
     """
     Check range for choice entry/completion year.
-    (2000 - `now.year`)
+    (1971 - `now.year`)
     """
-    if value not in range(2000, timezone.now().year + 1):
+    if value not in range(1971, timezone.now().year + 1):
         raise DjangoValidationError(
-            f"Год должен быть в диапазоне 2000 - {timezone.now().year}"
+            f"Год должен быть в диапазоне 1971 - {timezone.now().year}"
         )