Remove Boilerplate Use-case thingy

app/src/api/ApiNoteController.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.app.api
 
 import be.simplenotes.app.extensions.auto
-import be.simplenotes.domain.usecases.NoteService
+import be.simplenotes.domain.NoteService
 import be.simplenotes.types.LoggedInUser
 import be.simplenotes.types.PersistedNote
 import be.simplenotes.types.PersistedNoteMetadata
@@ -76,4 +76,4 @@ data class NoteContent(val content: String)
 data class UuidContent(@Contextual val uuid: UUID)
 
 @Serializable
-data class SearchContent(@Contextual val query: String)
+data class SearchContent(val query: String)

app/src/api/ApiUserController.kt

@@ -1,8 +1,8 @@
 package be.simplenotes.app.api
 
 import be.simplenotes.app.extensions.auto
-import be.simplenotes.domain.usecases.UserService
-import be.simplenotes.domain.usecases.users.login.LoginForm
+import be.simplenotes.domain.LoginForm
+import be.simplenotes.domain.UserService
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import org.http4k.core.Request

app/src/controllers/HealthCheckController.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.app.controllers
 
-import be.simplenotes.domain.usecases.HealthCheckService
+import be.simplenotes.domain.HealthCheckService
 import org.http4k.core.Request
 import org.http4k.core.Response
 import org.http4k.core.Status.Companion.OK

app/src/controllers/NoteController.kt

@@ -2,10 +2,8 @@ package be.simplenotes.app.controllers
 
 import be.simplenotes.app.extensions.html
 import be.simplenotes.app.extensions.redirect
-import be.simplenotes.domain.usecases.NoteService
-import be.simplenotes.domain.usecases.markdown.InvalidMeta
-import be.simplenotes.domain.usecases.markdown.MissingMeta
-import be.simplenotes.domain.usecases.markdown.ValidationError
+import be.simplenotes.domain.MarkdownParsingError
+import be.simplenotes.domain.NoteService
 import be.simplenotes.types.LoggedInUser
 import be.simplenotes.views.NoteView
 import org.http4k.core.Method
@@ -34,17 +32,17 @@ class NoteController(
         return noteService.create(loggedInUser, markdownForm).fold(
             {
                 val html = when (it) {
-                    MissingMeta -> view.noteEditor(
+                    MarkdownParsingError.MissingMeta -> view.noteEditor(
                         loggedInUser,
                         error = "Missing note metadata",
                         textarea = markdownForm
                     )
-                    InvalidMeta -> view.noteEditor(
+                    MarkdownParsingError.InvalidMeta -> view.noteEditor(
                         loggedInUser,
                         error = "Invalid note metadata",
                         textarea = markdownForm
                     )
-                    is ValidationError -> view.noteEditor(
+                    is MarkdownParsingError.ValidationError -> view.noteEditor(
                         loggedInUser,
                         validationErrors = it.validationErrors,
                         textarea = markdownForm
@@ -113,17 +111,17 @@ class NoteController(
         return noteService.update(loggedInUser, note.uuid, markdownForm).fold(
             {
                 val html = when (it) {
-                    MissingMeta -> view.noteEditor(
+                    MarkdownParsingError.MissingMeta -> view.noteEditor(
                         loggedInUser,
                         error = "Missing note metadata",
                         textarea = markdownForm
                     )
-                    InvalidMeta -> view.noteEditor(
+                    MarkdownParsingError.InvalidMeta -> view.noteEditor(
                         loggedInUser,
                         error = "Invalid note metadata",
                         textarea = markdownForm
                     )
-                    is ValidationError -> view.noteEditor(
+                    is MarkdownParsingError.ValidationError -> view.noteEditor(
                         loggedInUser,
                         validationErrors = it.validationErrors,
                         textarea = markdownForm

app/src/controllers/SettingsController.kt

@@ -2,9 +2,10 @@ package be.simplenotes.app.controllers
 
 import be.simplenotes.app.extensions.html
 import be.simplenotes.app.extensions.redirect
-import be.simplenotes.domain.usecases.UserService
-import be.simplenotes.domain.usecases.users.delete.DeleteError
-import be.simplenotes.domain.usecases.users.delete.DeleteForm
+import be.simplenotes.domain.DeleteError
+import be.simplenotes.domain.DeleteForm
+import be.simplenotes.domain.ExportService
+import be.simplenotes.domain.UserService
 import be.simplenotes.types.LoggedInUser
 import be.simplenotes.views.SettingView
 import org.http4k.core.*
@@ -15,6 +16,7 @@ import javax.inject.Singleton
 @Singleton
 class SettingsController(
     private val userService: UserService,
+    private val exportService: ExportService,
     private val settingView: SettingView,
 ) {
     fun settings(request: Request, loggedInUser: LoggedInUser): Response {
@@ -61,15 +63,15 @@ class SettingsController(
         return if (isDownload) {
             val filename = "simplenotes-export-${loggedInUser.username}"
             if (request.form("format") == "zip") {
-                val zip = userService.exportAsZip(loggedInUser.userId)
+                val zip = exportService.exportAsZip(loggedInUser.userId)
                 Response(Status.OK)
                     .with(attachment("$filename.zip", "application/zip"))
                     .body(zip)
             } else
                 Response(Status.OK)
                     .with(attachment("$filename.json", "application/json"))
-                    .body(userService.exportAsJson(loggedInUser.userId))
-        } else Response(Status.OK).body(userService.exportAsJson(loggedInUser.userId)).header(
+                    .body(exportService.exportAsJson(loggedInUser.userId))
+        } else Response(Status.OK).body(exportService.exportAsJson(loggedInUser.userId)).header(
             "Content-Type",
             "application/json"
         )

app/src/controllers/UserController.kt

@@ -4,11 +4,7 @@ import be.simplenotes.app.extensions.html
 import be.simplenotes.app.extensions.isSecure
 import be.simplenotes.app.extensions.redirect
 import be.simplenotes.config.JwtConfig
-import be.simplenotes.domain.usecases.UserService
-import be.simplenotes.domain.usecases.users.login.*
-import be.simplenotes.domain.usecases.users.register.InvalidRegisterForm
-import be.simplenotes.domain.usecases.users.register.RegisterForm
-import be.simplenotes.domain.usecases.users.register.UserExists
+import be.simplenotes.domain.*
 import be.simplenotes.types.LoggedInUser
 import be.simplenotes.views.UserView
 import org.http4k.core.Method.GET
@@ -39,11 +35,11 @@ class UserController(
         return result.fold(
             {
                 val html = when (it) {
-                    UserExists -> userView.register(
+                    RegisterError.UserExists -> userView.register(
                         loggedInUser,
                         error = "User already exists"
                     )
-                    is InvalidRegisterForm ->
+                    is RegisterError.InvalidRegisterForm ->
                         userView.register(
                             loggedInUser,
                             validationErrors = it.validationErrors
@@ -70,17 +66,17 @@ class UserController(
         return result.fold(
             {
                 val html = when (it) {
-                    Unregistered ->
+                    LoginError.Unregistered ->
                         userView.login(
                             loggedInUser,
                             error = "User does not exist"
                         )
-                    WrongPassword ->
+                    LoginError.WrongPassword ->
                         userView.login(
                             loggedInUser,
                             error = "Wrong password"
                         )
-                    is InvalidLoginForm ->
+                    is LoginError.InvalidLoginForm ->
                         userView.login(
                             loggedInUser,
                             validationErrors = it.validationErrors