fix(rpc): provides search should return name match

We need to return packages matching on the name as well.
(A package always provides itself)

Signed-off-by: moson-mo <mo-son@mailbox.org>
This commit is contained in:
moson-mo 2022-12-22 12:41:29 +01:00
parent 2b8dedb3a2
commit d8e91d058c
No known key found for this signature in database
GPG key ID: 4A4760AB4EE15296
2 changed files with 24 additions and 1 deletions

View file

@ -376,8 +376,18 @@ class RPC:
search.search_by(by, arg) search.search_by(by, arg)
max_results = config.getint("options", "max_rpc_results") max_results = config.getint("options", "max_rpc_results")
results = self.entities(search.results()).limit(max_results + 1).all()
query = self.entities(search.results()).limit(max_results + 1)
# For "provides", we need to union our relation search
# with an exact search since a package always provides itself.
# Turns out that doing this with an OR statement is extremely slow
if by == "provides":
search = RPCSearch()
search._search_by_exact_name(arg)
query = query.union(self.entities(search.results()))
results = query.all()
if len(results) > max_results: if len(results) > max_results:
raise RPCError("Too many package results.") raise RPCError("Too many package results.")

View file

@ -920,6 +920,19 @@ def test_rpc_search_provides(
assert result.get("Name") == packages[0].Name assert result.get("Name") == packages[0].Name
def test_rpc_search_provides_self(
client: TestClient, packages: list[Package], relations: list[PackageRelation]
):
params = {"v": 5, "type": "search", "by": "provides", "arg": "big-chungus"}
with client as request:
response = request.get("/rpc", params=params)
data = response.json()
# expected to return "big-chungus"
assert data.get("resultcount") == 1
result = data.get("results")[0]
assert result.get("Name") == packages[0].Name
def test_rpc_search_conflicts( def test_rpc_search_conflicts(
client: TestClient, packages: list[Package], relations: list[PackageRelation] client: TestClient, packages: list[Package], relations: list[PackageRelation]
): ):