From c55a3eac02da570e6b763be74b0ef402bd0eef3c Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Tue, 27 Aug 2019 12:36:34 +0300 Subject: [PATCH] Group tables to /server page --- .../ExtensionAggregateGroupsQuery.java | 153 ++++++++++++++++++ .../queries/ExtensionServerDataQuery.java | 1 + .../storage/queries/QueriedTables.java | 7 +- 3 files changed, 160 insertions(+), 1 deletion(-) create mode 100644 Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateGroupsQuery.java diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateGroupsQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateGroupsQuery.java new file mode 100644 index 000000000..f2e5f72d4 --- /dev/null +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionAggregateGroupsQuery.java @@ -0,0 +1,153 @@ +/* + * This file is part of Player Analytics (Plan). + * + * Plan is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License v3 as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Plan is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with Plan. If not, see . + */ +package com.djrapitops.plan.extension.implementation.storage.queries; + +import com.djrapitops.plan.db.SQLDB; +import com.djrapitops.plan.db.access.Query; +import com.djrapitops.plan.db.access.QueryStatement; +import com.djrapitops.plan.db.sql.tables.*; +import com.djrapitops.plan.extension.ElementOrder; +import com.djrapitops.plan.extension.icon.Color; +import com.djrapitops.plan.extension.icon.Family; +import com.djrapitops.plan.extension.icon.Icon; +import com.djrapitops.plan.extension.implementation.results.ExtensionData; +import com.djrapitops.plan.extension.table.Table; +import com.djrapitops.plan.extension.table.TableAccessor; + +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; + +import static com.djrapitops.plan.db.sql.parsing.Sql.*; + +/** + * Query aggregated Group values from groups table. + *

+ * Returns Map: PluginID - ExtensionServerData.Factory. + * + * @author Rsl1122 + */ +public class ExtensionAggregateGroupsQuery implements Query> { + + private final UUID serverUUID; + + public ExtensionAggregateGroupsQuery(UUID serverUUID) { + this.serverUUID = serverUUID; + } + + @Override + public Map executeQuery(SQLDB db) { + String selectGroupCounts = SELECT + + ExtensionGroupsTable.PROVIDER_ID + ',' + + ExtensionGroupsTable.GROUP_NAME + ',' + + "COUNT(1) as count" + + FROM + ExtensionGroupsTable.TABLE_NAME + + GROUP_BY + ExtensionGroupsTable.GROUP_NAME + ',' + ExtensionGroupsTable.PROVIDER_ID; + + String sql = SELECT + + "b1." + ExtensionGroupsTable.GROUP_NAME + " as group_name," + + "b1.count as count," + + "p1." + ExtensionProviderTable.ID + " as table_id," + + "p1." + ExtensionProviderTable.PLUGIN_ID + " as plugin_id," + + "p1." + ExtensionProviderTable.PROVIDER_NAME + " as table_name," + + "p1." + ExtensionProviderTable.TEXT + " as col_1_name," + + "t1." + ExtensionTabTable.TAB_NAME + " as tab_name," + + "t1." + ExtensionTabTable.TAB_PRIORITY + " as tab_priority," + + "t1." + ExtensionTabTable.ELEMENT_ORDER + " as element_order," + + "i1." + ExtensionIconTable.ICON_NAME + " as i1_name," + + "i1." + ExtensionIconTable.FAMILY + " as i1_family," + + "i1." + ExtensionIconTable.COLOR + " as table_color," + + "i2." + ExtensionIconTable.ICON_NAME + " as tab_icon_name," + + "i2." + ExtensionIconTable.FAMILY + " as tab_icon_family," + + "i2." + ExtensionIconTable.COLOR + " as tab_icon_color" + + FROM + '(' + selectGroupCounts + ") b1" + + INNER_JOIN + ExtensionProviderTable.TABLE_NAME + " p1 on p1." + ExtensionProviderTable.ID + "=b1." + ExtensionGroupsTable.PROVIDER_ID + + INNER_JOIN + ExtensionPluginTable.TABLE_NAME + " e1 on p1." + ExtensionProviderTable.PLUGIN_ID + "=e1." + ExtensionPluginTable.ID + + LEFT_JOIN + ExtensionTabTable.TABLE_NAME + " t1 on t1." + ExtensionTabTable.ID + "=p1." + ExtensionProviderTable.TAB_ID + + LEFT_JOIN + ExtensionIconTable.TABLE_NAME + " i1 on i1." + ExtensionIconTable.ID + "=p1." + ExtensionProviderTable.ICON_ID + + LEFT_JOIN + ExtensionIconTable.TABLE_NAME + " i2 on i2." + ExtensionIconTable.ID + "=p1." + ExtensionTabTable.ICON_ID + + WHERE + ExtensionPluginTable.SERVER_UUID + "=?" + + AND + "p1." + ExtensionProviderTable.HIDDEN + "=?" + + ORDER_BY + "table_id ASC, group_name ASC"; + + return db.query(new QueryStatement>(sql, 1000) { + @Override + public void prepare(PreparedStatement statement) throws SQLException { + statement.setString(1, serverUUID.toString()); + statement.setBoolean(2, false); // Don't select hidden values + } + + @Override + public Map processResults(ResultSet set) throws SQLException { + return extractTables(set).toQueriedTabs().toExtensionDataByPluginID(); + } + }); + } + + private QueriedTables extractTables(ResultSet set) throws SQLException { + QueriedTables tables = new QueriedTables(); + + while (set.next()) { + int pluginID = set.getInt(ExtensionProviderTable.PLUGIN_ID); + int tableID = set.getInt(ExtensionPlayerTableValueTable.TABLE_ID); + + if (!tables.contains(pluginID, tableID)) { + tables.put(pluginID, tableID, extractTable(set)); + } + tables.addRow(pluginID, tableID, set.getString("group_name"), set.getInt("count")); + } + return tables; + } + + private Table.Factory extractTable(ResultSet set) throws SQLException { + Table.Factory table = Table.builder(); + + extractColumns(set, table); + + TableAccessor.setColor(table, Color.getByName(set.getString("table_color")).orElse(Color.NONE)); + TableAccessor.setTableName(table, set.getString("table_name")); + TableAccessor.setTabName(table, Optional.ofNullable(set.getString("tab_name")).orElse("")); + TableAccessor.setTabPriority(table, Optional.of(set.getInt("tab_priority")).orElse(100)); + TableAccessor.setTabOrder(table, Optional.ofNullable(set.getString(ExtensionTabTable.ELEMENT_ORDER)).map(ElementOrder::deserialize).orElse(ElementOrder.values())); + TableAccessor.setTabIcon(table, extractIcon(set, "tab_icon")); + return table; + } + + private void extractColumns(ResultSet set, Table.Factory table) throws SQLException { + String col1 = set.getString(ExtensionTableProviderTable.COL_1); + if (col1 != null) { + table.columnOne(col1, extractIcon(set, "i1")); + } + + table.columnTwo("Players", Icon.called("user").build()); + } + + private Icon extractIcon(ResultSet set, String iconColumnName) throws SQLException { + String iconName = set.getString(iconColumnName + "_name"); + if (iconName == null) { + return null; + } + return new Icon( + Family.getByName(set.getString(iconColumnName + "_family")).orElse(Family.SOLID), + iconName, + Color.NONE + ); + } +} \ No newline at end of file diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java index 5390837f5..5f4c87f48 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/ExtensionServerDataQuery.java @@ -70,6 +70,7 @@ public class ExtensionServerDataQuery implements Query> { combine(extensionDataByPluginID, db.query(new ExtensionAggregateNumbersQuery(serverUUID))); combine(extensionDataByPluginID, db.query(new ExtensionAggregatePercentagesQuery(serverUUID))); combine(extensionDataByPluginID, db.query(new ExtensionServerTablesQuery(serverUUID))); + combine(extensionDataByPluginID, db.query(new ExtensionAggregateGroupsQuery(serverUUID))); return combineWithExtensionInfo(extensionsOfServer, extensionDataByPluginID); } diff --git a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/QueriedTables.java b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/QueriedTables.java index 176800243..d2af0eb47 100644 --- a/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/QueriedTables.java +++ b/Plan/common/src/main/java/com/djrapitops/plan/extension/implementation/storage/queries/QueriedTables.java @@ -42,13 +42,18 @@ public class QueriedTables { byPluginID = new HashMap<>(); } + public boolean contains(int pluginID, int tableID) { + Map byTableID = byPluginID.get(pluginID); + return byTableID != null && byTableID.containsKey(tableID); + } + public void put(int pluginID, int tableID, Table.Factory table) { Map byTableID = byPluginID.getOrDefault(pluginID, new HashMap<>()); byTableID.put(tableID, table); byPluginID.put(pluginID, byTableID); } - public void addRow(int pluginID, int tableID, Object[] row) { + public void addRow(int pluginID, int tableID, Object... row) { if (row.length <= 0) return; Map byTableID = byPluginID.get(pluginID);