♻️ refactor mcp app/service/db/test case

Author: ljy65535

backend/apps/remote_mcp_app.py

@@ -130,6 +130,10 @@ async def check_mcp_health(mcp_url: str, service_name: str, authorization: Optio
             status_code=HTTPStatus.OK,
             content={"status": "success"}
         )
+    except MCPConnectionError as e:
+        logger.error(f"MCP connection failed: {e}")
+        raise HTTPException(status_code=HTTPStatus.SERVICE_UNAVAILABLE,
+                            detail="MCP connection failed")
     except Exception as e:
         logger.error(f"Failed to check the health of the MCP server: {e}")
         raise HTTPException(status_code=HTTPStatus.INTERNAL_SERVER_ERROR,

backend/services/remote_mcp_service.py

@@ -79,3 +79,5 @@ async def check_mcp_health_and_update_db(mcp_url, service_name, tenant_id, user_
         tenant_id=tenant_id,
         user_id=user_id,
         status=status)
+    if not status:
+        raise MCPConnectionError("MCP connection failed")

frontend/services/mcpService.ts

@@ -318,10 +318,14 @@ export const checkMcpServerHealth = async (mcpUrl: string, serviceName: string)
         message: data.message || t('mcpService.message.healthCheckSuccess')
       };
     } else {
+      let errorMessage = data.message || t('mcpService.message.healthCheckFailed');
+      if (response.status === 503) {
+        errorMessage = t('mcpService.message.cannotConnectToServer');
+      }
       return {
         success: false,
         data: null,
-        message: data.message || t('mcpService.message.healthCheckFailed')
+        message: errorMessage
       };
     }
   } catch (error) {

test/backend/app/test_remote_mcp_app.py

@@ -325,6 +325,29 @@ def test_check_mcp_health_success(self, mock_health_check, mock_get_user_id):
             "http://test.com", "test_service", "tenant456", "user123"
         )
 
+    @patch('apps.remote_mcp_app.get_current_user_id')
+    @patch('apps.remote_mcp_app.check_mcp_health_and_update_db')
+    def test_check_mcp_health_connection_error(self, mock_health_check, mock_get_user_id):
+        """Test MCP connection error during health check"""
+        mock_get_user_id.return_value = ("user123", "tenant456")
+        mock_health_check.side_effect = MCPConnectionError("MCP connection failed")
+
+        response = client.get(
+            "/mcp/healthcheck",
+            params={"mcp_url": "http://unreachable.com",
+                    "service_name": "test_service"},
+            headers={"Authorization": "Bearer test_token"}
+        )
+
+        assert response.status_code == HTTPStatus.SERVICE_UNAVAILABLE
+        data = response.json()
+        assert "MCP connection failed" in data["detail"]
+
+        mock_get_user_id.assert_called_once_with("Bearer test_token")
+        mock_health_check.assert_called_once_with(
+            "http://unreachable.com", "test_service", "tenant456", "user123"
+        )
+
     @patch('apps.remote_mcp_app.get_current_user_id')
     @patch('apps.remote_mcp_app.check_mcp_health_and_update_db')
     def test_check_mcp_health_database_error(self, mock_health_check, mock_get_user_id):

test/backend/services/test_remote_mcp_service.py

@@ -280,11 +280,13 @@ async def test_check_health_success(self, mock_health, mock_update):
     @patch('backend.services.remote_mcp_service.update_mcp_status_by_name_and_url')
     @patch('backend.services.remote_mcp_service.mcp_server_health')
     async def test_check_health_false(self, mock_health, mock_update):
-        """Test health check failure"""
+        """Test health check failure - should raise MCPConnectionError when status is False"""
         mock_health.return_value = False
 
-        await check_mcp_health_and_update_db('http://srv', 'name', 'tid', 'uid')
+        with self.assertRaises(MCPConnectionError) as context:
+            await check_mcp_health_and_update_db('http://srv', 'name', 'tid', 'uid')
 
+        self.assertEqual(str(context.exception), "MCP connection failed")
         mock_update.assert_called_once_with(
             mcp_name='name',
             mcp_server='http://srv',
@@ -308,12 +310,14 @@ async def test_update_db_fail(self, mock_health, mock_update):
     @patch('backend.services.remote_mcp_service.update_mcp_status_by_name_and_url')
     @patch('backend.services.remote_mcp_service.mcp_server_health')
     async def test_health_check_exception(self, mock_health, mock_update):
-        """Test health check exception - should catch exception and set status to False"""
+        """Test health check exception - should catch exception, set status to False, and raise MCPConnectionError"""
         mock_health.side_effect = MCPConnectionError("Connection failed")
 
-        # Should not raise exception, but should set status to False
-        await check_mcp_health_and_update_db('http://srv', 'name', 'tid', 'uid')
+        # Should catch the exception from mcp_server_health, set status to False, and then raise MCPConnectionError
+        with self.assertRaises(MCPConnectionError) as context:
+            await check_mcp_health_and_update_db('http://srv', 'name', 'tid', 'uid')
 
+        self.assertEqual(str(context.exception), "MCP connection failed")
         mock_health.assert_called_once_with(remote_mcp_server='http://srv')
         mock_update.assert_called_once_with(
             mcp_name='name',