Implemented groupBy and having

Author: JanHolger

src/main/java/org/javawebstack/orm/query/Query.java

@@ -14,6 +14,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Stream;
 
@@ -27,6 +28,8 @@ public class Query<T extends Model> {
     private QueryOrderBy order;
     private boolean withDeleted = false;
     private final List<QueryWith> withs = new ArrayList<>();
+    private final List<QueryColumn> groupBy = new ArrayList<>();
+    private QueryGroup<T> having;
 
     public Query(Class<T> model) {
         this(Repo.get(model), model);
@@ -51,6 +54,14 @@ public List<QueryWith> getWiths() {
         return withs;
     }
 
+    public List<QueryColumn> getGroupBy() {
+        return groupBy;
+    }
+
+    public QueryGroup<T> getHaving() {
+        return having;
+    }
+
     public Integer getLimit() {
         return limit;
     }
@@ -278,6 +289,22 @@ public Query<T> orWhereNotIn(Object left, Object... values) {
         return this;
     }
 
+    public Query<T> groupBy(String column) {
+        groupBy.add(new QueryColumn(column));
+        return this;
+    }
+
+    public Query<T> groupBy(QueryColumn column) {
+        groupBy.add(column);
+        return this;
+    }
+
+    public Query<T> having(Consumer<QueryGroup<T>> consumer) {
+        having = new QueryGroup<>();
+        consumer.accept(having);
+        return this;
+    }
+
     public Query<T> accessible(Object accessor) {
         return repo.accessible(this, accessor);
     }

src/main/java/org/javawebstack/orm/wrapper/builder/MySQLQueryStringBuilder.java

@@ -50,6 +50,18 @@ public SQLQueryString buildQuery(Query<?> query, boolean count) {
             parameters.addAll(qs.getParameters());
         }
 
+        if(query.getGroupBy().size() > 0) {
+            sb.append(" GROUP BY ");
+            sb.append(query.getGroupBy().stream().map(c -> c.toString(repo.getInfo())).collect(Collectors.joining(",")));
+        }
+
+        if(query.getHaving() != null) {
+            sb.append(" HAVING ");
+            SQLQueryString group = convertGroup(repo.getInfo(), query.getHaving());
+            sb.append(group.getQuery());
+            parameters.addAll(group.getParameters());
+        }
+
         QueryOrderBy orderBy = query.getOrder();
         if (!orderBy.isEmpty()) {
             sb.append(" ORDER BY ")