replaced ordinal in UserPreference with actual Preference

Author: jasonlessenich

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

@@ -36,7 +36,7 @@ public boolean setOrCreate(long userId, Preference preference, boolean enabled)
 			} else {
 				UserPreference userPreference = new UserPreference();
 				userPreference.setUserId(userId);
-				userPreference.setOrdinal(preference.ordinal());
+				userPreference.setPreference(preference);
 				userPreference.setEnabled(enabled);
 				repo.insert(userPreference, false);
 				return true;
@@ -63,7 +63,7 @@ public UserPreference getOrCreate(long userId, Preference preference) {
 			} else {
 				UserPreference userPreference = new UserPreference();
 				userPreference.setUserId(userId);
-				userPreference.setOrdinal(preference.ordinal());
+				userPreference.setPreference(preference);
 				userPreference.setEnabled(true);
 				repo.insert(userPreference, false);
 				return userPreference;

src/main/java/net/javadiscord/javabot/systems/user_preferences/dao/UserPreferenceRepository.java

@@ -24,9 +24,9 @@ public class UserPreferenceRepository extends DatabaseRepository<UserPreference>
 	 */
 	public UserPreferenceRepository(Connection con) {
 		super(con, UserPreference.class, "USER_PREFERENCES", List.of(
-				TableProperty.of("user_id", H2Type.BIGINT,  (x, y) -> x.setUserId((Long) y),        UserPreference::getUserId),
-				TableProperty.of("ordinal", H2Type.INTEGER, (x, y) -> x.setOrdinal((Integer) y),    UserPreference::getOrdinal),
-				TableProperty.of("enabled", H2Type.BOOLEAN, (x, y) -> x.setEnabled((Boolean) y),    UserPreference::isEnabled)
+				TableProperty.of("user_id", H2Type.BIGINT,  (x, y) -> x.setUserId((Long) y),                                UserPreference::getUserId),
+				TableProperty.of("ordinal", H2Type.INTEGER, (x, y) -> x.setPreference(Preference.values()[(Integer) y]),    p -> p.getPreference().ordinal()),
+				TableProperty.of("enabled", H2Type.BOOLEAN, (x, y) -> x.setEnabled((Boolean) y),                            UserPreference::isEnabled)
 		));
 	}
 

src/main/java/net/javadiscord/javabot/systems/user_preferences/model/UserPreference.java

@@ -8,10 +8,6 @@
 @Data
 public class UserPreference {
 	private long userId;
-	private int ordinal;
+	private Preference preference;
 	private boolean enabled;
-
-	public Preference getPreference() {
-		return Preference.values()[ordinal];
-	}
 }