Implement max 4 team-members not 5 members
This commit is contained in:
parent
85ec0e1a4e
commit
f7d2285e74
Binary file not shown.
@ -56,6 +56,7 @@ def register_leader() -> flask.Response:
|
|||||||
-1,
|
-1,
|
||||||
mail=mail,
|
mail=mail,
|
||||||
team_id=team_id,
|
team_id=team_id,
|
||||||
|
team_leader=1,
|
||||||
**request_data,
|
**request_data,
|
||||||
))
|
))
|
||||||
user_id = utils.UserHandler.get_user_by_mail(mail).user_id
|
user_id = utils.UserHandler.get_user_by_mail(mail).user_id
|
||||||
@ -117,11 +118,13 @@ def register() -> flask.Response:
|
|||||||
except KeyError:
|
except KeyError:
|
||||||
return flask.Response("Not logged in", 428)
|
return flask.Response("Not logged in", 428)
|
||||||
try:
|
try:
|
||||||
|
print(utils.UserHandler.get_user_by_id(user_id))
|
||||||
team_id = utils.UserHandler.get_user_by_id(user_id).team_id
|
team_id = utils.UserHandler.get_user_by_id(user_id).team_id
|
||||||
utils.UserHandler.create_user(utils.User(
|
utils.UserHandler.create_user(utils.User(
|
||||||
-1,
|
-1,
|
||||||
secrets.token_urlsafe(20),
|
secrets.token_urlsafe(20),
|
||||||
team_id=team_id,
|
team_id=team_id,
|
||||||
|
team_leader=0,
|
||||||
**flask.request.form,
|
**flask.request.form,
|
||||||
))
|
))
|
||||||
except TypeError:
|
except TypeError:
|
||||||
|
@ -20,6 +20,7 @@ class User:
|
|||||||
phone_number: int
|
phone_number: int
|
||||||
name: str
|
name: str
|
||||||
team_id: int
|
team_id: int
|
||||||
|
team_leader: int
|
||||||
|
|
||||||
def __init__(
|
def __init__(
|
||||||
self,
|
self,
|
||||||
@ -36,6 +37,7 @@ class User:
|
|||||||
pin_code: int|str,
|
pin_code: int|str,
|
||||||
phone_number: int|str,
|
phone_number: int|str,
|
||||||
name: str,
|
name: str,
|
||||||
|
team_leader: bool|int|str,
|
||||||
team_id: int|str,
|
team_id: int|str,
|
||||||
) -> None:
|
) -> None:
|
||||||
self.user_id: int = int(user_id)
|
self.user_id: int = int(user_id)
|
||||||
@ -52,6 +54,7 @@ class User:
|
|||||||
self.phone_number: int = int(phone_number)
|
self.phone_number: int = int(phone_number)
|
||||||
self.name = name
|
self.name = name
|
||||||
self.team_id = int(team_id)
|
self.team_id = int(team_id)
|
||||||
|
self.team_leader = int(team_leader)
|
||||||
|
|
||||||
def to_dict(self) -> dict:
|
def to_dict(self) -> dict:
|
||||||
the_dict = vars(self)
|
the_dict = vars(self)
|
||||||
@ -67,7 +70,7 @@ class UserHandler:
|
|||||||
cls,
|
cls,
|
||||||
user: User
|
user: User
|
||||||
) -> None:
|
) -> None:
|
||||||
assert len(utils.TeamHandler.get_team_members(user.team_id)) <= 4
|
assert len(utils.TeamHandler.get_team_members(user.team_id)) < 4
|
||||||
salt = bcrypt.gensalt()
|
salt = bcrypt.gensalt()
|
||||||
encrypted_password = bcrypt.hashpw(user.password.encode("utf-8"), salt)
|
encrypted_password = bcrypt.hashpw(user.password.encode("utf-8"), salt)
|
||||||
cls.__cursor.execute(
|
cls.__cursor.execute(
|
||||||
@ -88,7 +91,7 @@ class UserHandler:
|
|||||||
team_id,
|
team_id,
|
||||||
team_leader
|
team_leader
|
||||||
)
|
)
|
||||||
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1)
|
VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
|
||||||
""",
|
""",
|
||||||
(
|
(
|
||||||
encrypted_password,
|
encrypted_password,
|
||||||
@ -104,6 +107,7 @@ class UserHandler:
|
|||||||
user.phone_number,
|
user.phone_number,
|
||||||
user.name,
|
user.name,
|
||||||
user.team_id,
|
user.team_id,
|
||||||
|
user.team_leader,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
cls.__connection.commit()
|
cls.__connection.commit()
|
||||||
@ -134,7 +138,8 @@ class UserHandler:
|
|||||||
user[10],
|
user[10],
|
||||||
user[11],
|
user[11],
|
||||||
user[12],
|
user[12],
|
||||||
user[13]
|
user[13],
|
||||||
|
user[14],
|
||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
@ -163,7 +168,8 @@ class UserHandler:
|
|||||||
user[10],
|
user[10],
|
||||||
user[11],
|
user[11],
|
||||||
user[12],
|
user[12],
|
||||||
user[13]
|
user[13],
|
||||||
|
user[14],
|
||||||
)
|
)
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
Loading…
x
Reference in New Issue
Block a user