Search by a tag e.g. tag:eng #2

#2
tedwon · Jan 1, 2023 · 50f560b · 50f560b
1 parent b01781b
commit 50f560b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/quokka-backend/src/main/java/sara/won/quokka/MemoResource.java b/quokka-backend/src/main/java/sara/won/quokka/MemoResource.java
@@ -59,7 +59,7 @@ public String getAsText() {
     }
 
     @GET
-    @Path("{pin}/")
+    @Path("{pin}")
     public List<Memo> getByKeyword(Boolean pin) {
         String namedQuery = "Memos.findAll";
         if (pin) {
@@ -71,7 +71,14 @@ public List<Memo> getByKeyword(Boolean pin) {
     @GET
     @Path("{pin}/{keyword}")
     public List<Memo> getByKeyword(String pin, String keyword) {
-        System.out.println(pin + " : " + keyword);
+        if (keyword.startsWith("tag:")) {
+            String tagSearch = keyword.substring(4);
+            System.out.println(tagSearch);
+            return entityManager.createNamedQuery("Memos.findByTag")
+                    .setParameter("tagSearch", "%" + tagSearch + "%")
+                    .getResultList();
+        }
+
         String namedQuery = "Memos.findByKeyword";
         if (Boolean.parseBoolean(pin)) {
             namedQuery = "Memos.findPinnedByKeyword";

diff --git a/quokka-backend/src/main/java/sara/won/quokka/models/Memo.java b/quokka-backend/src/main/java/sara/won/quokka/models/Memo.java
@@ -18,6 +18,7 @@
 @Entity
 @Table(name = "Memo")
 @NamedQuery(name = "Memos.findAll", query = "SELECT m FROM Memo m ORDER BY m.pin DESC, m.date DESC", hints = @QueryHint(name = "org.hibernate.cacheable", value = "true"))
+@NamedQuery(name = "Memos.findByTag", query = "SELECT m FROM Memo m WHERE m.tags LIKE :tagSearch ORDER BY m.pin DESC, m.date DESC")
 @NamedQuery(name = "Memos.findPinned", query = "SELECT m FROM Memo m WHERE m.pin = true ORDER BY m.date DESC", hints = @QueryHint(name = "org.hibernate.cacheable", value = "true"))
 @NamedQuery(name = "Memos.findByKeyword", query = "SELECT m FROM Memo m WHERE (upper(m.title) LIKE upper(:keyword)) OR (upper(m.body) LIKE upper(:keyword)) OR (upper(m.tags) LIKE upper(:keyword)) ORDER BY m.pin DESC, m.date DESC")
 @NamedQuery(name = "Memos.findPinnedByKeyword", query = "SELECT m FROM Memo m WHERE m.pin = true AND ((upper(m.title) LIKE upper(:keyword)) OR (upper(m.body) LIKE upper(:keyword)) OR (upper(m.tags) LIKE upper(:keyword))) ORDER BY m.pin DESC, m.date DESC")