Merge branch 'master' of https://github.com/AnuragVanam/Geoweaver int…

…o pr/137
ESIPFed · Mar 28, 2021 · 1aee32a · 1aee32a
2 parents 03fa091 + 3307a5f
commit 1aee32a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/src/main/java/com/gw/database/HostRepository.java b/src/main/java/com/gw/database/HostRepository.java
@@ -5,18 +5,19 @@
 
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
 
 import com.gw.jpa.Host;
 
 public interface HostRepository extends CrudRepository<Host, String>{
 
-	@Query(value="select * from hosts where owner = ?1 ",
+	@Query(value="select * from host where owner = ?1 ",
 		nativeQuery = true)
 	Collection<Host> findByOwner(String owner);
 
-	@Query(value="select * from hosts where name like '%?1%'",
+	@Query(value="select * from HOST where name like CONCAT('%',:keyword,'%')",
 		nativeQuery = true)
-	Collection<Host> findHostsByNameAlike(String keyword);
+	Collection<Host> findHostsByNameAlike(@Param("keyword") String keyword);
 
 
 

diff --git a/src/main/java/com/gw/database/ProcessRepository.java b/src/main/java/com/gw/database/ProcessRepository.java
@@ -4,15 +4,16 @@
 
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
 
 import com.gw.jpa.GWProcess;
 import com.gw.jpa.Host;
 
 public interface ProcessRepository extends CrudRepository<GWProcess, String>{
 
-	@Query(value = "select * from GWProcess where name like '%?1%'", 
+	@Query(value = "select * from GWProcess where name like CONCAT('%',:keyword,'%')", 
 		nativeQuery = true)
-	Collection<GWProcess> findProcessesByNameAlike(String keyword);
+	Collection<GWProcess> findProcessesByNameAlike(@Param("keyword") String keyword);
 
 	@Query(value="select * from gwprocess where description = 'python'",
 		nativeQuery = true)

diff --git a/src/main/java/com/gw/database/WorkflowRepository.java b/src/main/java/com/gw/database/WorkflowRepository.java
@@ -4,14 +4,15 @@
 
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
+import org.springframework.data.repository.query.Param;
 
 import com.gw.jpa.GWProcess;
 import com.gw.jpa.Workflow;
 
 public interface WorkflowRepository extends CrudRepository<Workflow, String>{
 
-	@Query(value="select * from workflow where name like '%?1%'",
+	@Query(value="select * from workflow where name like CONCAT('%',:keyword,'%')",
 		nativeQuery=true)
-	Collection<Workflow> findProcessesByNameAlike(String keyword);
+	Collection<Workflow> findProcessesByNameAlike(@Param("keyword") String keyword);
 
 }