crowetic/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Pull Requests Activity

Added prefix parameter to GET /names/search.

Browse Source
This commit is contained in:
CalDescent 2023-05-12 11:11:34 +01:00
parent dc1289787d
commit 5a873f9465
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/qortal/api/resource/NamesResource.java
View File

@ -173,6 +173,7 @@ public class NamesResource {
) )
@ApiErrors({ApiError.NAME_UNKNOWN, ApiError.REPOSITORY_ISSUE}) @ApiErrors({ApiError.NAME_UNKNOWN, ApiError.REPOSITORY_ISSUE})
public List<NameData> searchNames(@QueryParam("query") String query, public List<NameData> searchNames(@QueryParam("query") String query,
@Parameter(description = "Prefix only (if true, only the beginning of the name is matched)") @QueryParam("prefix") Boolean prefixOnly,
@Parameter(ref = "limit") @QueryParam("limit") Integer limit, @Parameter(ref = "limit") @QueryParam("limit") Integer limit,
@Parameter(ref = "offset") @QueryParam("offset") Integer offset, @Parameter(ref = "offset") @QueryParam("offset") Integer offset,
@Parameter(ref="reverse") @QueryParam("reverse") Boolean reverse) { @Parameter(ref="reverse") @QueryParam("reverse") Boolean reverse) {
@ -181,7 +182,9 @@ public class NamesResource {
throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.INVALID_CRITERIA, "Missing query"); throw ApiExceptionFactory.INSTANCE.createCustomException(request, ApiError.INVALID_CRITERIA, "Missing query");
} }
return repository.getNameRepository().searchNames(query, limit, offset, reverse); boolean usePrefixOnly = Boolean.TRUE.equals(prefixOnly);
return repository.getNameRepository().searchNames(query, usePrefixOnly, limit, offset, reverse);
} catch (ApiException e) { } catch (ApiException e) {
throw e; throw e;
} catch (DataException e) { } catch (DataException e) {

2
src/main/java/org/qortal/repository/NameRepository.java
View File

@ -14,7 +14,7 @@ public interface NameRepository {
public boolean reducedNameExists(String reducedName) throws DataException; public boolean reducedNameExists(String reducedName) throws DataException;
public List<NameData> searchNames(String query, Integer limit, Integer offset, Boolean reverse) throws DataException; public List<NameData> searchNames(String query, boolean prefixOnly, Integer limit, Integer offset, Boolean reverse) throws DataException;
public List<NameData> getAllNames(Integer limit, Integer offset, Boolean reverse) throws DataException; public List<NameData> getAllNames(Integer limit, Integer offset, Boolean reverse) throws DataException;

7
src/main/java/org/qortal/repository/hsqldb/HSQLDBNameRepository.java
View File

@ -103,7 +103,7 @@ public class HSQLDBNameRepository implements NameRepository {
} }
} }
public List<NameData> searchNames(String query, Integer limit, Integer offset, Boolean reverse) throws DataException { public List<NameData> searchNames(String query, boolean prefixOnly, Integer limit, Integer offset, Boolean reverse) throws DataException {
StringBuilder sql = new StringBuilder(512); StringBuilder sql = new StringBuilder(512);
List<Object> bindParams = new ArrayList<>(); List<Object> bindParams = new ArrayList<>();
@ -111,7 +111,10 @@ public class HSQLDBNameRepository implements NameRepository {
+ "is_for_sale, sale_price, reference, creation_group_id FROM Names " + "is_for_sale, sale_price, reference, creation_group_id FROM Names "
+ "WHERE LCASE(name) LIKE ? ORDER BY name"); + "WHERE LCASE(name) LIKE ? ORDER BY name");
bindParams.add(String.format("%%%s%%", query.toLowerCase())); // Search anywhere in the name, unless "prefixOnly" has been requested
// Note that without prefixOnly it will bypass any indexes
String queryWildcard = prefixOnly ? String.format("%s%%", query.toLowerCase()) : String.format("%%%s%%", query.toLowerCase());
bindParams.add(queryWildcard);
if (reverse != null && reverse) if (reverse != null && reverse)
sql.append(" DESC"); sql.append(" DESC");