optimize gerne proccessing

HliasMpGH · Sep 7, 2024 · 887baa7 · 887baa7
1 parent 2edb6c2
commit 887baa7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/gui/src/main/java/gr/bibliotech/data/BookDAO.java b/gui/src/main/java/gr/bibliotech/data/BookDAO.java
@@ -87,11 +87,11 @@ public List<Book> filterBooks(List<Book> books, String filter) {
      * @param genre the genre specified
      * @return a list of books
      */
-    public List<Book> findBooks(String query, String genre) {
+    public List<Book> findBooks(String query, BookGenre genre) {
         List<Book> books = (!query.trim().isEmpty() ? getMatchingBooks(query) : getBooks());
 
-        if (!genre.equals("any")) {
-            books = filterBooks(books, genre);
+        if (genre != BookGenre.ANY) {
+            books = filterBooks(books, genre.toString());
         }
 
         return books;

diff --git a/gui/src/main/java/gr/bibliotech/data/BookGenre.java b/gui/src/main/java/gr/bibliotech/data/BookGenre.java
@@ -0,0 +1,11 @@
+package gr.bibliotech.data;
+
+/** The Available Book Genres. */
+public enum BookGenre {
+    ANY,
+    ADVENTURE,
+    DRAMA,
+    CRIME,
+    DYSTOPIAN,
+    ROMANCE
+}
diff --git a/gui/src/main/java/gr/bibliotech/web/controller/SearchController.java b/gui/src/main/java/gr/bibliotech/web/controller/SearchController.java
@@ -12,6 +12,7 @@
 
 import gr.bibliotech.app.Book;
 import gr.bibliotech.data.BookDAO;
+import gr.bibliotech.data.BookGenre;
 
 /**
  * The Controller that Handles
@@ -49,7 +50,7 @@ public String showResults(@RequestParam("query") String query,
                               Model model) {
 
         // get the books that match the specified criteria
-        List<Book> matchingBooks = bookDAO.findBooks(query, genre);
+        List<Book> matchingBooks = bookDAO.findBooks(query, BookGenre.valueOf(genre));
 
         // present the results, or an appropriate message in case of no results
         if (matchingBooks.size() != 0) {

diff --git a/gui/src/main/resources/templates/bookSearch.html b/gui/src/main/resources/templates/bookSearch.html
@@ -35,13 +35,11 @@
             <div class="filter-options">
                 <label for="genre">Genre:</label>
                 <select id="genre" name="genre">
-                    <option value="any">Any</option>
-                    <option value="adventure">Adventure</option>
-                    <option value="drama">Drama</option>
-                    <option value="crime">Crime</option>
-                    <option value="Dystopian">Dystopian</option>
-                    <option value="Romance">Romance</option>
-                    <!-- Add more genre options as needed -->
+                    <option
+                        th:each = "genre : ${T(gr.bibliotech.data.BookGenre).values()}"
+                        th:value = "${genre}"
+                        th:text = "${genre}"
+                    >
                 </select>
             </div>
         </form>