refactor: apply consistent naming for the feature

Author: goekay

src/main/java/de/rwth/idsg/steve/repository/dto/User.java

@@ -39,7 +39,7 @@ public static final class Overview {
         private final Integer userPk;
         private final String name, phone, email;
         private final List<OcppTagEntry> ocppTagEntries;
-        private final List<NotificationFeature> enabledFeatures;
+        private final List<NotificationFeature> notificationFeatures;
     }
 
     @Getter

src/main/java/de/rwth/idsg/steve/repository/impl/UserRepositoryImpl.java

@@ -78,7 +78,7 @@ public List<User.Overview> getOverview(UserQueryForm form) {
                 .phone(r.value4())
                 .email(r.value5())
                 .ocppTagEntries(tags)
-                .enabledFeatures(NotificationFeature.splitFeatures(r.value6()))
+                .notificationFeatures(NotificationFeature.splitFeatures(r.value6()))
                 .build();
 
             // TODO: Improve later. This is not efficient, because we filter after fetching all results. However, this
@@ -203,7 +203,7 @@ private Result<Record6<Integer, String, String, String, String, String>> getOver
                 USER.LAST_NAME,
                 USER.PHONE,
                 USER.E_MAIL,
-                USER.USER_NOTIFICATION_FEATURES)
+                USER.NOTIFICATION_FEATURES)
             .from(USER)
             .where(conditions)
             .fetch();
@@ -260,7 +260,7 @@ private Integer addInternal(DSLContext ctx, UserForm form, Integer addressPk) {
                       .set(USER.E_MAIL, form.getEMail())
                       .set(USER.NOTE, form.getNote())
                       .set(USER.ADDRESS_PK, addressPk)
-                      .set(USER.USER_NOTIFICATION_FEATURES, NotificationFeature.joinFeatures(form.getEnabledFeatures()))
+                      .set(USER.NOTIFICATION_FEATURES, NotificationFeature.joinFeatures(form.getNotificationFeatures()))
                       .returning(USER.USER_PK)
                       .fetchOne()
                       .getUserPk();
@@ -279,7 +279,7 @@ private void updateInternal(DSLContext ctx, UserForm form, Integer addressPk) {
            .set(USER.E_MAIL, form.getEMail())
            .set(USER.NOTE, form.getNote())
            .set(USER.ADDRESS_PK, addressPk)
-           .set(USER.USER_NOTIFICATION_FEATURES, NotificationFeature.joinFeatures(form.getEnabledFeatures()))
+           .set(USER.NOTIFICATION_FEATURES, NotificationFeature.joinFeatures(form.getNotificationFeatures()))
            .where(USER.USER_PK.eq(form.getUserPk()))
            .execute();
     }

src/main/java/de/rwth/idsg/steve/service/NotificationServiceForUser.java

@@ -188,7 +188,7 @@ private User.Overview getUserForMail(String ocppIdTag, NotificationFeature featu
             return null;
         }
 
-        if (!user.getEnabledFeatures().contains(feature)) {
+        if (!user.getNotificationFeatures().contains(feature)) {
             return null;
         }
 

src/main/java/de/rwth/idsg/steve/utils/mapper/UserFormMapper.java

@@ -44,7 +44,7 @@ public static UserForm toForm(User.Details details) {
         form.setPhone(userRecord.getPhone());
         form.setSex(UserSex.fromDatabaseValue(userRecord.getSex()));
         form.setEMail(userRecord.getEMail());
-        form.setEnabledFeatures(NotificationFeature.splitFeatures(userRecord.getUserNotificationFeatures()));
+        form.setNotificationFeatures(NotificationFeature.splitFeatures(userRecord.getNotificationFeatures()));
         form.setNote(userRecord.getNote());
         form.setAddress(AddressMapper.recordToDto(details.getAddress()));
         form.setIdTagList(details.getOcppTagEntries().stream().map(User.OcppTagEntry::getIdTag).toList());

src/main/java/de/rwth/idsg/steve/web/dto/UserForm.java

@@ -56,7 +56,7 @@ public class UserForm {
     @Email(message = "Not a valid e-mail address")
     private String eMail;
 
-    private List<NotificationFeature> enabledFeatures;
+    private List<NotificationFeature> notificationFeatures;
 
     private Address address;
 

src/main/resources/db/migration/V1_0_9__update.sql

@@ -1,2 +1,2 @@
 ALTER TABLE `user`
-    ADD COLUMN `user_notification_features` TEXT NULL DEFAULT NULL COMMENT 'comma separated list' COLLATE 'utf8mb3_unicode_ci' AFTER `e_mail`;
+    ADD COLUMN `notification_features` TEXT NULL DEFAULT NULL COMMENT 'comma separated list' COLLATE 'utf8mb3_unicode_ci' AFTER `e_mail`;

src/main/webapp/WEB-INF/views/data-man/00-user-profile.jsp

@@ -35,7 +35,7 @@
 	<tr><td>E-mail:</td><td><form:input path="eMail"/></td></tr>
         <tr>
             <td>Notify when... </td>
-            <td><form:checkboxes items="${features}" path="enabledFeatures"
+            <td><form:checkboxes items="${features}" path="notificationFeatures"
                                  itemLabel="text" delimiter="<br/>"/>
             </td>
         </tr> 

src/main/webapp/WEB-INF/views/data-man/users.jsp

@@ -88,7 +88,7 @@
                 <td>${cr.name}</td>
                 <td>${cr.phone}</td>
                 <td>${cr.email}</td>
-                <td><c:forEach items="${cr.enabledFeatures}" var="eF">
+                <td><c:forEach items="${cr.notificationFeatures}" var="eF">
                         ${eF}<br/>
                     </c:forEach>
                 </td>