Move types into simplenotes-types module

simplenotes-domain/pom.xml

@@ -24,14 +24,14 @@
             <scope>test</scope>
         </dependency>
 
-        <dependency>
-            <groupId>io.arrow-kt</groupId>
-            <artifactId>arrow-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.koin</groupId>
             <artifactId>koin-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.arrow-kt</groupId>
+            <artifactId>arrow-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.natpryce</groupId>
             <artifactId>hamkrest</artifactId>
@@ -83,15 +83,17 @@
             <artifactId>owasp-java-html-sanitizer</artifactId>
             <version>20200713.1</version>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlinx</groupId>
-            <artifactId>kotlinx-serialization-json-jvm</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
             <version>1.20</version>
         </dependency>
+        <dependency>
+            <groupId>be.simplenotes</groupId>
+            <artifactId>simplenotes-types</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>

simplenotes-domain/src/main/kotlin/model/Note.kt

@@ -1,47 +0,0 @@
-package be.simplenotes.domain.model
-
-import kotlinx.serialization.Contextual
-import kotlinx.serialization.Serializable
-import java.time.LocalDateTime
-import java.util.*
-
-@Serializable
-data class NoteMetadata(
-    val title: String,
-    val tags: List<String>,
-)
-
-@Serializable
-data class PersistedNoteMetadata(
-    val title: String,
-    val tags: List<String>,
-    @Contextual val updatedAt: LocalDateTime,
-    @Contextual val uuid: UUID,
-)
-
-@Serializable
-data class Note(
-    val meta: NoteMetadata,
-    val markdown: String,
-    val html: String,
-)
-
-@Serializable
-data class PersistedNote(
-    val meta: NoteMetadata,
-    val markdown: String,
-    val html: String,
-    @Contextual val updatedAt: LocalDateTime,
-    @Contextual val uuid: UUID,
-    val public: Boolean,
-)
-
-@Serializable
-data class ExportedNote(
-    val title: String,
-    val tags: List<String>,
-    val markdown: String,
-    val html: String,
-    @Contextual val updatedAt: LocalDateTime,
-    val trash: Boolean,
-)

simplenotes-domain/src/main/kotlin/model/User.kt

@@ -1,4 +0,0 @@
-package be.simplenotes.domain.model
-
-data class User(val username: String, val password: String)
-data class PersistedUser(val username: String, val password: String, val id: Int)

simplenotes-domain/src/main/kotlin/security/JwtPayload.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.domain.security
 
