Skip to content
This repository has been archived by the owner on Aug 20, 2021. It is now read-only.

Commit

Permalink
feat: Allows to sort the logs by date, path, status
Browse files Browse the repository at this point in the history
  • Loading branch information
aelamrani committed Mar 28, 2019
1 parent 586d041 commit 090c1a0
Show file tree
Hide file tree
Showing 8 changed files with 61 additions and 44 deletions.
Expand Up @@ -23,15 +23,10 @@
public abstract class AbstractQuery {

private long from;

private long to;

private long interval;

private String query;

private String rootField;

private String rootIdentifier;

public long getFrom() {
Expand Down
Expand Up @@ -52,41 +52,4 @@ public String getField() {
public void setField(String field) {
this.field = field;
}

public static class Order {

private String field;

private boolean order;

private String type;

public Order() {

}

public String getField() {
return field;
}

public void setField(String field) {
this.field = field;
}

public boolean isOrder() {
return order;
}

public void setOrder(boolean order) {
this.order = order;
}

public String getType() {
return type;
}

public void setType(String type) {
this.type = type;
}
}
}
Expand Up @@ -22,8 +22,8 @@
public class LogQuery extends AbstractQuery {

private int size = 20;

private int page = 1;
private Order order;

public int getSize() {
return size;
Expand All @@ -40,4 +40,12 @@ public int getPage() {
public void setPage(int page) {
this.page = page;
}

public Order getOrder() {
return order;
}

public void setOrder(Order order) {
this.order = order;
}
}
@@ -0,0 +1,38 @@
package io.gravitee.management.model.analytics.query;

/**
* @author David BRASSELY (david.brassely at graviteesource.com)
* @author GraviteeSource Team
*/
public class Order {

private String field;

private boolean order;

private String type;

public String getField() {
return field;
}

public void setField(String field) {
this.field = field;
}

public boolean isOrder() {
return order;
}

public void setOrder(boolean order) {
this.order = order;
}

public String getType() {
return type;
}

public void setType(String type) {
this.type = type;
}
}
Expand Up @@ -67,6 +67,7 @@ public SearchLogResponse apiLogs(
logQuery.setSize(param.getSize());
logQuery.setFrom(param.getFrom());
logQuery.setTo(param.getTo());
logQuery.setOrder(param.getOrder());

return logsService.findByApi(api, logQuery);
}
Expand Down
Expand Up @@ -43,6 +43,9 @@ public class LogsParam {
@DefaultValue("1")
private int page;

@QueryParam("order")
private String order;

public long getFrom() {
return from;
}
Expand Down Expand Up @@ -83,6 +86,14 @@ public void setPage(int page) {
this.page = page;
}

public String getOrder() {
return order;
}

public void setOrder(String order) {
this.order = order;
}

public void validate() throws WebApplicationException {
if (from == -1) {
throw new WebApplicationException(Response
Expand Down
Expand Up @@ -89,6 +89,7 @@ public SearchLogResponse findByApi(String api, LogQuery query) {
.page(query.getPage())
.size(query.getSize())
.query(query.getQuery())
.order(query.getOrder())
.timeRange(
DateRangeBuilder.between(query.getFrom(), query.getTo()),
IntervalBuilder.interval(query.getInterval())
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Expand Up @@ -37,7 +37,7 @@
<gravitee-definition.version>1.17.0</gravitee-definition.version>
<gravitee-common.version>1.14.0</gravitee-common.version>
<gravitee-plugin.version>1.7.0</gravitee-plugin.version>
<gravitee-repository.version>1.24.0</gravitee-repository.version>
<gravitee-repository.version>1.25.0-SNAPSHOT</gravitee-repository.version>
<gravitee-gateway-api.version>1.14.0</gravitee-gateway-api.version>
<gravitee-fetcher-api.version>1.2.0</gravitee-fetcher-api.version>
<gravitee-expression-language.version>1.2.0</gravitee-expression-language.version>
Expand Down

0 comments on commit 090c1a0

Please sign in to comment.