Implemented search by keyword and search by pet type.

Greg Taylor · Greg Taylor · commit 7f642ee3298d · 2022-09-22T13:59:25.000-04:00
diff --git a/app/controllers/SearchController.java b/app/controllers/SearchController.java
@@ -2,9 +2,7 @@
 
 import io.ebean.DB;
 import io.ebean.Expr;
-import io.ebean.Expression;
 import io.ebean.ExpressionList;
-import io.ebean.Query;
 import models.Pet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,7 +19,7 @@ public class SearchController extends Controller {
     final Logger LOGGER = LoggerFactory.getLogger(this.getClass());
 
     //  The columns searched during a keyword search
-    private List<String> KEYWORD_SEARCH_COLUMNS = new ArrayList<>(Arrays.asList("name", "petType", "description", "color"));
+    private List<String> KEYWORD_SEARCH_COLUMNS = new ArrayList<>(Arrays.asList("name", "description", "color"));
 
     /**
      * @param criteria Key-value pair of what to search for.  For example, an entry of <"petType","Dog"> will search for all pets with a type of "Dog".
@@ -40,23 +38,22 @@ public List<Pet> search(Map<String, String> criteria) {
 
     public Result searchPetByType(String petType) {
         //  Check that the petType requested is a valid one
-        Arrays.stream(Pet.PetType.values())
+        Pet.PetType petTypeEnum = Arrays.stream(Pet.PetType.values())
                 .filter(pt -> pt.name().equalsIgnoreCase(petType))
                 .findFirst()
                 .orElseThrow(IllegalArgumentException::new);
 
-        Map<String, String> searchCriteria = new HashMap<>();
-        searchCriteria.put("petType", petType);
-
-        List<Pet> searchResults = search(searchCriteria);
+        List<Pet> searchResults = DB.find(Pet.class)
+                .where()
+                .eq("petType", petTypeEnum)
+                .findList();
 
         return ok(views.html.petList.render(searchResults));
     }
 
     /**
      * Search a number of different columns for pets.  Searches:
      *  - name
-     *  - petType
      *  - description
      *  - color
      * @param keyword The keyword to use for searching
@@ -65,21 +62,8 @@ public Result searchPetByType(String petType) {
     public Result searchPetByKeyword(String keyword) {
         LOGGER.debug("Initiating keyword search for: " + keyword);
         Map <String, String> searchCriteria = new HashMap<>();
-        KEYWORD_SEARCH_COLUMNS.forEach((c) ->
-                {
-                    //  PetType is an enum, we need to make sure that the keyword is valid if we are going to use it for
-                    //  searching on PetType
-                    if(c.equals("petType")) {
-                        if(Arrays.stream(Pet.PetType.values())
-                                .anyMatch(pt -> pt.toString().equalsIgnoreCase(keyword))) {
-                            searchCriteria.put(c, keyword);
-                        } else {
-                            LOGGER.debug("Excluding keyword from petType search, not a valid petType: " + keyword);
-                        }
-                    } else {
-                        //  For other non-enum columns, add the keyword
-                        searchCriteria.put(c, keyword);
-                    }
+        KEYWORD_SEARCH_COLUMNS.forEach((c) -> {
+                    searchCriteria.put(c, keyword);
                 });
         List<Pet> searchResults = search(searchCriteria);
 
diff --git a/app/models/User.java b/app/models/User.java
@@ -26,6 +26,20 @@ public class User extends BaseModel {
     @NotNull
     private boolean isActive;
 
+    public User(String name, String password, String email, boolean isActive) {
+        this.name = name;
+        this.password = password;
+        this.email = email;
+        this.isActive = isActive;
+    }
+
+    public User(String name, String password, String email) {
+        this.name = name;
+        this.password = password;
+        this.email = email;
+        this.isActive = true;
+    }
+
     public void setId(long id) {
         this.id = id;
     }
diff --git a/app/views/main.scala.html b/app/views/main.scala.html
@@ -30,7 +30,7 @@
                             </a>
                         </a>
                         <hr>
-                        <form class="col-12 col-lg-auto mb-3 mb-lg-0 me-lg-3" role="search" action="/search" method="get">
+                        <form class="col-12 col-lg-auto mb-3 mb-lg-0 me-lg-3" role="search" action="/pets/search" method="get">
                             <input type="search" name="keyword" class="form-control form-control-dark text-bg-dark" placeholder="Search..." aria-label="Search">
                         </form>
                         <hr>
@@ -54,7 +54,7 @@
                                 </a>
                                 <ul class="dropdown-menu dropdown-menu-dark">
                                     @for(petType <- Pet.PetType.values()) {
-                                        <li><a href="#" class="dropdown-item text-white">@petType</a></li>
+                                        <li><a href="/pets/type/@petType" class="dropdown-item text-white">@petType</a></li>
                                     }
                                 </ul>
                             </li>
@@ -78,7 +78,9 @@
                 </div>
                 @* And here's where we render the `Html` object containing
                 * the page content. *@
-                <div id="content" class="col-md-9 content">@content</div>
+                <div id="content" class="col-md-9 content">
+                    @content
+                </div>
             </div>
         </main>
         <div class="container">
diff --git a/app/views/petList.scala.html b/app/views/petList.scala.html
@@ -31,33 +31,6 @@
                                 <td><button type="button" class="btn btn-primary btn-sm">Add to Cart</button></td>
                             </tr>
                         }
-                        <tr>
-                            <th scope="row">PPS-001-A</th>
-                            <td>Dog</td>
-                            <td>West Highland Terrier</td>
-                            <td>White</td>
-                            <td>Commonly known as the "Westie".</td>
-                            <td>$500.00</td>
-                            <td><button type="button" class="btn btn-primary btn-sm">Add to Cart</button></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">PPS-002-A</th>
-                            <td>Dog</td>
-                            <td>German Shepherd</td>
-                            <td>Brown</td>
-                            <td>Working breed known for its intelligence.</td>
-                            <td>$800.00</td>
-                            <td><button type="button" class="btn btn-primary btn-sm">Add to Cart</button></td>
-                        </tr>
-                        <tr>
-                            <th scope="row">PPS-003-A</th>
-                            <td>Dog</td>
-                            <td>Dachshund</td>
-                            <td>Black</td>
-                            <td>A short-legged, long-bodied hound known as the "wiener dog".</td>
-                            <td>$400.00</td>
-                            <td><button type="button" class="btn btn-primary btn-sm">Add to Cart</button></td>
-                        </tr>
                     </tbody>
                 </table>
             </div>
diff --git a/build.sbt b/build.sbt
@@ -10,6 +10,7 @@ scalaVersion := "2.13.8"
 libraryDependencies ++= Seq(
   guice,
   javaJdbc,
+  caffeine,
   "org.postgresql" % "postgresql" % "42.2.12",
   "io.ebean" % "ebean-querybean" % "13.9.2",
   "io.ebean" % "ebean-agent" % "13.9.2",