-import be.simplenotes.domain.model.PersistedUser
+import be.simplenotes.types.PersistedUser
 import com.auth0.jwt.exceptions.JWTVerificationException
 
 data class JwtPayload(val userId: Int, val username: String) {

simplenotes-domain/src/main/kotlin/usecases/NoteService.kt

@@ -2,9 +2,9 @@ package be.simplenotes.domain.usecases
 
 import arrow.core.Either
 import arrow.core.extensions.fx
-import be.simplenotes.domain.model.Note
-import be.simplenotes.domain.model.PersistedNote
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.Note
+import be.simplenotes.types.PersistedNote
+import be.simplenotes.types.PersistedNoteMetadata
 import be.simplenotes.domain.security.HtmlSanitizer
 import be.simplenotes.domain.usecases.markdown.MarkdownConverter
 import be.simplenotes.domain.usecases.markdown.MarkdownParsingError

simplenotes-domain/src/main/kotlin/usecases/export/ExportUseCaseImpl.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.domain.usecases.export
 
-import be.simplenotes.domain.model.ExportedNote
+import be.simplenotes.types.ExportedNote
 import be.simplenotes.domain.usecases.repositories.NoteRepository
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.json.Json

simplenotes-domain/src/main/kotlin/usecases/markdown/MarkdownConverter.kt

@@ -4,7 +4,7 @@ import arrow.core.Either
 import arrow.core.extensions.fx
 import arrow.core.left
 import arrow.core.right
-import be.simplenotes.domain.model.NoteMetadata
+import be.simplenotes.types.NoteMetadata
 import be.simplenotes.domain.validation.NoteValidations
 import com.vladsch.flexmark.ext.gfm.tasklist.TaskListExtension
 import com.vladsch.flexmark.html.HtmlRenderer

simplenotes-domain/src/main/kotlin/usecases/repositories/NoteRepository.kt

@@ -1,9 +1,9 @@
 package be.simplenotes.domain.usecases.repositories
 
-import be.simplenotes.domain.model.ExportedNote
-import be.simplenotes.domain.model.Note
-import be.simplenotes.domain.model.PersistedNote
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.ExportedNote
+import be.simplenotes.types.Note
+import be.simplenotes.types.PersistedNote
+import be.simplenotes.types.PersistedNoteMetadata
 import java.util.*
 
 interface NoteRepository {

simplenotes-domain/src/main/kotlin/usecases/repositories/UserRepository.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.domain.usecases.repositories
 
-import be.simplenotes.domain.model.PersistedUser
-import be.simplenotes.domain.model.User
+import be.simplenotes.types.PersistedUser
+import be.simplenotes.types.User
 
 interface UserRepository {
     fun create(user: User): PersistedUser?

simplenotes-domain/src/main/kotlin/usecases/search/SearchUseCase.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.domain.usecases.search
 
-import be.simplenotes.domain.model.PersistedNote
-import be.simplenotes.domain.model.PersistedNoteMetadata
+import be.simplenotes.types.PersistedNote
+import be.simplenotes.types.PersistedNoteMetadata
 import java.util.*
 
 data class SearchTerms(val title: String?, val tag: String?, val content: String?, val all: String?)

simplenotes-domain/src/main/kotlin/usecases/users/register/RegisterUseCaseImpl.kt

@@ -3,7 +3,7 @@ package be.simplenotes.domain.usecases.users.register
 import arrow.core.Either
 import arrow.core.filterOrElse
 import arrow.core.leftIfNull
-import be.simplenotes.domain.model.PersistedUser
+import be.simplenotes.types.PersistedUser
 import be.simplenotes.domain.security.PasswordHash
 import be.simplenotes.domain.usecases.repositories.UserRepository
 import be.simplenotes.domain.validation.UserValidations

simplenotes-domain/src/main/kotlin/usecases/users/register/RegisterUsecase.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.domain.usecases.users.register
 
 import arrow.core.Either
-import be.simplenotes.domain.model.PersistedUser
+import be.simplenotes.types.PersistedUser
 import be.simplenotes.domain.usecases.users.login.LoginForm
 import io.konform.validation.ValidationErrors
 

simplenotes-domain/src/main/kotlin/validation/NoteValidations.kt

@@ -1,7 +1,7 @@
 package be.simplenotes.domain.validation
 
 import arrow.core.*
-import be.simplenotes.domain.model.NoteMetadata
+import be.simplenotes.types.NoteMetadata
 import be.simplenotes.domain.usecases.markdown.ValidationError
 import io.konform.validation.Validation
 import io.konform.validation.jsonschema.maxItems

simplenotes-domain/src/main/kotlin/validation/UserValidations.kt

@@ -3,7 +3,7 @@ package be.simplenotes.domain.validation
 import arrow.core.Either
 import arrow.core.left
 import arrow.core.right
-import be.simplenotes.domain.model.User
+import be.simplenotes.types.User
 import be.simplenotes.domain.usecases.users.delete.DeleteError
 import be.simplenotes.domain.usecases.users.delete.DeleteForm
 import be.simplenotes.domain.usecases.users.login.InvalidLoginForm

simplenotes-domain/src/test/kotlin/usecases/users/login/LoginUseCaseImplTest.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.domain.usecases.users.login
 
-import be.simplenotes.domain.model.PersistedUser
+import be.simplenotes.types.PersistedUser
 import be.simplenotes.domain.security.BcryptPasswordHash
 import be.simplenotes.domain.security.SimpleJwt
 import be.simplenotes.domain.usecases.repositories.UserRepository

simplenotes-domain/src/test/kotlin/usecases/users/register/RegisterUseCaseImplTest.kt

@@ -1,6 +1,6 @@
 package be.simplenotes.domain.usecases.users.register
 
-import be.simplenotes.domain.model.PersistedUser
+import be.simplenotes.types.PersistedUser
 import be.simplenotes.domain.security.BcryptPasswordHash
 import be.simplenotes.domain.usecases.repositories.UserRepository
 import be.simplenotes.shared.testutils.assertions.isLeftOfType