🐛 fix: streamline user update logic and enhance test cases for user updates

Author: Whyle

app/repositories/user_repository.py

@@ -122,9 +122,7 @@ async def update_user(self, user_id: EmailStr, user_data: schemas.UserUpdate):
             update_payload["remember_me"] = user_data.remember_me
         if user_data.scopes is not None and user_data.scopes != user_current_data.get("scopes"):
             update_payload["scopes"] = user_data.scopes
-        if user_data.name is not None and user_data.name != user_current_data.get(
-            "name"
-        ):
+        if user_data.name is not None and user_data.name != user_current_data.get("name"):
             update_payload["name"] = user_data.name
 
         print(f"[USER REPO] Update payload: {update_payload}")

app/routes/auth.py

@@ -32,10 +32,6 @@
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="auth/token")
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
 
-def init_router(app_instance):
-    yield
-
-
 def security_check(): # pragma: no cover
     if SECRET_KEY_JWT == "$2b$12$zqt9Rgv1PzORjG5ghJSb6OSdYrt7f7cLc38a21DgX/DMyqt80AUCi":
         print(

tests/repositories/test_user_repository.py

@@ -169,6 +169,7 @@ async def test__unit_test__update_user_success(user_repository, mock_database):
 
     update_data = UserUpdate(
          _id = "user@test.com",
+        name="Test",
         password="newpass",
         is_initialized=True,
         remember_me=True,

tests/routes/test_user.py

@@ -38,7 +38,25 @@ async def get_by_email(self, email: str):
                     "hashed_password": "$2b$12$zqt9Rgv1PzORjG5ghJSb6OSdYrt7f7cLc38a21DgX/DMyqt80AUCi",
                     "is_initialized": True,
                 }
-            if email == "hi2@hi.com":
+            # if email == "hi2@hi.com":
+            #     return {
+            #         "_id": "user123",
+            #         "name": "Bob",
+            #         "email": email,
+            #         "scopes": AccessRoles.USER,
+            #         "hashed_password": "$2b$12$zqt9Rgv1PzORjG5ghJSb6OSdYrt7f7cLc38a21DgX/DMyqt80AUCi",
+            #         "is_initialized": False,
+            #     }
+            # if email == "hi3@hi.com":
+            #     return {
+            #         "_id": "user123",
+            #         "name": "Bob",
+            #         "email": email,
+            #         "scopes": AccessRoles.USER,
+            #         "hashed_password": "$2b$12$zqt9Rgv1PzORjG5ghJSb6OSdYrt7f7cLc38a21DgX/DMyqt80AUCi",
+            #         "is_initialized": False,
+            #     }
+            if email == "hi4@hi.com":
                 return {
                     "_id": "user123",
                     "name": "Bob",
@@ -47,17 +65,19 @@ async def get_by_email(self, email: str):
                     "hashed_password": "$2b$12$zqt9Rgv1PzORjG5ghJSb6OSdYrt7f7cLc38a21DgX/DMyqt80AUCi",
                     "is_initialized": False,
                 }
+           
         async def update_user(self, user_id: str, user_data: UserUpdate):
             MockUpdateResult = MagicMock()
             print(user_id, user_data)
             if user_id == "hi@hi.com" or user_id == "hihi@hi.com":
                 MockUpdateResult.modified_count = 1
                 MockUpdateResult.matched_count = 1
                 return MockUpdateResult
-            if user_id == "hi2@hi.com":
+            if user_id == "hi3@hi.com":
                 MockUpdateResult.modified_count = 0
                 MockUpdateResult.matched_count = 1
                 return MockUpdateResult
+            
             if user_id == "error@error.com":
                 raise Exception("error")
             MockUpdateResult.modified_count = 0
@@ -145,7 +165,7 @@ async def test__unit_test__update_user(fake_user_repo, monkeypatch):
 
 @pytest.mark.asyncio
 async def test__unit_test__update_user_same_data(fake_user_repo, monkeypatch):
-    user_new_data = UserUpdate(_id="hi2@hi.com", password="newpassword", is_initialized=True, remember_me=True, scopes=AccessRoles.USER)
+    user_new_data = UserUpdate(_id="hi3@hi.com", password="newpassword", is_initialized=True, remember_me=True, scopes=AccessRoles.USER)
     result = await update_user(user_new_data, current_user, fake_user_repo)
     assert result["message"] != None
 
@@ -252,14 +272,12 @@ async def test__unit_test__update_password_old_password_error(fake_user_repo, mo
 @pytest.mark.asyncio
 async def test__unit_test__update_password_is_not_init_with_not_found(fake_user_repo, monkeypatch):
     user_data = UserUpdatePassword(password="Abc123!@#@js", current_password="test_password")
-    current_user = {"sub": "hi2@hi.com"}
+    current_user = {"sub": "hi4@hi.com"}
+  
     with pytest.raises(HTTPException) as excinfo:
         await update_password(user_data, current_user, fake_user_repo)
     assert excinfo.value.status_code == 500
 
-
-
-
 @pytest.mark.asyncio
 async def test__unit_test__reset_password(fake_user_repo, monkeypatch):
     user_data = UserForgotPassword(email="hi@hi.com")