[HWKMETRICS-474] Update the CQL query to use the correct String metri…

…c type when querying with ASC order and limit.

(cherry picked from commit 4252af6)
Signed-off-by: Stefan Negrea <snegrea@redhat.com>

core/metrics-core-service/src/main/java/org/hawkular/metrics/core/service/DataAccessImpl.java

@@ -717,7 +717,7 @@ public Observable<Row> findStringData(MetricId<String> id, long startTime, long
                         STRING.getCode(), id.getName(), DPART, getTimeUUID(startTime), getTimeUUID(endTime)));
             } else {
                 return rxSession.executeAndFetch(findStringDataByDateRangeExclusiveWithLimitASC.bind(
-                        id.getTenantId(), GAUGE.getCode(), id.getName(), DPART, getTimeUUID(startTime),
+                        id.getTenantId(), STRING.getCode(), id.getName(), DPART, getTimeUUID(startTime),
                         getTimeUUID(endTime), limit));
             }
         } else {

integration-tests/rest-tests-jaxrs/src/test/groovy/org/hawkular/metrics/rest/StringITest.groovy

@@ -396,4 +396,58 @@ class StringITest extends RESTTest {
     ]))
   }
 
+  @Test
+  void fetchRawStringWithQueryParamsLimitAndOrder() {
+    String tenantId = nextTenantId()
+    DateTime start = DateTime.now().minusHours(4)
+
+    def response = hawkularMetrics.post(
+        path: "strings/raw",
+        headers: [(tenantHeaderName): tenantId],
+        body: [
+            [
+                id: 'St1',
+                data: [
+                    [timestamp: start.millis, value: 'running1'],
+                    [timestamp: start.plusHours(1).millis, value: 'running2'],
+                    [timestamp: start.plusHours(2).millis, value: 'maintenance1'],
+                    [timestamp: start.plusHours(3).millis, value: 'maintenance2'],
+                    [timestamp: start.plusHours(4).millis, value: 'down']
+                ]
+            ]
+        ]
+    )
+    assertEquals(200, response.status)
+
+    response = hawkularMetrics.get(
+          path: "strings/St1/raw",
+          headers: [(tenantHeaderName): tenantId],
+          query: [
+              limit: 2,
+              order: 'asc'
+          ]
+      )
+
+    assertEquals(200, response.status)
+    assertEquals(2, response.data.size)
+
+    assertEquals([timestamp: start.millis, value: 'running1'], response.data[0])
+    assertEquals([timestamp: start.plusHours(1).millis, value: 'running2'], response.data[1])
+
+    response = hawkularMetrics.get(
+          path: "strings/St1/raw",
+          headers: [(tenantHeaderName): tenantId],
+          query: [
+              limit: 2,
+              order: 'desc'
+          ]
+      )
+
+    assertEquals(200, response.status)
+    assertEquals(2, response.data.size)
+
+    assertEquals([timestamp: start.plusHours(4).millis, value: 'down'], response.data[0])
+    assertEquals([timestamp: start.plusHours(3).millis, value: 'maintenance2'], response.data[1])
+   }
+
 }