Adjustments to how previous months top voters are loaded

Author: BenCodez

VotingPlugin/src/com/bencodez/votingplugin/commands/gui/player/VoteTopVoterPreviousMonths.java

@@ -58,16 +58,13 @@ public void next(int index) {
 
 	@Override
 	public void onChest(Player player) {
-		Set<Entry<TopVoterPlayer, Integer>> users = null;
-
-		users = plugin.getLastMonthTopVoter().entrySet();
 
 		Set<YearMonth> months = plugin.getPreviousMonthsTopVoters().keySet();
 
 		List<YearMonth> yearMonthList = months.stream().sorted(Collections.reverseOrder()).collect(Collectors.toList());
 		YearMonth yearMonth = null;
 
-		if (index == -1) {
+		if (index < 0) {
 			if (!yearMonthList.isEmpty()) {
 				yearMonth = yearMonthList.get(0);
 			}
@@ -77,11 +74,19 @@ public void onChest(Player player) {
 			if (yearMonthList.size() > index) {
 				yearMonth = yearMonthList.get(index);
 			} else {
-				player.sendMessage(ChatColor.RED + "Can't open previous months, no data for index");
+				player.sendMessage(ChatColor.RED + "Can't open previous months, no data for requested index");
 				return;
 			}
 		}
 
+		Set<Entry<TopVoterPlayer, Integer>> users = null;
+		if (plugin.getPreviousMonthsTopVoters().containsKey(yearMonth)) {
+			users = plugin.getPreviousMonthsTopVoters().get(yearMonth).entrySet();
+		} else {
+			player.sendMessage(ChatColor.RED + "Can't open previous months, no data");
+			return;
+		}
+
 		BInventory inv = new BInventory(plugin.getGui().getChestVoteTopName());
 		inv.addPlaceholder("topvoter", yearMonth.toString());
 		if (!plugin.getConfigFile().isAlwaysCloseInventory()) {
@@ -121,9 +126,9 @@ public void onClick(ClickEvent clickEvent) {
 			@Override
 			public void onClick(ClickEvent clickEvent) {
 				if (!clickEvent.getClick().equals(ClickType.RIGHT)) {
-					new VoteTopVoterPreviousMonths(plugin, player, user, index++).open(GUIMethod.CHEST);
+					new VoteTopVoterPreviousMonths(plugin, player, user, index + 1).open(GUIMethod.CHEST);
 				} else {
-					new VoteTopVoterPreviousMonths(plugin, player, user, index--).open(GUIMethod.CHEST);
+					new VoteTopVoterPreviousMonths(plugin, player, user, index - 1).open(GUIMethod.CHEST);
 				}
 			}
 		});

VotingPlugin/src/com/bencodez/votingplugin/topvoter/TopVoterHandler.java

@@ -89,8 +89,9 @@ private HashMap<Integer, String> handlePlaces(Set<String> places) {
 
 	public void loadPreviousMonthTopVoters() {
 		if (plugin.getConfigFile().isStoreMonthTotalsWithDate()) {
-			HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+
 			LocalDateTime now = plugin.getTimeChecker().getTime();
+
 			for (String column : plugin.getUserManager().getAllColumns()) {
 				if (column.startsWith("MonthTotal-")) {
 					String[] data = column.split("-");
@@ -102,14 +103,55 @@ public void loadPreviousMonthTopVoters() {
 							if (yearMonth.atDay(now.getDayOfMonth()).atTime(23, 59).isBefore(now)) {
 								plugin.debug("Loading previous month top voters of " + yearMonth.toString());
 								plugin.getPreviousMonthsTopVoters().put(yearMonth,
-										getTopVotersOfMonth(yearMonth, cols));
+										new LinkedHashMap<TopVoterPlayer, Integer>());
 							}
 						}
 					}
 				}
 			}
-			cols.clear();
-			cols = null;
+
+			if (plugin.getPreviousMonthsTopVoters().size() > 0) {
+				HashMap<UUID, ArrayList<Column>> cols = plugin.getUserManager().getAllKeys();
+				for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
+
+					String uuid = playerData.getKey().toString();
+					if (uuid != null && !uuid.isEmpty()) {
+						VotingPluginUser user = plugin.getVotingPluginUserManager()
+								.getVotingPluginUser(UUID.fromString(uuid), false);
+						user.dontCache();
+						user.updateTempCacheWithColumns(playerData.getValue());
+
+						for (YearMonth month : plugin.getPreviousMonthsTopVoters().keySet()) {
+							LocalDateTime atTime = month.atDay(15).atTime(0, 0);
+							int total = user.getTotal(TopVoter.Monthly, atTime);
+							if (total > 0) {
+								plugin.getPreviousMonthsTopVoters().get(month).put(user.getTopVoterPlayer(), total);
+							}
+						}
+
+						cols.put(playerData.getKey(), null);
+						user.clearTempCache();
+					}
+				}
+
+				cols.clear();
+				cols = null;
+			}
+
+			for (YearMonth month : plugin.getPreviousMonthsTopVoters().keySet()) {
+				plugin.getPreviousMonthsTopVoters().put(month,
+						sortByValues(plugin.getPreviousMonthsTopVoters().get(month), false));
+			}
+
+			plugin.extraDebug("Previous Months: " + plugin.getPreviousMonthsTopVoters().keySet().toString());
+
+			for (Entry<YearMonth, LinkedHashMap<TopVoterPlayer, Integer>> entry : plugin.getPreviousMonthsTopVoters()
+					.entrySet()) {
+				for (Entry<TopVoterPlayer, Integer> entry2 : entry.getValue().entrySet()) {
+					plugin.extraDebug(entry.getKey().toString() + ": " + entry2.getKey().getUser().getPlayerName() + ":"
+							+ entry2.getValue().intValue());
+				}
+			}
 		}
 	}
 
@@ -121,21 +163,18 @@ public LinkedHashMap<TopVoterPlayer, Integer> getTopVotersOfMonth(YearMonth mont
 		for (Entry<UUID, ArrayList<Column>> playerData : cols.entrySet()) {
 
 			String uuid = playerData.getKey().toString();
-			if (plugin != null && plugin.isEnabled()) {
-				if (uuid != null && !uuid.isEmpty()) {
-					VotingPluginUser user = plugin.getVotingPluginUserManager()
-							.getVotingPluginUser(UUID.fromString(uuid), false);
-					user.dontCache();
-					user.updateTempCacheWithColumns(playerData.getValue());
-					cols.put(playerData.getKey(), null);
-					int total = 0;
-					total = user.getTotal(TopVoter.Monthly, atTime);
-
-					if (total > 0) {
-						totals.put(user.getTopVoterPlayer(), total);
-					}
-					user.clearTempCache();
+			if (uuid != null && !uuid.isEmpty()) {
+				VotingPluginUser user = plugin.getVotingPluginUserManager().getVotingPluginUser(UUID.fromString(uuid),
+						false);
+				user.dontCache();
+				user.updateTempCacheWithColumns(playerData.getValue());
+				int total = 0;
+				total = user.getTotal(TopVoter.Monthly, atTime);
+
+				if (total > 0) {
+					totals.put(user.getTopVoterPlayer(), total);
 				}
+				user.clearTempCache();
 			}
 		}