From f7d2285e74191bbbe63208add18dabc09f9ec798 Mon Sep 17 00:00:00 2001 From: kosh Date: Sun, 1 Sep 2024 13:47:11 +0530 Subject: [PATCH] Implement max 4 team-members not 5 members --- backend/data/sqlite-database.db | Bin 32768 -> 32768 bytes backend/src/rest_api.py | 3 +++ backend/src/utils/user.py | 14 ++++++++++---- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/backend/data/sqlite-database.db b/backend/data/sqlite-database.db index 42aca8a2153eac6229bb181eeb0e4b72c7539c32..e06b1f694771c35dbd189d11286e38e7542d0a9d 100644 GIT binary patch delta 117 zcmZo@U}|V!njpDS@o8=r6gbVx&8f}8 RAkLAInv;{i*(C0aA^>ky9zy^C delta 311 zcmZo@U}|V!njp=XJWMoB7$Mk*n}X`z{pW_cm0mZrt}#wmqit~n*C`iX)1RgoTH#rlABvPZtnh-?qNpR`NbKTc^RqcDX9+Wxrv!Mddc~@JZV{(DaFNUDQQ{xX_+8SR$4xg zPRUm(29lZiS!qD|{H#olV@=kxPBC}`4bkFaU|?Y6f6l=F9O%-!{HhYn=A2kf=LITc z;(yJ+|C;|BQ0aYsc}^x~amJF=#N1*n4rXR?&eG!4qGE`7KN$Fb02RIC=VxbT;RIO* W(yqm4GMPOf6ew|nce6>{8ASjD(Og^r diff --git a/backend/src/rest_api.py b/backend/src/rest_api.py index 546c49d..593a22b 100644 --- a/backend/src/rest_api.py +++ b/backend/src/rest_api.py @@ -56,6 +56,7 @@ def register_leader() -> flask.Response: -1, mail=mail, team_id=team_id, + team_leader=1, **request_data, )) user_id = utils.UserHandler.get_user_by_mail(mail).user_id @@ -117,11 +118,13 @@ def register() -> flask.Response: except KeyError: return flask.Response("Not logged in", 428) try: + print(utils.UserHandler.get_user_by_id(user_id)) team_id = utils.UserHandler.get_user_by_id(user_id).team_id utils.UserHandler.create_user(utils.User( -1, secrets.token_urlsafe(20), team_id=team_id, + team_leader=0, **flask.request.form, )) except TypeError: diff --git a/backend/src/utils/user.py b/backend/src/utils/user.py index 70f1f89..f1fecc4 100644 --- a/backend/src/utils/user.py +++ b/backend/src/utils/user.py @@ -20,6 +20,7 @@ class User: phone_number: int name: str team_id: int + team_leader: int def __init__( self, @@ -36,6 +37,7 @@ class User: pin_code: int|str, phone_number: int|str, name: str, + team_leader: bool|int|str, team_id: int|str, ) -> None: self.user_id: int = int(user_id) @@ -52,6 +54,7 @@ class User: self.phone_number: int = int(phone_number) self.name = name self.team_id = int(team_id) + self.team_leader = int(team_leader) def to_dict(self) -> dict: the_dict = vars(self) @@ -67,7 +70,7 @@ class UserHandler: cls, user: User ) -> 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() encrypted_password = bcrypt.hashpw(user.password.encode("utf-8"), salt) cls.__cursor.execute( @@ -88,7 +91,7 @@ class UserHandler: team_id, team_leader ) - VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 1) + VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) """, ( encrypted_password, @@ -104,6 +107,7 @@ class UserHandler: user.phone_number, user.name, user.team_id, + user.team_leader, ) ) cls.__connection.commit() @@ -134,7 +138,8 @@ class UserHandler: user[10], user[11], user[12], - user[13] + user[13], + user[14], ) @classmethod @@ -163,7 +168,8 @@ class UserHandler: user[10], user[11], user[12], - user[13] + user[13], + user[14], ) @classmethod