TouchInstinct
/
Backend-common
305
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename Model -> Entity

This commit is contained in:
Alexander Buntakov 2021-06-10 20:12:09 +03:00
parent 3cb78ce44d
commit 8f450aeff7
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/AbstractSettingModel.kt → settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/AbstractSettingEntity.kt
View File

@ -5,7 +5,7 @@ import javax.persistence.Id
import javax.persistence.MappedSuperclass
@MappedSuperclass
open class AbstractSettingModel: AuditableEntity() {
open class AbstractSettingEntity: AuditableEntity() {
@Id
lateinit var key: String

2
settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/SystemSettingModel.kt → settings-spring-jpa/src/main/kotlin/ru/touchin/settings/models/SystemSettingEntity.kt
View File

@ -6,4 +6,4 @@ import javax.persistence.Table
@Entity
@Table(name = "system_settings", schema = SCHEMA)
class SystemSettingModel : AbstractSettingModel()
class SystemSettingEntity : AbstractSettingEntity()

6
settings-spring-jpa/src/main/kotlin/ru/touchin/settings/repositories/SystemSettingsRepository.kt
View File

@ -3,11 +3,11 @@ package ru.touchin.settings.repositories
import org.springframework.data.jpa.repository.JpaRepository
import org.springframework.data.repository.findByIdOrNull
import ru.touchin.settings.exceptions.SettingNotFoundException
import ru.touchin.settings.models.SystemSettingModel
import ru.touchin.settings.models.SystemSettingEntity
interface SystemSettingsRepository: JpaRepository<SystemSettingModel, String>
interface SystemSettingsRepository: JpaRepository<SystemSettingEntity, String>
fun SystemSettingsRepository.findByIdOrThrow(key: String): SystemSettingModel {
fun SystemSettingsRepository.findByIdOrThrow(key: String): SystemSettingEntity {
return findByIdOrNull(key)
?: throw SettingNotFoundException(key)
}

6
settings-spring-jpa/src/main/kotlin/ru/touchin/settings/services/SystemSettingsServiceImpl.kt
View File

@ -9,7 +9,7 @@ import org.springframework.transaction.annotation.Transactional
import ru.touchin.settings.annotations.SettingMapper
import ru.touchin.settings.dto.SystemSetting
import ru.touchin.settings.exceptions.CannotParseSettingValueException
import ru.touchin.settings.models.SystemSettingModel
import ru.touchin.settings.models.SystemSettingEntity
import ru.touchin.settings.repositories.SystemSettingsRepository
import ru.touchin.settings.repositories.findByIdOrThrow
@ -23,7 +23,7 @@ class SystemSettingsServiceImpl(
@Transactional
override fun <T> save(setting: SystemSetting<T>): SystemSetting<T> {
val settingModel = systemSettingsRepository.findByIdOrNull(setting.key)
?: SystemSettingModel().apply {
?: SystemSettingEntity().apply {
key = setting.key
}
@ -34,7 +34,7 @@ class SystemSettingsServiceImpl(
return setting
}
private fun <T> createSetting(model: SystemSettingModel, clazz: Class<T>): SystemSetting<T> {
private fun <T> createSetting(model: SystemSettingEntity, clazz: Class<T>): SystemSetting<T> {
val value = kotlin
.runCatching {
settingsObjectMapper.readValue(model.value, clazz)

4
settings-spring-jpa/src/test/kotlin/ru/touchin/settings/repositories/SystemSettingRepositoryTest.kt
View File

@ -8,7 +8,7 @@ import org.mockito.internal.matchers.apachecommons.ReflectionEquals
import org.springframework.beans.factory.annotation.Autowired
import ru.touchin.common.spring.test.jpa.repository.RepositoryTest
import ru.touchin.settings.exceptions.SettingNotFoundException
import ru.touchin.settings.models.SystemSettingModel
import ru.touchin.settings.models.SystemSettingEntity
import javax.persistence.EntityManager
@RepositoryTest
@ -23,7 +23,7 @@ internal class SystemSettingRepositoryTest {
@Test
@DisplayName("Настройки должны сохраняться в базе")
fun shouldBeSaved() {
val setting = SystemSettingModel()
val setting = SystemSettingEntity()
.apply {
key = "max.threads"
value = "5"

4
settings-spring-jpa/src/test/kotlin/ru/touchin/settings/services/SystemSettingsServiceImplDeserializationTest.kt
View File

@ -15,7 +15,7 @@ import org.springframework.boot.test.context.SpringBootTest
import org.springframework.test.context.ActiveProfiles
import ru.touchin.settings.annotations.SettingMapper
import ru.touchin.settings.dto.SystemSetting
import ru.touchin.settings.models.SystemSettingModel
import ru.touchin.settings.models.SystemSettingEntity
import ru.touchin.settings.repositories.SystemSettingsRepository
import java.util.*
import javax.annotation.PostConstruct
@ -50,7 +50,7 @@ internal class SystemSettingsServiceImplDeserializationTest {
assertTrue(ReflectionEquals(e).matches(a))
}) {
doReturn(
Optional.of(SystemSettingModel().apply {
Optional.of(SystemSettingEntity().apply {
key = systemSetting.key
value = serializedValue
})

6
settings-spring-jpa/src/test/kotlin/ru/touchin/settings/services/SystemSettingsServiceImplSerializationTest.kt
View File

@ -14,7 +14,7 @@ import org.springframework.boot.test.context.SpringBootTest
import org.springframework.test.context.ActiveProfiles
import ru.touchin.settings.annotations.SettingMapper
import ru.touchin.settings.dto.SystemSetting
import ru.touchin.settings.models.SystemSettingModel
import ru.touchin.settings.models.SystemSettingEntity
import ru.touchin.settings.repositories.SystemSettingsRepository
import java.util.*
import javax.annotation.PostConstruct
@ -43,8 +43,8 @@ internal class SystemSettingsServiceImplSerializationTest {
private fun check(systemSetting: SystemSetting<*>, serializedValue: String) {
doReturn(Optional.empty<SystemSettingModel>()).`when`(systemSettingsRepository).findById(any())
doAnswer { it.getArgument(0) as SystemSettingModel }.`when`(systemSettingsRepository).save(any())
doReturn(Optional.empty<SystemSettingEntity>()).`when`(systemSettingsRepository).findById(any())
doAnswer { it.getArgument(0) as SystemSettingEntity }.`when`(systemSettingsRepository).save(any())
systemSettingsService.save(systemSetting)