fixed the order by in raw data

madgeek-arc · Feb 12, 2024 · 5a167d1 · 5a167d1
1 parent e90c5a4
commit 5a167d1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/...matter/src/main/java/gr/uoa/di/madgik/ChartDataFormatter/Handlers/RequestBodyHandler.java b/...matter/src/main/java/gr/uoa/di/madgik/ChartDataFormatter/Handlers/RequestBodyHandler.java
@@ -138,7 +138,7 @@ public JsonResponse handleRawDataRequest(RawDataRequestInfo requestInfo) throws
             log.debug("Query:" + q.getName() );
 
         try {
-            statsServiceResults = this.statsService.query(requestInfo.getQueries());
+            statsServiceResults = this.statsService.query(requestInfo.getQueries(), requestInfo.getOrderBy());
 
             this.logChartInfo(requestInfo, statsServiceResults);
 

diff --git a/...r/uoa/di/madgik/ChartDataFormatter/JsonRepresentation/RequestBody/RawDataRequestInfo.java b/...r/uoa/di/madgik/ChartDataFormatter/JsonRepresentation/RequestBody/RawDataRequestInfo.java
@@ -15,13 +15,22 @@ public class RawDataRequestInfo {
     @JsonProperty
     private List<RawDataSeriesInfo> series;
 
+    @JsonProperty
+    private String orderBy;
+
     @JsonProperty
     private boolean verbose;
 
 
     public RawDataRequestInfo() {
     }
 
+    public RawDataRequestInfo(List<RawDataSeriesInfo> series, String orderBy, boolean verbose) {
+        this.series = series;
+        this.orderBy = orderBy;
+        this.verbose = verbose;
+    }
+
     @JsonIgnore
     public List<Query> getQueries(){
         ArrayList<Query> retList = new ArrayList<>();
@@ -48,20 +57,11 @@ public void setVerbose(boolean verbose) {
         this.verbose = verbose;
     }
 
-    public static void main(String[] args) throws JsonProcessingException {
-        RawDataRequestInfo requestInfo = new RawDataRequestInfo();
-        RawDataSeriesInfo seriesInfo = new RawDataSeriesInfo();
-
-        Query q = new Query();
-
-        q.setName("nananaann");
-        q.setParameters(Arrays.asList("asda", "adfsds"));
-
-        seriesInfo.setQuery(q);
-        requestInfo.setSeries(Arrays.asList(seriesInfo, seriesInfo));
-        requestInfo.setVerbose(true);
-
+    public String getOrderBy() {
+        return orderBy;
+    }
 
-        System.out.println(new ObjectMapper().writeValueAsString(requestInfo));
+    public void setOrderBy(String orderBy) {
+        this.orderBy = orderBy;
     }
 }