Move search parsing to domain layer

simplenotes-app/build.gradle.kts

@@ -10,7 +10,6 @@ plugins {
 }
 
 dependencies {
-    implementation(project(":simplenotes-search"))
     implementation(project(":simplenotes-domain"))
     implementation(project(":simplenotes-types"))
     implementation(project(":simplenotes-config"))

simplenotes-app/src/main/kotlin/be/simplenotes/app/api/ApiNoteController.kt

@@ -1,7 +1,6 @@
 package be.simplenotes.app.api
 
 import be.simplenotes.app.extensions.auto
-import be.simplenotes.app.utils.parseSearchTerms
 import be.simplenotes.domain.usecases.NoteService
 import be.simplenotes.types.LoggedInUser
 import be.simplenotes.types.PersistedNote
@@ -58,8 +57,7 @@ class ApiNoteController(
 
     fun search(request: Request, loggedInUser: LoggedInUser): Response {
         val query = searchContentLens(request)
-        val terms = parseSearchTerms(query)
-        val notes = noteService.search(loggedInUser.userId, terms)
+        val notes = noteService.search(loggedInUser.userId, query)
         return persistedNotesMetadataLens(notes, Response(OK))
     }
 

simplenotes-app/src/main/kotlin/be/simplenotes/app/controllers/NoteController.kt

@@ -2,7 +2,6 @@ package be.simplenotes.app.controllers
 
 import be.simplenotes.app.extensions.html
 import be.simplenotes.app.extensions.redirect
-import be.simplenotes.app.utils.parseSearchTerms
 import be.simplenotes.domain.usecases.NoteService
 import be.simplenotes.domain.usecases.markdown.InvalidMeta
 import be.simplenotes.domain.usecases.markdown.MissingMeta
@@ -69,8 +68,7 @@ class NoteController(
 
     fun search(request: Request, loggedInUser: LoggedInUser): Response {
         val query = request.form("search") ?: ""
-        val terms = parseSearchTerms(query)
-        val notes = noteService.search(loggedInUser.userId, terms)
+        val notes = noteService.search(loggedInUser.userId, query)
         val deletedCount = noteService.countDeleted(loggedInUser.userId)
         return Response(OK).html(view.search(loggedInUser, notes, query, deletedCount))
     }

simplenotes-app/src/main/kotlin/be/simplenotes/app/utils/SearchTermsParser.kt

@@ -1,43 +0,0 @@
-package be.simplenotes.app.utils
-
-import be.simplenotes.search.SearchTerms
-
-private fun innerRegex(name: String) =
-    """$name:['"](.*?)['"]""".toRegex()
-private fun outerRegex(name: String) =
-    """($name:['"].*?['"])""".toRegex()
-
-private val titleRe = innerRegex("title")
-private val outerTitleRe = outerRegex("title")
-
-private val tagRe = innerRegex("tag")
-private val outerTagRe = outerRegex("tag")
-
-private val contentRe = innerRegex("content")
-private val outerContentRe = outerRegex("content")
-
-fun parseSearchTerms(input: String): SearchTerms {
-    var c: String = input
-
-    fun extract(innerRegex: Regex, outerRegex: Regex): String? {
-        val match = innerRegex.find(input)?.groups?.get(1)?.value
-        if (match != null) {
-            val group = outerRegex.find(input)?.groups?.get(1)?.value
-            group?.let { c = c.replace(it, "") }
-        }
-        return match
-    }
-
-    val title: String? = extract(titleRe, outerTitleRe)
-    val tag: String? = extract(tagRe, outerTagRe)
-    val content: String? = extract(contentRe, outerContentRe)
-
-    val all = c.trim().ifEmpty { null }
-
-    return SearchTerms(
-        title = title,
-        tag = tag,
-        content = content,
-        all = all
-    )
-}

simplenotes-app/src/test/kotlin/be/simplenotes/app/utils/SearchTermsParserKtTest.kt

@@ -1,44 +0,0 @@
-package be.simplenotes.app.utils
-
-import be.simplenotes.search.SearchTerms
-import org.assertj.core.api.Assertions.assertThat
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.MethodSource
-import java.util.stream.Stream
-
-internal class SearchTermsParserKtTest {
-
-    private fun createResult(
-        input: String,
-        title: String? = null,
-        tag: String? = null,
-        content: String? = null,
-        all: String? = null
-    ): Pair<String, SearchTerms> = input to SearchTerms(title, tag, content, all)
-
-    @Suppress("Unused")
-    private fun results() = Stream.of(
-        createResult("title:'example'", title = "example"),
-        createResult("title:'example with words'", title = "example with words"),
-        createResult("title:'example with words'", title = "example with words"),
-        createResult("""title:"double quotes"""", title = "double quotes"),
-        createResult("title:'example' something else", title = "example", all = "something else"),
-        createResult("tag:'example'", tag = "example"),
-        createResult("tag:'example' title:'other'", title = "other", tag = "example"),
-        createResult("blah blah tag:'example' title:'other'", title = "other", tag = "example", all = "blah blah"),
-        createResult("tag:'example' middle title:'other'", title = "other", tag = "example", all = "middle"),
-        createResult("tag:'example' title:'other' end", title = "other", tag = "example", all = "end"),
-        createResult(
-            "tag:'example abc' title:'other with words' this is the end  ",
-            title = "other with words",
-            tag = "example abc",
-            all = "this is the end"
-        ),
-    )
-
-    @ParameterizedTest
-    @MethodSource("results")
-    fun `valid search parser`(case: Pair<String, SearchTerms>) {
-        assertThat(parseSearchTerms(case.first)).isEqualTo(case.second)
-    }
-}