add OcppTagFilter filter to users overview query

Author: goekay

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

@@ -64,16 +64,39 @@ public class UserRepositoryImpl implements UserRepository {
     @Override
     public List<User.Overview> getOverview(UserQueryForm form) {
         var ocppTagsPerUser = getOcppTagsInternal(form.getUserPk(), form.getOcppIdTag());
+        var userResults = getOverviewInternal(form);
+
+        List<User.Overview> userOverviews = new ArrayList<>();
+        for (var r : userResults) {
+            var tags = ocppTagsPerUser.getOrDefault(r.value1(), List.of());
+
+            var user = User.Overview.builder()
+                .userPk(r.value1())
+                .name(r.value2() + " " + r.value3())
+                .phone(r.value4())
+                .email(r.value5())
+                .ocppTagEntries(tags)
+                .build();
+
+            // TODO: Improve later. This is not efficient, because we filter after fetching all results. However, this
+            //       should be acceptable since the number of users (and tags) are usually not very high, and this
+            //       overview query will probably not be in the hot path.
+            switch (form.getOcppTagFilter()) {
+                case OnlyUsersWithTags -> {
+                    if (!tags.isEmpty()) {
+                        userOverviews.add(user);
+                    }
+                }
+                case OnlyUsersWithoutTags -> {
+                    if (tags.isEmpty()) {
+                        userOverviews.add(user);
+                    }
+                }
+                default -> userOverviews.add(user);
+            }
+        }
 
-        return getOverviewInternal(form)
-                .map(r -> User.Overview.builder()
-                                       .userPk(r.value1())
-                                       .name(r.value2() + " " + r.value3())
-                                       .phone(r.value4())
-                                       .email(r.value5())
-                                       .ocppTagEntries(ocppTagsPerUser.getOrDefault(r.value1(), List.of()))
-                                       .build()
-                );
+        return userOverviews;
     }
 
     @Override

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

@@ -39,6 +39,8 @@ public class UserQueryForm {
     private String name;
     private String email;
 
+    private OcppTagFilter ocppTagFilter = OcppTagFilter.All;
+
     public boolean isSetUserPk() {
         return userPk != null;
     }
@@ -54,4 +56,11 @@ public boolean isSetName() {
     public boolean isSetEmail() {
         return email != null;
     }
+
+    public enum OcppTagFilter {
+        All,
+        OnlyUsersWithTags,
+        OnlyUsersWithoutTags
+    }
+
 }

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

@@ -36,6 +36,14 @@
                 <td>Ocpp ID Tag:</td>
                 <td><form:input path="ocppIdTag"/></td>
             </tr>
+            <tr>
+                <td>Ocpp ID Tag Relationship:</td>
+                <td>
+                    <form:select path="ocppTagFilter">
+                        <form:options items="${ocppTagFilter}"/>
+                    </form:select>
+                </td>
+            </tr>
             <tr>
                 <td>Name:</td>
                 <td><form:input path="name"/></td>