Added preference state indication

Author: jasonlessenich

src/main/java/net/javadiscord/javabot/systems/user_preferences/UserPreferenceManager.java

@@ -27,7 +27,7 @@ public class UserPreferenceManager {
 	 * @param enabled    The preferences' state.
 	 * @return Whether the operation was successful.
 	 */
-	public boolean set(long userId, Preference preference, boolean enabled) {
+	public boolean setOrCreate(long userId, Preference preference, boolean enabled) {
 		try (Connection con = dataSource.getConnection()) {
 			UserPreferenceRepository repo = new UserPreferenceRepository(con);
 			Optional<UserPreference> preferenceOptional = repo.getById(userId, preference);
@@ -46,4 +46,31 @@ public boolean set(long userId, Preference preference, boolean enabled) {
 			return false;
 		}
 	}
+
+	/**
+	 * Gets a single {@link UserPreference} (or creates a new one if it doesn't exist yet).
+	 *
+	 * @param userId The users' id.
+	 * @param preference The {@link Preference} to get.
+	 * @return The {@link UserPreference}.
+	 */
+	public UserPreference getOrCreate(long userId, Preference preference) {
+		try (Connection con = dataSource.getConnection()) {
+			UserPreferenceRepository repo = new UserPreferenceRepository(con);
+			Optional<UserPreference> preferenceOptional = repo.getById(userId, preference);
+			if (preferenceOptional.isPresent()) {
+				return preferenceOptional.get();
+			} else {
+				UserPreference userPreference = new UserPreference();
+				userPreference.setUserId(userId);
+				userPreference.setOrdinal(preference.ordinal());
+				userPreference.setEnabled(true);
+				repo.insert(userPreference, false);
+				return userPreference;
+			}
+		} catch (SQLException e) {
+			ExceptionLogger.capture(e, getClass().getSimpleName());
+			return null;
+		}
+	}
 }

src/main/java/net/javadiscord/javabot/systems/user_preferences/commands/UserPreferenceCommand.java

@@ -44,23 +44,24 @@ public void execute(@NotNull SlashCommandInteractionEvent event) {
 		Preference preference = Preference.values()[preferenceMapping.getAsInt()];
 		boolean state = stateMapping.getAsBoolean();
 		UserPreferenceManager manager = new UserPreferenceManager(Bot.getDataSource());
-		if (manager.set(event.getUser().getIdLong(), preference, state)) {
+		if (manager.setOrCreate(event.getUser().getIdLong(), preference, state)) {
 			Responses.info(event, "Preference Updated", "Successfully set `%s` to `%s`!", preference, state).queue();
 		} else {
 			Responses.error(event, "Could not update `%s` to `%s`.", preference, state).queue();
 		}
 	}
 
-	private @NotNull List<Command.Choice> getPreferenceChoices() {
+	private @NotNull List<Command.Choice> getPreferenceChoices(long userId) {
 		List<Command.Choice> choices = new ArrayList<>(Preference.values().length);
+		UserPreferenceManager manager = new UserPreferenceManager(Bot.getDataSource());
 		for (Preference p : Preference.values()) {
-			choices.add(new Command.Choice(p.toString(), p.ordinal()));
+			choices.add(new Command.Choice(String.format("%s (%s)", p, manager.getOrCreate(userId, p).isEnabled() ? "Enabled" : "Disabled"), p.ordinal()));
 		}
 		return choices;
 	}
 
 	@Override
 	public void handleAutoComplete(@NotNull CommandAutoCompleteInteractionEvent event, @NotNull AutoCompleteQuery target) {
-		event.replyChoices(AutoCompleteUtils.handleChoices(event, e -> getPreferenceChoices())).queue();
+		event.replyChoices(AutoCompleteUtils.handleChoices(event, e -> getPreferenceChoices(e.getUser().getIdLong()))).queue();
 	}
 }