From a4e70a0739ff58f625f44ca6fae291af189f081e Mon Sep 17 00:00:00 2001
From: tim holloway <timh@mousetech.com>
Date: Fri, 16 Feb 2024 20:13:58 -0500
Subject: [PATCH] Made searches case-insensitive

---
 pom.xml                                             |  2 +-
 src/main/java/com/mousetech/gourmetj/JSFUtils.java  |  2 +-
 .../gourmetj/persistence/dao/RecipeRepository.java  |  9 ++++-----
 .../gourmetj/persistence/service/RecipeService.java | 13 +++++++++----
 .../resources/META-INF/resources/detailEdit.xhtml   |  4 +++-
 5 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index be4577f..2971466 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
 
     <groupId>com.mousetech.gourmet</groupId>
     <artifactId>gourmetj</artifactId>
-    <version>0.2.4</version>
+    <version>0.2.5</version>
     <packaging>jar</packaging>
 
     <name>GourmetJ</name>
diff --git a/src/main/java/com/mousetech/gourmetj/JSFUtils.java b/src/main/java/com/mousetech/gourmetj/JSFUtils.java
index d94e6dc..c2f4027 100644
--- a/src/main/java/com/mousetech/gourmetj/JSFUtils.java
+++ b/src/main/java/com/mousetech/gourmetj/JSFUtils.java
@@ -1,4 +1,4 @@
-package com.mousetech.gourmetj;
+	package com.mousetech.gourmetj;
 
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
diff --git a/src/main/java/com/mousetech/gourmetj/persistence/dao/RecipeRepository.java b/src/main/java/com/mousetech/gourmetj/persistence/dao/RecipeRepository.java
index cff8c68..a70b24a 100644
--- a/src/main/java/com/mousetech/gourmetj/persistence/dao/RecipeRepository.java
+++ b/src/main/java/com/mousetech/gourmetj/persistence/dao/RecipeRepository.java
@@ -7,7 +7,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
-import com.mousetech.gourmetj.persistence.model.Category;
 import com.mousetech.gourmetj.persistence.model.Recipe;
 
 /**
@@ -24,7 +23,7 @@ import com.mousetech.gourmetj.persistence.model.Recipe;
 public interface RecipeRepository
 		extends JpaRepository<Recipe, Long> {
 
-	List<Recipe> findByTitleContaining(String searchText);
+	List<Recipe> findByTitleContainingIgnoreCase(String searchText);
 
 	@EntityGraph(value="Recipe.findWorkingSet")
 	public Recipe findDetailsById(Long recipeId);
@@ -32,11 +31,11 @@ public interface RecipeRepository
 	@Query(name = "Recipe.findCusines", nativeQuery = true)
 	List<String> FindCuisinesNative();
 
-	List<Recipe> findByCategories_CategoryContains(String searchText);
+	List<Recipe> findByCategories_CategoryContainsIgnoreCase(String searchText);
 
-	List<Recipe> findByCuisineContains(String searchText);
+	List<Recipe> findByCuisineContainsIgnoreCase(String searchText);
 
-	List<Recipe> findDistinctByIngredientHash_ItemContains(
+	List<Recipe> findDistinctByIngredientHash_ItemContainsIgnoreCase(
 			String searchText);
 	
 }
diff --git a/src/main/java/com/mousetech/gourmetj/persistence/service/RecipeService.java b/src/main/java/com/mousetech/gourmetj/persistence/service/RecipeService.java
index ce283c1..49bfcfa 100644
--- a/src/main/java/com/mousetech/gourmetj/persistence/service/RecipeService.java
+++ b/src/main/java/com/mousetech/gourmetj/persistence/service/RecipeService.java
@@ -50,7 +50,7 @@ public class RecipeService implements Serializable {
 
 	public List<Recipe> findByTitle(String searchText) {
 		return recipeRepository
-			.findByTitleContaining(searchText);
+			.findByTitleContainingIgnoreCase(searchText);
 	}
 
 	public Recipe findByPrimaryKey(Long recipeId) {
@@ -120,14 +120,19 @@ public class RecipeService implements Serializable {
 	}
 
 	public List<Recipe> findByCategoryLike(String searchText) {
-		return recipeRepository.findByCategories_CategoryContains(searchText);
+		return recipeRepository
+			.findByCategories_CategoryContainsIgnoreCase(
+				searchText);
 	}
 
 	public List<Recipe> findByCuisineLike(String searchText) {
-		return recipeRepository.findByCuisineContains(searchText);
+		return recipeRepository
+			.findByCuisineContainsIgnoreCase(searchText);
 	}
 
 	public List<Recipe> findByIngredientLike(String searchText) {
-		return recipeRepository.findDistinctByIngredientHash_ItemContains(searchText);
+		return recipeRepository
+			.findDistinctByIngredientHash_ItemContainsIgnoreCase(
+				searchText);
 	}
 }
diff --git a/src/main/resources/META-INF/resources/detailEdit.xhtml b/src/main/resources/META-INF/resources/detailEdit.xhtml
index d16fe3b..21ad90e 100644
--- a/src/main/resources/META-INF/resources/detailEdit.xhtml
+++ b/src/main/resources/META-INF/resources/detailEdit.xhtml
@@ -62,9 +62,9 @@
                                 <p:outputLabel for="@next"
                                     value="Title"
                                 />
+                                <p:focus/>
                                 <p:inputText id="rtitle"
                                     size="45" required="true"
-                                    focus="true"
                                     placeholder="A recipe title is required."
                                     value="#{recipeDetailBean.recipe.title}"
                                 >
@@ -372,6 +372,7 @@
                         >
                             <p:panel header="Instructions">
                                 <div id="insection">
+                                    <p:focus/>
                                     <h:inputTextarea
                                         id="ctlInstructions"
                                         rows="30" cols="120"
@@ -383,6 +384,7 @@
                         </p:tab>
                         <p:tab id="notesTab" title="Notes">
                             <p:panel header="Notes">
+                                <p:focus/>
                                 <h:inputTextarea id="ctlNotes"
                                     rows="30" cols="120"
                                     escape="false"