Added ordering for SQL

src/main/java/cz/senslog/telemetry/database/repository/MapLogRepository.java

@@ -109,7 +109,7 @@ public class MapLogRepository implements SensLogRepository {
 
     @Override
     public Future<List<Unit>> allUnits() {
-        return client.query("SELECT unit_id, imei, name, description FROM maplog.unit")
+        return client.query("SELECT unit_id, imei, name, description FROM maplog.unit ORDER BY unit_id")
                 .execute()
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map((row) -> Unit.of(
@@ -186,7 +186,7 @@ public class MapLogRepository implements SensLogRepository {
 
     @Override
     public Future<List<Sensor>> allSensors() {
-        return client.query("SELECT sensor_id, sensor_name, sensor_type, io_id, phenomenon_id, description FROM maplog.sensor")
+        return client.query("SELECT sensor_id, sensor_name, sensor_type, io_id, phenomenon_id, description FROM maplog.sensor ORDER BY sensor_id")
                 .execute()
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map((row) -> Sensor.of(
@@ -205,7 +205,7 @@ public class MapLogRepository implements SensLogRepository {
         return client.preparedQuery("SELECT s.sensor_id, s.sensor_name, s.sensor_type " +
                         "FROM maplog.unit_to_sensor AS uts " +
                         "JOIN maplog.sensor s on s.sensor_id = uts.sensor_id " +
-                        "WHERE UTS.unit_id = $1")
+                        "WHERE UTS.unit_id = $1 ORDER BY s.sensor_id")
                 .execute(Tuple.of(unitId))
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map((row) -> Sensor.of(
@@ -218,7 +218,7 @@ public class MapLogRepository implements SensLogRepository {
 
     @Override
     public Future<List<Sensor>> findSensorsByPhenomenonId(long phenomenonId) {
-        return client.preparedQuery("SELECT sensor_id, sensor_name, sensor_type FROM maplog.sensor WHERE phenomenon_id = $1")
+        return client.preparedQuery("SELECT sensor_id, sensor_name, sensor_type FROM maplog.sensor WHERE phenomenon_id = $1 ORDER BY sensor_id")
                 .execute(Tuple.of(phenomenonId))
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map((row) -> Sensor.of(
@@ -235,7 +235,7 @@ public class MapLogRepository implements SensLogRepository {
                         "FROM maplog.unit_to_sensor AS uts " +
                         "JOIN maplog.sensor s on s.sensor_id = uts.sensor_id " +
                         "JOIN maplog.unit_to_campaign utc ON utc.unit_id = uts.unit_id " +
-                        "WHERE utc.camp_id = $1 AND uts.unit_id = $2")
+                        "WHERE utc.camp_id = $1 AND uts.unit_id = $2 ORDER BY s.sensor_id")
                 .execute(Tuple.of(campaignId, unitId))
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map((row) -> Sensor.of(
@@ -263,7 +263,7 @@ public class MapLogRepository implements SensLogRepository {
 
     @Override
     public Future<List<Phenomenon>> allPhenomenons() {
-        return client.query("SELECT id, name FROM maplog.phenomenon")
+        return client.query("SELECT id, name FROM maplog.phenomenon ORDER BY id")
                 .execute()
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map(row -> Phenomenon.of(
@@ -295,7 +295,7 @@ public class MapLogRepository implements SensLogRepository {
         return client.preparedQuery("SELECT c.campaign_id, c.description, utc.from_time, utc.to_time " +
                         "FROM maplog.unit_to_campaign AS utc " +
                         "JOIN maplog.campaign AS c on c.campaign_id = utc.camp_id " +
-                        "WHERE utc.unit_id = $1")
+                        "WHERE utc.unit_id = $1 ORDER BY c.campaign_id")
                 .execute(Tuple.of(unitId))
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map((row) -> Campaign.of(
@@ -309,7 +309,7 @@ public class MapLogRepository implements SensLogRepository {
 
     @Override
     public Future<List<Driver>> allDrivers() {
-        return client.query("SELECT id, name FROM maplog.driver")
+        return client.query("SELECT id, name FROM maplog.driver ORDER BY id")
                 .execute()
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map(row -> Driver.of(
@@ -338,7 +338,7 @@ public class MapLogRepository implements SensLogRepository {
     public Future<List<Action>> findActionsByDriverIdAndUnitId(int driverId, long unitId) {
         return client.preparedQuery("SELECT a.id, a.name FROM maplog.action AS a " +
                 "JOIN maplog.driver_to_action AS dta ON a.id = dta.action_id " +
-                "WHERE dta.driver_id = $1 AND dta.unit_id = $2")
+                "WHERE dta.driver_id = $1 AND dta.unit_id = $2 ORDER BY a.id")
                 .execute(Tuple.of(driverId, unitId))
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map(row -> Action.of(
@@ -352,7 +352,7 @@ public class MapLogRepository implements SensLogRepository {
     public Future<List<Action>> findActionsByDriverId(int driverId) {
         return client.preparedQuery("SELECT a.id, a.name FROM maplog.action AS a " +
                         "JOIN maplog.driver_to_action AS dta ON a.id = dta.action_id " +
-                        "WHERE dta.driver_id = $1")
+                        "WHERE dta.driver_id = $1 ORDER BY a.id")
                 .execute(Tuple.of(driverId))
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map(row -> Action.of(
@@ -394,7 +394,7 @@ public class MapLogRepository implements SensLogRepository {
     @Override
     public Future<List<Event>> findEventsByDriverIdAndUnitIdAndActionId(int driverId, long unitId, int actionId) {
         return client.preparedQuery("SELECT id, driver_id, action_id, unit_id, from_time, to_time FROM maplog.driver_to_action " +
-                        "WHERE driver_id = $1 AND unit_id = $2 AND action_id = $3")
+                        "WHERE driver_id = $1 AND unit_id = $2 AND action_id = $3 ORDER BY id")
                 .execute(Tuple.of(driverId, unitId, actionId))
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map(row -> Event.of(
@@ -445,7 +445,7 @@ public class MapLogRepository implements SensLogRepository {
             tupleParams = Tuple.of(driverId);
         }
         return client.preparedQuery("SELECT u.unit_id, u.name, u.imei, u.description FROM maplog.driver_to_action AS dta " +
-                "JOIN maplog.unit AS u ON u.unit_id = dta.unit_id " + whereTimestampClause)
+                "JOIN maplog.unit AS u ON u.unit_id = dta.unit_id " + whereTimestampClause + " ORDER BY u.unit_id")
                 .execute(tupleParams)
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map(row -> Unit.of(
@@ -463,7 +463,7 @@ public class MapLogRepository implements SensLogRepository {
                         "FROM maplog.unit_to_campaign AS utc " +
                         "JOIN maplog.campaign c on c.campaign_id = utc.camp_id " +
                         "JOIN maplog.unit u on u.unit_id = utc.unit_id " +
-                        "WHERE utc.camp_id = $1")
+                        "WHERE utc.camp_id = $1 ORDER BY u.unit_id")
                 .execute(Tuple.of(campaignId))
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map((row) -> CampaignUnit.of(
@@ -532,7 +532,7 @@ public class MapLogRepository implements SensLogRepository {
     public Future<List<Unit>> findUnitsByDriverIdAndActionId(int driverId, int actionId) {
         return client.preparedQuery("SELECT u.unit_id, u.name, u.imei, u.description FROM maplog.unit AS u " +
                 "JOIN maplog.driver_to_action dta on u.unit_id = dta.unit_id " +
-                "WHERE dta.driver_id = $1 AND dta.action_id = $2")
+                "WHERE dta.driver_id = $1 AND dta.action_id = $2 ORDER BY u.unit_id")
                 .execute(Tuple.of(driverId, actionId))
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map(row -> Unit.of(
@@ -603,7 +603,7 @@ public class MapLogRepository implements SensLogRepository {
     public Future<List<Unit>> findUnitsBySensorId(long sensorId) {
         return client.preparedQuery("SELECT u.unit_id, u.name, u.imei, u.description FROM maplog.unit_to_sensor AS uts " +
                         "JOIN maplog.unit u on u.unit_id = uts.unit_id " +
-                        "WHERE uts.sensor_id = $1")
+                        "WHERE uts.sensor_id = $1 ORDER BY u.unit_id")
                 .execute(Tuple.of(sensorId))
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map((row) -> Unit.of(
@@ -617,7 +617,7 @@ public class MapLogRepository implements SensLogRepository {
 
     @Override
     public Future<List<Long>> findUnitIdsByCampaignId(long campaignId) {
-        return client.preparedQuery("SELECT unit_id FROM maplog.unit_to_campaign WHERE camp_id = $1")
+        return client.preparedQuery("SELECT unit_id FROM maplog.unit_to_campaign WHERE camp_id = $1 ORDER BY unit_id")
                 .execute(Tuple.of(campaignId))
                 .map(rs -> StreamSupport.stream(rs.spliterator(), false)
                         .map(r -> r.getLong("unit_id"))