Fix unit tests by mocking retrieve_conversation

Apply CodeRabbit suggestion to combine two DB queries into one by checking
conversation.user_id directly instead of calling validate_conversation_ownership.

Update unit tests to mock retrieve_conversation to avoid database initialization
errors during testing.

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

Author: max-svistunov

src/app/endpoints/feedback.py

@@ -24,11 +24,7 @@
     StatusResponse,
     UnauthorizedResponse,
 )
-from utils.endpoints import (
-    check_configuration_loaded,
-    retrieve_conversation,
-    validate_conversation_ownership,
-)
+from utils.endpoints import check_configuration_loaded, retrieve_conversation
 from utils.suid import get_suid
 
 logger = logging.getLogger(__name__)
@@ -125,7 +121,7 @@ async def feedback_endpoint_handler(
     user_id, _, _, _ = auth
     check_configuration_loaded(configuration)
 
-    # Validate conversation exists
+    # Validate conversation exists and belongs to the user
     conversation_id = feedback_request.conversation_id
     conversation = retrieve_conversation(conversation_id)
     if conversation is None:
@@ -134,9 +130,7 @@ async def feedback_endpoint_handler(
         )
         raise HTTPException(**response.model_dump())
 
-    # Validate conversation belongs to the user
-    owned_conversation = validate_conversation_ownership(user_id, conversation_id)
-    if owned_conversation is None:
+    if conversation.user_id != user_id:
         response = ForbiddenResponse.conversation(
             action="submit feedback for", resource_id=conversation_id, user_id=user_id
         )

tests/unit/app/endpoints/test_feedback.py

@@ -102,9 +102,17 @@ async def test_feedback_endpoint_handler(
     mocker.patch("app.endpoints.feedback.assert_feedback_enabled", return_value=None)
     mocker.patch("app.endpoints.feedback.store_feedback", return_value=None)
 
+    # Mock retrieve_conversation to return a conversation owned by test_user_id
+    mock_conversation = mocker.Mock()
+    mock_conversation.user_id = "test_user_id"
+    mocker.patch(
+        "app.endpoints.feedback.retrieve_conversation", return_value=mock_conversation
+    )
+
     # Prepare the feedback request mock
     feedback_request = mocker.Mock()
     feedback_request.model_dump.return_value = feedback_request_data
+    feedback_request.conversation_id = "12345678-abcd-0000-0123-456789abcdef"
 
     # Authorization tuple required by URL endpoint handler
     auth: AuthTuple = ("test_user_id", "test_user", True, "test_token")
@@ -126,6 +134,14 @@ async def test_feedback_endpoint_handler_error(mocker: MockerFixture) -> None:
     mock_authorization_resolvers(mocker)
     mocker.patch("app.endpoints.feedback.assert_feedback_enabled", return_value=None)
     mocker.patch("app.endpoints.feedback.check_configuration_loaded", return_value=None)
+
+    # Mock retrieve_conversation to return a conversation owned by test_user_id
+    mock_conversation = mocker.Mock()
+    mock_conversation.user_id = "test_user_id"
+    mocker.patch(
+        "app.endpoints.feedback.retrieve_conversation", return_value=mock_conversation
+    )
+
     # Mock Path.mkdir to raise OSError so the try block in store_feedback catches it
     mocker.patch(
         "app.endpoints.feedback.Path.mkdir", side_effect=OSError("Permission denied")
@@ -300,6 +316,14 @@ async def test_feedback_endpoint_valid_requests(
     """Test endpoint with valid feedback payloads."""
     mock_authorization_resolvers(mocker)
     mocker.patch("app.endpoints.feedback.store_feedback")
+
+    # Mock retrieve_conversation to return a conversation owned by mock_user_id
+    mock_conversation = mocker.Mock()
+    mock_conversation.user_id = "mock_user_id"
+    mocker.patch(
+        "app.endpoints.feedback.retrieve_conversation", return_value=mock_conversation
+    )
+
     request = FeedbackRequest(**{**VALID_BASE, **payload})
     response = await feedback_endpoint_handler(
         feedback_request=request,