MODHAADM-93 sort log lines of previous jobs

Author: nielserik

src/main/java/org/folio/harvesteradmin/moduledata/LogLine.java

@@ -1,6 +1,7 @@
 package org.folio.harvesteradmin.moduledata;
 
 import io.vertx.core.json.JsonObject;
+import io.vertx.ext.web.RoutingContext;
 import io.vertx.sqlclient.templates.RowMapper;
 import io.vertx.sqlclient.templates.TupleMapper;
 import java.util.Arrays;
@@ -212,6 +213,12 @@ public PgCqlDefinition getQueryableFields() {
     return pgCqlDefinition;
   }
 
+  public SqlQuery makeSqlFromCqlQuery(RoutingContext routingContext, String schemaDotTable) {
+    SqlQuery sql = super.makeSqlFromCqlQuery(routingContext, schemaDotTable);
+    sql.withAdditionalOrderByField(LogLineField.TIME_STAMP.columnName());
+    sql.withAdditionalOrderByField(LogLineField.SEQUENCE_NUMBER.columnName());
+    return sql;
+  }
 
   public String toString() {
     return String.format("%s %-5s %s %s",this.timeStamp, this.logLevel, this.jobLabel, this.line);

src/main/java/org/folio/harvesteradmin/moduledata/SqlQuery.java

@@ -7,7 +7,7 @@ public class SqlQuery {
   private final String select;
   private final String from;
   private String where;
-  private final String orderBy;
+  private String orderBy;
   private final String offset;
   private final String limit;
   private String defaultLimit = null;
@@ -40,8 +40,8 @@ public String getCountingSql() {
   public String getQueryWithLimits() {
     return select
         + from
-        + where
-        + orderBy
+        + (where.isEmpty() ? "" : " WHERE " + where)
+        + (orderBy.isEmpty() ? "" : " ORDER BY " + orderBy)
         + limits(offset, (limit == null ? defaultLimit : limit));
   }
 
@@ -51,14 +51,25 @@ public String getQueryWithLimits() {
   public SqlQuery withAdditionalWhereClause(String clause) {
     if (clause != null && !clause.isEmpty()) {
       if (where.isEmpty()) {
-        where = " where (" + clause + ")";
+        where = " (" + clause + ")";
       } else {
         where += " AND " + "(" + clause + ") ";
       }
     }
     return this;
   }
 
+  public SqlQuery withAdditionalOrderByField(String clause) {
+    if (clause != null && !clause.isEmpty()) {
+      if (orderBy.isEmpty()) {
+        orderBy = clause;
+      } else {
+        orderBy += ", " + clause;
+      }
+    }
+    return this;
+  }
+
   public SqlQuery withDefaultLimit(String defaultLimit) {
     this.defaultLimit = defaultLimit;
     return this;