Skip to content

[#4] throw exception when client asks for wrong columns: #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
antoniolucasnobar wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[#4] throw exception when client asks for wrong columns: #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/main/java/io/breezil/queryfier/engine/QueryBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,13 @@ public class QueryBuilder {
public QueryBuilder() {
this.joinMaps = new HashMap<>();
}

private void validateColumns(QBase<? extends Object, ? extends Object> toParse, QQuery q) {
if (toParse.getColumns().size() != q.getProjections().size()) {
throw new IllegalArgumentException(
"Some column(s): " + toParse.getColumns() + " do not belong to the entity you requested.");
}
}

@SuppressWarnings("rawtypes")
public QQuery parseQuery(QBase<? extends Object, ? extends Object> toParse) throws IllegalAccessException {
Expand Down Expand Up @@ -203,25 +210,22 @@ public List<QSort> mapToActualColumns(List<String> sortedColumns) {

private void configureProjections(QBase<? extends Object, ? extends Object> toParse, QQuery q, List<QProjection> projections) {
if (toParse.getColumns().isEmpty()) {
projections.forEach(p -> q.addProjection(p));
projections.forEach(q::addProjection);
} else {
addColumnsWithProjections(toParse, q, projections);
addColumnsWithAggregationFunctions(toParse, q);
validateColumns(toParse, q);
}
}

private void addColumnsWithAggregationFunctions(QBase<? extends Object, ? extends Object> toParse, QQuery q) {
toParse.getColumns().stream()
.filter(col -> col.contains(QProjection.SPLITTER))
.forEach(col -> {
q.addProjection(new QProjection(col));
});
.forEach(col -> q.addProjection(new QProjection(col)));
}

private void addColumnsWithProjections(QBase<? extends Object, ? extends Object> toParse, QQuery q, List<QProjection> projections) {
projections.stream().filter(p -> {
return toParse.getColumns().contains(p.getAlias());
}).forEach(p -> q.addProjection(p));
projections.stream().filter(p -> toParse.getColumns().contains(p.getAlias())).forEach(q::addProjection);
}

private void configureSelectionAndParameter(QBase<? extends Object, ? extends Object> toParse, QQuery q, Field f) throws IllegalAccessException {
Expand Down
8 changes: 8 additions & 0 deletions src/test/java/io/breezil/queryfier/engine/QueryBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,14 @@ public void recuperaApenasColunasInformadas() {
NUMBER_OF_QUERIED_PROJECTIONS, q.getProjections().size());
}

@Test(expected = IllegalArgumentException.class)
public void shoudFailWithWrongColumns() {
sf.addColumn("main");
sf.addColumn("president");
QQuery q = convertDTO2Query(sf);
Assert.fail("president does not belong to StateFilter. It should fail then");
}

@Test
public void deveOrdenarAscendentemente() {
sf.addSortedColumns("governor");
Expand Down