⬆️ New syntax for enum in format strings

td-org-uit-no · Oct 15, 2023 · c15255f · c15255f
1 parent 7488d86
commit c15255f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/app/api/admin.py b/app/api/admin.py
@@ -24,7 +24,7 @@ def give_existing_user_admin_privileges(request: Request, id: str, token: Access
     if member["role"] == Role.admin:
         raise HTTPException(400, "User already admin")
 
-    results = db.members.find_one_and_update({'id': member["id"]}, {'$set': {'role': f'{Role.admin}'}})
+    results = db.members.find_one_and_update({'id': member["id"]}, {'$set': {'role': f'{Role.admin.value}'}})
 
     if not results:
         raise HTTPException(500)
@@ -45,8 +45,8 @@ def create_admin_user(request: Request, newAdmin: MemberInput, token: AccessToke
         'id': uid,
         'email': newAdmin.email.lower(),  # Lowercase e-mail
         'password': pwd,
-        'role': f'{Role.admin}',
-        'status': f'{Status.inactive}',
+        'role': f'{Role.admin.value}',
+        'status': f'{Status.inactive.value}',
     }
 
     admin = newAdmin.model_dump()

diff --git a/app/api/auth.py b/app/api/auth.py
@@ -28,7 +28,7 @@ def login(request: Request, credentials: Credentials, response: Response):
         # activate members on login
         db.members.find_one_and_update(
             {'id': member.id},
-            {"$set": {'status': f'{Status.active}'}}
+            {"$set": {'status': f'{Status.active.value}'}}
         )
 
     token = create_token(member, request.app.config)

diff --git a/app/api/members.py b/app/api/members.py
@@ -30,8 +30,8 @@ def create_new_member(request: Request, newMember: MemberInput):
         'id': uid,
         'email': newMember.email.lower(),  # Lowercase e-mail
         'password': pwd,
-        'role': f'{Role.unconfirmed}',
-        'status': f'{Status.inactive}',
+        'role': f'{Role.unconfirmed.value}',
+        'status': f'{Status.inactive.value}',
         'penalty': 0
     }
 
@@ -102,7 +102,7 @@ def change_status(request: Request, token: AccessTokenPayload = Depends(authoriz
 
     result = db.members.find_one_and_update(
         {'id': member.id},
-        {"$set": {'status': f'{Status.active}'}}
+        {"$set": {'status': f'{Status.active.value}'}}
     )
     if not result:
         raise HTTPException(500)
@@ -123,8 +123,8 @@ def confirm_email(request: Request, code: str):
     user = db.members.find_one_and_update(
         {'id': validated['user_id']},
         {"$set":
-         {'role': f'{Role.member}',
-          'status': f'{Status.active}'}
+         {'role': f'{Role.member.value}',
+          'status': f'{Status.active.value}'}
          },
         return_document=ReturnDocument.AFTER)
     if not user:

diff --git a/tests/test_endpoints/test_members.py b/tests/test_endpoints/test_members.py
@@ -98,7 +98,7 @@ def test_member_activation(client):
     # inactive member
     client_login(client, second_member["email"], second_member["password"])
     # set member to inactive as login activates users
-    db.members.find_one_and_update({"email": second_member["email"]}, {"$set": {"status": f'{Status.inactive}'}})
+    db.members.find_one_and_update({"email": second_member["email"]}, {"$set": {"status": f'{Status.inactive.value}'}})
     member = db.members.find_one({'email': second_member["email"]})
     assert member and member["status"] == Status.inactive