hubert/SimpleNotes
1
0
Fork 0
Code Projects Releases Activity

Format

Browse Source
This commit is contained in:
Hubert Van De Walle
2020-11-03 18:20:12 +01:00
parent b1478fd154
commit 11caff1634
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simplenotes-config/src/main/kotlin/be/simplenotes/config/Config.kt
-1
View File
@@ -3,7 +3,6 @@ package be.simplenotes.config
import io.micronaut.context.annotation.ConfigurationInject import io.micronaut.context.annotation.ConfigurationInject
import io.micronaut.context.annotation.ConfigurationProperties import io.micronaut.context.annotation.ConfigurationProperties
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
import javax.inject.Singleton
@ConfigurationProperties("db") @ConfigurationProperties("db")
data class DataSourceConfig @ConfigurationInject constructor( data class DataSourceConfig @ConfigurationInject constructor(
simplenotes-domain/src/main/kotlin/be/simplenotes/domain/usecases/NoteService.kt
+5 -1
View File
@@ -36,7 +36,11 @@ class NoteService(
persistedNote persistedNote
} }
fun update(user: LoggedInUser, uuid: UUID, markdownText: String) = either.eager<MarkdownParsingError, PersistedNote?> { fun update(
user: LoggedInUser,
uuid: UUID,
markdownText: String,
) = either.eager<MarkdownParsingError, PersistedNote?> {
val persistedNote = !markdownConverter.renderDocument(markdownText) val persistedNote = !markdownConverter.renderDocument(markdownText)
.map { it.copy(html = htmlSanitizer.sanitize(user, it.html)) } .map { it.copy(html = htmlSanitizer.sanitize(user, it.html)) }
.map { Note(it.metadata, markdown = markdownText, html = it.html) } .map { Note(it.metadata, markdown = markdownText, html = it.html) }
simplenotes-persistance/src/main/kotlin/be/simplenotes/persistance/PersistanceModule.kt
-3
View File
@@ -1,14 +1,11 @@
package be.simplenotes.persistance package be.simplenotes.persistance
import be.simplenotes.config.DataSourceConfig import be.simplenotes.config.DataSourceConfig
import be.simplenotes.persistance.converters.NoteConverter
import be.simplenotes.persistance.converters.UserConverter
import com.zaxxer.hikari.HikariConfig import com.zaxxer.hikari.HikariConfig
import com.zaxxer.hikari.HikariDataSource import com.zaxxer.hikari.HikariDataSource
import io.micronaut.context.annotation.Bean import io.micronaut.context.annotation.Bean
import io.micronaut.context.annotation.Factory import io.micronaut.context.annotation.Factory
import me.liuwj.ktorm.database.Database import me.liuwj.ktorm.database.Database
import org.mapstruct.factory.Mappers
import javax.inject.Singleton import javax.inject.Singleton
import javax.sql.DataSource import javax.sql.DataSource