QRunIO/qqq
2
0
Fork 0
mirror of https://github.com/Kingsrook/qqq.git synced 2025-07-18 05:01:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to accept count filter as POST

Browse Source
This commit is contained in:
darin.kelkhoff
2022-10-14 10:19:21 -05:00
parent 117bb621ff
commit 37fbfd1c7c
2 changed files with 47 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
qqq-middleware-javalin/src/main/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementation.java
View File

@ -281,6 +281,7 @@ public class QJavalinImplementation
post("/query", QJavalinImplementation::dataQuery); post("/query", QJavalinImplementation::dataQuery);
post("/", QJavalinImplementation::dataInsert); // todo - internal to that method, if input is a list, do a bulk - else, single. post("/", QJavalinImplementation::dataInsert); // todo - internal to that method, if input is a list, do a bulk - else, single.
get("/count", QJavalinImplementation::dataCount); get("/count", QJavalinImplementation::dataCount);
post("/count", QJavalinImplementation::dataCount);
get("/export", QJavalinImplementation::dataExportWithoutFilename); get("/export", QJavalinImplementation::dataExportWithoutFilename);
get("/export/{filename}", QJavalinImplementation::dataExportWithFilename); get("/export/{filename}", QJavalinImplementation::dataExportWithFilename);
get("/possibleValues/{fieldName}", QJavalinImplementation::possibleValues); get("/possibleValues/{fieldName}", QJavalinImplementation::possibleValues);
@ -562,6 +563,10 @@ public class QJavalinImplementation
countInput.setTableName(context.pathParam("table")); countInput.setTableName(context.pathParam("table"));
String filter = stringQueryParam(context, "filter"); String filter = stringQueryParam(context, "filter");
if(!StringUtils.hasContent(filter))
{
filter = context.formParam("filter");
}
if(filter != null) if(filter != null)
{ {
countInput.setFilter(JsonUtils.toObject(filter, QQueryFilter.class)); countInput.setFilter(JsonUtils.toObject(filter, QQueryFilter.class));

42
qqq-middleware-javalin/src/test/java/com/kingsrook/qqq/backend/javalin/QJavalinImplementationTest.java
View File

@ -239,6 +239,48 @@ class QJavalinImplementationTest extends QJavalinTestBase
/*******************************************************************************
** test a table count with a filter.
**
*******************************************************************************/
@Test
public void test_dataCountWithFilter()
{
String filterJson = getFirstNameEqualsTimFilterJSON();
HttpResponse<String> response = Unirest.get(BASE_URL + "/data/person/count?filter=" + URLEncoder.encode(filterJson, StandardCharsets.UTF_8)).asString();
assertEquals(200, response.getStatus());
JSONObject jsonObject = JsonUtils.toJSONObject(response.getBody());
assertTrue(jsonObject.has("count"));
int count = jsonObject.getInt("count");
assertEquals(1, count);
}
/*******************************************************************************
** test a table count POST.
**
*******************************************************************************/
@Test
public void test_dataCountPOST()
{
String filterJson = getFirstNameEqualsTimFilterJSON();
HttpResponse<String> response = Unirest.post(BASE_URL + "/data/person/count")
.field("filter", filterJson)
.asString();
assertEquals(200, response.getStatus());
JSONObject jsonObject = JsonUtils.toJSONObject(response.getBody());
assertTrue(jsonObject.has("count"));
int count = jsonObject.getInt("count");
assertEquals(1, count);
}
/******************************************************************************* /*******************************************************************************
** test a table query ** test a table query
** **