external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(rpc): suggestions should only suggest based on <keyword>%

Browse source 
Previously, Python code was looking for suggestions based on
`%<keyword>%`. This was inconsistent with PHP's suggestion
implementation and cause more records to be bundled with a suggestion,
along with supplying misleading suggestions.

Closes #343

Signed-off-by: Kevin Morris <kevr@0cost.org>
This commit is contained in:
Kevin Morris 2022-03-08 19:00:19 -08:00
parent 9791704632
commit a1a88ea872
No known key found for this signature in database
GPG key ID: F7E46DED420788F3
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
aurweb/rpc.py
View file

@ -332,7 +332,7 @@ class RPC:
models.PackageBase models.PackageBase
).filter( ).filter(
and_(models.PackageBase.PackagerUID.isnot(None), and_(models.PackageBase.PackagerUID.isnot(None),
models.Package.Name.like(f"%{arg}%")) models.Package.Name.like(f"{arg}%"))
).order_by(models.Package.Name.asc()).limit(20) ).order_by(models.Package.Name.asc()).limit(20)
return [pkg.Name for pkg in packages] return [pkg.Name for pkg in packages]
@ -341,9 +341,10 @@ class RPC:
if not args: if not args:
return [] return []
arg = args[0]
packages = db.query(models.PackageBase.Name).filter( packages = db.query(models.PackageBase.Name).filter(
and_(models.PackageBase.PackagerUID.isnot(None), and_(models.PackageBase.PackagerUID.isnot(None),
models.PackageBase.Name.like(f"%{args[0]}%")) models.PackageBase.Name.like(f"{arg}%"))
).order_by(models.PackageBase.Name.asc()).limit(20) ).order_by(models.PackageBase.Name.asc()).limit(20)
return [pkg.Name for pkg in packages] return [pkg.Name for pkg in packages]

16
test/test_rpc.py
View file

@ -551,6 +551,14 @@ def test_rpc_suggest_pkgbase(client: TestClient, packages: List[Package]):
data = response.json() data = response.json()
assert data == [] assert data == []
# Test that suggestions are only given based on the beginning
# of the keyword string.
params["arg"] = "ther-pkg"
with client as request:
response = request.get("/rpc", params=params)
data = response.json()
assert data == []
def test_rpc_suggest(client: TestClient, packages: List[Package]): def test_rpc_suggest(client: TestClient, packages: List[Package]):
params = {"v": 5, "type": "suggest", "arg": "other"} params = {"v": 5, "type": "suggest", "arg": "other"}
@ -573,6 +581,14 @@ def test_rpc_suggest(client: TestClient, packages: List[Package]):
data = response.json() data = response.json()
assert data == [] assert data == []
# Test that suggestions are only given based on the beginning
# of the keyword string.
params["arg"] = "ther-pkg"
with client as request:
response = request.get("/rpc", params=params)
data = response.json()
assert data == []
def mock_config_getint(section: str, key: str): def mock_config_getint(section: str, key: str):
if key == "request_limit": if key == "request_limit":