diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/JsonUtils.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/JsonUtils.java index 4e5a3624..f713196d 100644 --- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/JsonUtils.java +++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/utils/JsonUtils.java @@ -266,6 +266,12 @@ public class JsonUtils } } + if(jsonObjectToUse.isNull(backendName)) + { + record.setValue(fieldName, null); + continue; + } + switch(metaData.getType()) { case INTEGER -> record.setValue(fieldName, jsonObjectToUse.optInt(backendName)); diff --git a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/APICountAction.java b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/APICountAction.java index 2d816844..2bdcd1d9 100644 --- a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/APICountAction.java +++ b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/APICountAction.java @@ -22,13 +22,11 @@ package com.kingsrook.qqq.backend.module.api.actions; -import java.util.List; import com.kingsrook.qqq.backend.core.actions.interfaces.CountInterface; import com.kingsrook.qqq.backend.core.exceptions.QException; import com.kingsrook.qqq.backend.core.model.actions.tables.count.CountInput; import com.kingsrook.qqq.backend.core.model.actions.tables.count.CountOutput; import com.kingsrook.qqq.backend.core.model.actions.tables.query.QQueryFilter; -import com.kingsrook.qqq.backend.core.model.data.QRecord; import com.kingsrook.qqq.backend.core.model.metadata.tables.QTableMetaData; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; @@ -70,11 +68,11 @@ public class APICountAction extends AbstractAPIAction implements CountInterface apiActionUtil.setupContentTypeInRequest(request); apiActionUtil.setupAdditionalHeaders(request); - HttpResponse response = client.execute(request); - List queryResults = apiActionUtil.processGetResponse(table, response); + HttpResponse response = client.execute(request); + Integer count = apiActionUtil.processGetResponseForCount(table, response); CountOutput rs = new CountOutput(); - rs.setCount(queryResults.size()); + rs.setCount(count); return rs; } catch(Exception e) diff --git a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java index cdbae1ab..2b6bf33a 100644 --- a/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java +++ b/qqq-backend-module-api/src/main/java/com/kingsrook/qqq/backend/module/api/actions/BaseAPIActionUtil.java @@ -458,4 +458,16 @@ public class BaseAPIActionUtil { return (jsonObjectToRecord(getJsonObject(response), table.getFields())); } + + + + /******************************************************************************* + ** + *******************************************************************************/ + public Integer processGetResponseForCount(QTableMetaData table, HttpResponse response) throws IOException + { + List queryResults = processGetResponse(table, response); + return (queryResults.size()); + } + } diff --git a/qqq-dev-tools/bin/xbar-circleci-latest.sh b/qqq-dev-tools/bin/xbar-circleci-latest.sh index b44c85ab..096e28c2 100755 --- a/qqq-dev-tools/bin/xbar-circleci-latest.sh +++ b/qqq-dev-tools/bin/xbar-circleci-latest.sh @@ -87,7 +87,7 @@ checkBuild() color="gray" fi - if [ $index -lt 1 -o $seconds -lt 300 ]; then + if [ $index -lt 1 -o $seconds -lt 600 ]; then echo -n "${shortRepo}(${shortAge})${icon} " fi details="$details\n$repo: $jobName: $buildStatus @ $age ago | color=$color | href=$url | image=$avatarB64"