Add user telegram information (#253)

autotests/clients/rest/users/client.py

@@ -75,6 +75,7 @@ async def update_user(
             first_name: str,
             last_name: str,
             about: str | None = None,
+            telegram: str | None = None,
             main_specialization_id: uuid.UUID | None = None,
             secondary_specialization_id: uuid.UUID | None = None,
     ) -> UserResponse:
@@ -83,6 +84,7 @@ async def update_user(
             first_name=first_name,
             last_name=last_name,
             about=about,
+            telegram=telegram,
             main_specialization_id=main_specialization_id,
             secondary_specialization_id=secondary_specialization_id,
         )

autotests/clients/rest/users/models.py

@@ -19,6 +19,7 @@ class JWTData(BaseModel):
 class UserResponse(BaseModel):
     id: uuid.UUID
     email: EmailStr | None
+    telegram: str | None
     first_name: str | None
     last_name: str | None
     is_activated: bool
@@ -34,6 +35,7 @@ class UserUpdateRequest(BaseModel):
     first_name: str
     last_name: str
     about: str | None
+    telegram: str | None
     main_specialization_id: uuid.UUID | None
     secondary_specialization_id: uuid.UUID | None
 

autotests/flow/test_users.py

@@ -74,12 +74,14 @@ async def test_update_user(
         first_name = "Not-Oleg"
         last_name = "Not-Yurchik"
         about = "New about"
+        telegram = "+79123456789"
 
         user = await oleg_users_rest_client.update_user(
             user_id=oleg_id,
             first_name=first_name,
             last_name=last_name,
             about=about,
+            telegram=telegram,
             main_specialization_id=backend_specialization_id,
             secondary_specialization_id=web_design_specialization_id,
         )
@@ -88,6 +90,7 @@ async def test_update_user(
             "first_name": first_name,
             "last_name": last_name,
             "about": about,
+            "telegram": telegram,
             "main_specialization_id": backend_specialization_id,
             "secondary_specialization_id": web_design_specialization_id,
         })
@@ -97,6 +100,7 @@ async def test_update_user(
         assert user.first_name == first_name
         assert user.last_name == last_name
         assert user.about == about
+        assert user.telegram == telegram
         assert user.main_specialization_id == backend_specialization_id
         assert user.secondary_specialization_id == web_design_specialization_id
 

sapphire/database/migrations/versions/891640b6839e_init.py

@@ -49,11 +49,13 @@ def upgrade() -> None:
         sa.Column("first_name", sa.String(), nullable=True),
         sa.Column("last_name", sa.String(), nullable=True),
         sa.Column("avatar", sa.String(), nullable=True),
+        sa.Column("telegram", sa.String(), nullable=True),
         sa.Column("is_activated", sa.Boolean(), nullable=False),
         sa.Column("created_at", sa.DateTime(timezone=True), nullable=False),
         sa.Column("updated_at", sa.DateTime(timezone=True), nullable=False),
         sa.PrimaryKeyConstraint("id"),
         sa.UniqueConstraint("avatar"),
+        sa.UniqueConstraint("telegram"),
         sa.UniqueConstraint("email"),
     )
     op.create_table("chat_members",

sapphire/database/models/users.py

@@ -19,6 +19,7 @@ class User(Base):
     first_name: Mapped[str | None]
     last_name: Mapped[str | None]
     avatar: Mapped[str | None] = mapped_column(unique=True)
+    telegram: Mapped[str | None] = mapped_column(unique=True)
     is_activated: Mapped[bool] = mapped_column(default=False)
 
     created_at: Mapped[datetime] = mapped_column(default=now)
@@ -33,7 +34,11 @@ def has_avatar(self) -> bool:
         return self.avatar is not None
 
     def activate(self) -> bool:
-        if (self.first_name or "").strip() and (self.last_name or "").strip():
+        if (
+                (self.first_name or "").strip() and
+                (self.last_name or "").strip() and
+                (self.telegram or "").strip()
+        ):
             self.is_activated = True
 
         return self.is_activated

sapphire/users/api/rest/schemas.py

@@ -10,6 +10,7 @@ class UserResponse(BaseModel):
 
     id: uuid.UUID
     email: EmailStr | None
+    telegram: str | None
     first_name: str | None
     last_name: str | None
     is_activated: bool
@@ -25,6 +26,7 @@ def from_db_model(cls, user: User, with_email: bool = True) -> "UserResponse":
         return cls(
             id=user.id,
             email=user.email if with_email else None,
+            telegram=user.telegram,
             first_name=user.first_name,
             last_name=user.last_name,
             is_activated=user.is_activated,

sapphire/users/api/rest/users/handlers.py

@@ -45,6 +45,7 @@ async def update_user(
             first_name=data.first_name,
             last_name=data.last_name,
             about=data.about,
+            telegram=data.telegram,
             main_specialization_id=data.main_specialization_id,
             secondary_specialization_id=data.secondary_specialization_id
         )

sapphire/users/api/rest/users/schemas.py

@@ -7,5 +7,6 @@ class UserUpdateRequest(BaseModel):
     first_name: constr(strip_whitespace=True, min_length=1)
     last_name: constr(strip_whitespace=True, min_length=1)
     about: str | None
+    telegram: str | None
     main_specialization_id: uuid.UUID | None
     secondary_specialization_id: uuid.UUID | None

sapphire/users/database/service.py

@@ -49,6 +49,7 @@ async def update_user(
             first_name: str | None | Type[Empty] = Empty,
             last_name: str | None | Type[Empty] = Empty,
             avatar: str | None | Type[Empty] = Empty,
+            telegram: str | None | Type[Empty] = Empty,
             about: str | None | Type[Empty] = Empty,
             main_specialization_id: uuid.UUID | None | Type[Empty] = Empty,
             secondary_specialization_id: uuid.UUID | None | Type[Empty] = Empty,
@@ -61,6 +62,8 @@ async def update_user(
             user.last_name = last_name
         if avatar is not Empty:
             user.avatar = avatar
+        if telegram is not Empty:
+            user.telegram = telegram
         if about is not Empty:
             user.profile.about = about
         if main_specialization_id is not Empty: