From 0aad691d2f781efb46102dcba2d93de4ff0d49bf Mon Sep 17 00:00:00 2001 From: 4mjeo <4mj.eo@dsm.hs.kr> Date: Sat, 21 Sep 2024 23:37:52 +0900 Subject: [PATCH 01/15] =?UTF-8?q?refactor:=20(#759)=20null=20=EB=B0=A9?= =?UTF-8?q?=EC=A7=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt b/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt index 00d49264a..1bde11e64 100644 --- a/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt +++ b/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt @@ -255,7 +255,7 @@ class ExcelAdapter : ParseFilePort, WriteFilePort, ExcelPort() { listOf( outingApplication.studentGcn, outingApplication.studentName, - outingApplication.reason, + outingApplication.reason ?: "", outingApplication.outingTime.toString(), outingApplication.arrivalTime.toString(), null, From b5d46afb0aa81772a42a5e7566ba3c6d969380ed Mon Sep 17 00:00:00 2001 From: 4mjeo <4mj.eo@dsm.hs.kr> Date: Sat, 21 Sep 2024 23:46:03 +0900 Subject: [PATCH 02/15] =?UTF-8?q?style:=20(#759)=20=EC=95=88=EC=93=B0?= =?UTF-8?q?=EB=8A=94=20import=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt index 0cdde9a56..326fe487c 100644 --- a/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt +++ b/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt @@ -1,7 +1,6 @@ package team.aliens.dms.domain.student.dto import com.fasterxml.jackson.annotation.JsonCreator -import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty import team.aliens.dms.domain.manager.spi.vo.StudentWithTag import team.aliens.dms.domain.student.model.Sex From 4b354e5c5202482e150d06c267e00b765ee81b04 Mon Sep 17 00:00:00 2001 From: 4mjeo <4mj.eo@dsm.hs.kr> Date: Sun, 22 Sep 2024 00:09:08 +0900 Subject: [PATCH 03/15] =?UTF-8?q?refactor:=20(#759)=20adapter=20null=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/outing/OutingApplicationPersistenceAdapter.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt index cd371ec5e..e043e95d1 100644 --- a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt +++ b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt @@ -65,8 +65,8 @@ class OutingApplicationPersistenceAdapter( studentJpaEntity.grade, studentJpaEntity.classRoom, studentJpaEntity.number, - outingApplicationJpaEntity.reason, - outingApplicationJpaEntity.reason, + outingApplicationJpaEntity.reason.coalesce(""), + outingApplicationJpaEntity.reason.coalesce(""), outingApplicationJpaEntity.outingDate, outingApplicationJpaEntity.outingTime, outingApplicationJpaEntity.arrivalTime, From b7f1c721c6567b9e71a2cd45892d96afb3d187b9 Mon Sep 17 00:00:00 2001 From: 4mjeo <4mj.eo@dsm.hs.kr> Date: Sat, 21 Sep 2024 23:37:52 +0900 Subject: [PATCH 04/15] =?UTF-8?q?refactor:=20(#759)=20null=20=EB=B0=A9?= =?UTF-8?q?=EC=A7=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt b/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt index 00d49264a..1bde11e64 100644 --- a/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt +++ b/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt @@ -255,7 +255,7 @@ class ExcelAdapter : ParseFilePort, WriteFilePort, ExcelPort() { listOf( outingApplication.studentGcn, outingApplication.studentName, - outingApplication.reason, + outingApplication.reason ?: "", outingApplication.outingTime.toString(), outingApplication.arrivalTime.toString(), null, From b9bdc4432c2f9b75e05c8621edef0ae32f27f64d Mon Sep 17 00:00:00 2001 From: 4mjeo <4mj.eo@dsm.hs.kr> Date: Sat, 21 Sep 2024 23:46:03 +0900 Subject: [PATCH 05/15] =?UTF-8?q?style:=20(#759)=20=EC=95=88=EC=93=B0?= =?UTF-8?q?=EB=8A=94=20import=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt index 0cdde9a56..326fe487c 100644 --- a/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt +++ b/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt @@ -1,7 +1,6 @@ package team.aliens.dms.domain.student.dto import com.fasterxml.jackson.annotation.JsonCreator -import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty import team.aliens.dms.domain.manager.spi.vo.StudentWithTag import team.aliens.dms.domain.student.model.Sex From 621d2b6f6f9c981260cc2fca6a9a40d4a68ecf48 Mon Sep 17 00:00:00 2001 From: 4mjeo <4mj.eo@dsm.hs.kr> Date: Sun, 22 Sep 2024 00:09:08 +0900 Subject: [PATCH 06/15] =?UTF-8?q?refactor:=20(#759)=20adapter=20null=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/outing/OutingApplicationPersistenceAdapter.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt index cd371ec5e..e043e95d1 100644 --- a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt +++ b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt @@ -65,8 +65,8 @@ class OutingApplicationPersistenceAdapter( studentJpaEntity.grade, studentJpaEntity.classRoom, studentJpaEntity.number, - outingApplicationJpaEntity.reason, - outingApplicationJpaEntity.reason, + outingApplicationJpaEntity.reason.coalesce(""), + outingApplicationJpaEntity.reason.coalesce(""), outingApplicationJpaEntity.outingDate, outingApplicationJpaEntity.outingTime, outingApplicationJpaEntity.arrivalTime, From 77b8f0eb81d97a325594e06e2eb3b1e92585747f Mon Sep 17 00:00:00 2001 From: 4mjeo <4mj.eo@dsm.hs.kr> Date: Sat, 21 Sep 2024 23:37:52 +0900 Subject: [PATCH 07/15] =?UTF-8?q?refactor:=20(#759)=20null=20=EB=B0=A9?= =?UTF-8?q?=EC=A7=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt b/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt index 00d49264a..1bde11e64 100644 --- a/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt +++ b/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/ExcelAdapter.kt @@ -255,7 +255,7 @@ class ExcelAdapter : ParseFilePort, WriteFilePort, ExcelPort() { listOf( outingApplication.studentGcn, outingApplication.studentName, - outingApplication.reason, + outingApplication.reason ?: "", outingApplication.outingTime.toString(), outingApplication.arrivalTime.toString(), null, From bd53221c65b522d0c42c9307e810e1990f487352 Mon Sep 17 00:00:00 2001 From: 4mjeo <4mj.eo@dsm.hs.kr> Date: Sat, 21 Sep 2024 23:46:03 +0900 Subject: [PATCH 08/15] =?UTF-8?q?style:=20(#759)=20=EC=95=88=EC=93=B0?= =?UTF-8?q?=EB=8A=94=20import=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt index 0cdde9a56..326fe487c 100644 --- a/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt +++ b/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt @@ -1,7 +1,6 @@ package team.aliens.dms.domain.student.dto import com.fasterxml.jackson.annotation.JsonCreator -import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty import team.aliens.dms.domain.manager.spi.vo.StudentWithTag import team.aliens.dms.domain.student.model.Sex From e38aca4101d5143afba0e1281b11938c87bfe2cb Mon Sep 17 00:00:00 2001 From: 4mjeo <4mj.eo@dsm.hs.kr> Date: Sun, 22 Sep 2024 00:09:08 +0900 Subject: [PATCH 09/15] =?UTF-8?q?refactor:=20(#759)=20adapter=20null=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/outing/OutingApplicationPersistenceAdapter.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt index cd371ec5e..e043e95d1 100644 --- a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt +++ b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt @@ -65,8 +65,8 @@ class OutingApplicationPersistenceAdapter( studentJpaEntity.grade, studentJpaEntity.classRoom, studentJpaEntity.number, - outingApplicationJpaEntity.reason, - outingApplicationJpaEntity.reason, + outingApplicationJpaEntity.reason.coalesce(""), + outingApplicationJpaEntity.reason.coalesce(""), outingApplicationJpaEntity.outingDate, outingApplicationJpaEntity.outingTime, outingApplicationJpaEntity.arrivalTime, From a1215e8a88c15cbab9878ceb15c1abd8dc88f53d Mon Sep 17 00:00:00 2001 From: "tae.y" <0211ilyoil@gmail.com> Date: Sun, 22 Sep 2024 11:37:26 +0900 Subject: [PATCH 10/15] =?UTF-8?q?chore:=20(#759)=20yml=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dms-infrastructure/src/main/resources/application-local.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dms-infrastructure/src/main/resources/application-local.yml b/dms-infrastructure/src/main/resources/application-local.yml index 3b226bef2..e19b651cc 100644 --- a/dms-infrastructure/src/main/resources/application-local.yml +++ b/dms-infrastructure/src/main/resources/application-local.yml @@ -12,4 +12,4 @@ spring: redis: host: ${REDIS_HOST:localhost} port: ${REDIS_PORT:6379} - password: ${REDIS_PASSWORD:1234} \ No newline at end of file + password: ${REDIS_PASSWORD:asdf} \ No newline at end of file From c47bc986fcb56f7ba2e599a316904ac960e9a70f Mon Sep 17 00:00:00 2001 From: 4mjeo <4mj.eo@dsm.hs.kr> Date: Sun, 22 Sep 2024 12:36:53 +0900 Subject: [PATCH 11/15] =?UTF-8?q?refactor:=20(#763)=20json=20=EC=97=AD?= =?UTF-8?q?=EC=A7=81=EB=A0=AC=ED=99=94=20=EB=AC=B8=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../team/aliens/dms/domain/tag/dto/TagResponse.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/tag/dto/TagResponse.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/tag/dto/TagResponse.kt index 12f19d5bb..7b55e1ba0 100644 --- a/dms-core/src/main/kotlin/team/aliens/dms/domain/tag/dto/TagResponse.kt +++ b/dms-core/src/main/kotlin/team/aliens/dms/domain/tag/dto/TagResponse.kt @@ -1,12 +1,15 @@ package team.aliens.dms.domain.tag.dto +import com.fasterxml.jackson.annotation.JsonCreator +import com.fasterxml.jackson.annotation.JsonProperty import team.aliens.dms.domain.tag.model.Tag import java.util.UUID -data class TagResponse( - val id: UUID, - val name: String?, - val color: String? + +data class TagResponse @JsonCreator constructor( + @JsonProperty("id") val id: UUID, + @JsonProperty("name") val name: String?, + @JsonProperty("color") val color: String? ) { companion object { fun of(tag: Tag): TagResponse { From c3a20862bdea2fcb5fe54b958e07c901d86a18eb Mon Sep 17 00:00:00 2001 From: "tae.y" <0211ilyoil@gmail.com> Date: Sun, 22 Sep 2024 12:41:51 +0900 Subject: [PATCH 12/15] =?UTF-8?q?fix:=20(#763)=20=EC=BA=90=EC=8B=9C=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildSrc/src/main/kotlin/Dependencies.kt | 2 - dms-infrastructure/build.gradle.kts | 2 - .../aliens/dms/global/config/CacheConfig.kt | 46 ------------------- .../dms/global/config/CustomKeyGenerator.kt | 21 --------- .../dms/domain/student/StudentWebAdapter.kt | 3 -- 5 files changed, 74 deletions(-) delete mode 100644 dms-persistence/src/main/kotlin/team/aliens/dms/global/config/CacheConfig.kt delete mode 100644 dms-persistence/src/main/kotlin/team/aliens/dms/global/config/CustomKeyGenerator.kt diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt index b8c182a73..4cd81d9b8 100644 --- a/buildSrc/src/main/kotlin/Dependencies.kt +++ b/buildSrc/src/main/kotlin/Dependencies.kt @@ -85,6 +85,4 @@ object Dependencies { // slack const val SLACK = "com.slack.api:slack-api-client:${DependencyVersions.SLACK_VERSION}" - - const val CACHE = "org.springframework.boot:spring-boot-starter-cache" } \ No newline at end of file diff --git a/dms-infrastructure/build.gradle.kts b/dms-infrastructure/build.gradle.kts index 51d9cba50..d35e27a98 100644 --- a/dms-infrastructure/build.gradle.kts +++ b/dms-infrastructure/build.gradle.kts @@ -60,8 +60,6 @@ dependencies { // notification implementation(Dependencies.FCM) - //cache - implementation(Dependencies.CACHE) } tasks.getByName("jar") { diff --git a/dms-persistence/src/main/kotlin/team/aliens/dms/global/config/CacheConfig.kt b/dms-persistence/src/main/kotlin/team/aliens/dms/global/config/CacheConfig.kt deleted file mode 100644 index c120cb843..000000000 --- a/dms-persistence/src/main/kotlin/team/aliens/dms/global/config/CacheConfig.kt +++ /dev/null @@ -1,46 +0,0 @@ -package team.aliens.dms.global.config - -import org.springframework.boot.autoconfigure.cache.RedisCacheManagerBuilderCustomizer -import org.springframework.cache.CacheManager -import org.springframework.cache.annotation.EnableCaching -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration -import org.springframework.data.redis.cache.RedisCacheConfiguration -import org.springframework.data.redis.cache.RedisCacheManager -import org.springframework.data.redis.connection.RedisConnectionFactory -import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer -import org.springframework.data.redis.serializer.RedisSerializationContext -import org.springframework.data.redis.serializer.StringRedisSerializer -import java.time.Duration - -@Configuration -@EnableCaching -class CacheConfig { - @Bean - fun cacheManager(redisConnectionFactory: RedisConnectionFactory): CacheManager { - val redisCacheConfiguration: RedisCacheConfiguration = RedisCacheConfiguration.defaultCacheConfig() - .entryTtl(Duration.ofMinutes(30)) - .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(StringRedisSerializer())) - .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(GenericJackson2JsonRedisSerializer())) - - return RedisCacheManager.RedisCacheManagerBuilder - .fromConnectionFactory(redisConnectionFactory) - .cacheDefaults(redisCacheConfiguration) - .build() - } - - // 캐시를 구분하기 위해 존재함 - @Bean - fun redisCacheManagerBuilderCustomizer(): RedisCacheManagerBuilderCustomizer { - return RedisCacheManagerBuilderCustomizer { builder: RedisCacheManager.RedisCacheManagerBuilder -> - builder - .withCacheConfiguration( - "student", - RedisCacheConfiguration.defaultCacheConfig() - .entryTtl(Duration.ofMinutes(10)) - .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(StringRedisSerializer())) - .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(GenericJackson2JsonRedisSerializer())) - ) - } - } -} diff --git a/dms-persistence/src/main/kotlin/team/aliens/dms/global/config/CustomKeyGenerator.kt b/dms-persistence/src/main/kotlin/team/aliens/dms/global/config/CustomKeyGenerator.kt deleted file mode 100644 index 30264b212..000000000 --- a/dms-persistence/src/main/kotlin/team/aliens/dms/global/config/CustomKeyGenerator.kt +++ /dev/null @@ -1,21 +0,0 @@ -package team.aliens.dms.global.config - -import org.springframework.cache.interceptor.KeyGenerator -import org.springframework.cache.interceptor.SimpleKeyGenerator -import org.springframework.context.annotation.Bean -import org.springframework.context.annotation.Configuration -import java.lang.reflect.Method - -@Configuration -class CustomKeyGenerator : KeyGenerator { - - // 메서드 명을 사용해 key를 만들어준다. - override fun generate(target: Any, method: Method, vararg params: Any): Any { - return method.name + SimpleKeyGenerator.generateKey(*params) - } - - @Bean - fun keyGenerator(): KeyGenerator { - return CustomKeyGenerator() - } -} diff --git a/dms-presentation/src/main/kotlin/team/aliens/dms/domain/student/StudentWebAdapter.kt b/dms-presentation/src/main/kotlin/team/aliens/dms/domain/student/StudentWebAdapter.kt index 293b45b41..14a123e2a 100644 --- a/dms-presentation/src/main/kotlin/team/aliens/dms/domain/student/StudentWebAdapter.kt +++ b/dms-presentation/src/main/kotlin/team/aliens/dms/domain/student/StudentWebAdapter.kt @@ -5,9 +5,6 @@ import jakarta.validation.Valid import jakarta.validation.constraints.Email import jakarta.validation.constraints.NotBlank import jakarta.validation.constraints.NotNull -import org.springframework.cache.annotation.CacheConfig -import org.springframework.cache.annotation.CacheEvict -import org.springframework.cache.annotation.Cacheable import org.springframework.http.HttpStatus import org.springframework.validation.annotation.Validated import org.springframework.web.bind.annotation.DeleteMapping From dfbbf1b08530229e5f5620d9e16d974bd952b1ca Mon Sep 17 00:00:00 2001 From: 4mjeo <4mj.eo@dsm.hs.kr> Date: Sun, 22 Sep 2024 13:00:55 +0900 Subject: [PATCH 13/15] =?UTF-8?q?refactor:=20(#763)=20=EC=A7=81=EB=A0=AC?= =?UTF-8?q?=ED=99=94=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dms/domain/student/dto/StudentResponse.kt | 25 ++++++++----------- .../aliens/dms/domain/tag/dto/TagResponse.kt | 10 +++----- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt index 0cdde9a56..43167b2e6 100644 --- a/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt +++ b/dms-core/src/main/kotlin/team/aliens/dms/domain/student/dto/StudentResponse.kt @@ -1,8 +1,5 @@ package team.aliens.dms.domain.student.dto -import com.fasterxml.jackson.annotation.JsonCreator -import com.fasterxml.jackson.annotation.JsonIgnoreProperties -import com.fasterxml.jackson.annotation.JsonProperty import team.aliens.dms.domain.manager.spi.vo.StudentWithTag import team.aliens.dms.domain.student.model.Sex import team.aliens.dms.domain.student.model.Student @@ -49,17 +46,17 @@ data class StudentNameResponse( val name: String ) -data class StudentDetailsResponse @JsonCreator constructor( - @JsonProperty("id") val id: UUID, - @JsonProperty("name") val name: String, - @JsonProperty("gcn") val gcn: String, - @JsonProperty("profileImageUrl") val profileImageUrl: String, - @JsonProperty("sex") val sex: Sex? = null, - @JsonProperty("bonusPoint") val bonusPoint: Int? = null, - @JsonProperty("minusPoint") val minusPoint: Int? = null, - @JsonProperty("roomNumber") val roomNumber: String? = null, - @JsonProperty("roomMates") val roomMates: List? = null, - @JsonProperty("tags") val tags: List? = null +data class StudentDetailsResponse( + val id: UUID, + val name: String, + val gcn: String, + val profileImageUrl: String, + val sex: Sex? = null, + val bonusPoint: Int? = null, + val minusPoint: Int? = null, + val roomNumber: String? = null, + val roomMates: List? = null, + val tags: List? = null ) { data class RoomMate( val id: UUID, diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/tag/dto/TagResponse.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/tag/dto/TagResponse.kt index 7b55e1ba0..829ff7cd9 100644 --- a/dms-core/src/main/kotlin/team/aliens/dms/domain/tag/dto/TagResponse.kt +++ b/dms-core/src/main/kotlin/team/aliens/dms/domain/tag/dto/TagResponse.kt @@ -1,15 +1,13 @@ package team.aliens.dms.domain.tag.dto -import com.fasterxml.jackson.annotation.JsonCreator -import com.fasterxml.jackson.annotation.JsonProperty import team.aliens.dms.domain.tag.model.Tag import java.util.UUID -data class TagResponse @JsonCreator constructor( - @JsonProperty("id") val id: UUID, - @JsonProperty("name") val name: String?, - @JsonProperty("color") val color: String? +data class TagResponse( + val id: UUID, + val name: String?, + val color: String? ) { companion object { fun of(tag: Tag): TagResponse { From 4ca7177f5325ee566ec6a50ec52a95c002a6eb18 Mon Sep 17 00:00:00 2001 From: 4mjeo <4mj.eo@dsm.hs.kr> Date: Sun, 22 Sep 2024 13:48:17 +0900 Subject: [PATCH 14/15] =?UTF-8?q?refactor:=20(#759)=20reason=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20nullable=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aliens/dms/domain/outing/spi/vo/OutingApplicationVO.kt | 2 +- .../persistence/outing/OutingApplicationPersistenceAdapter.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/vo/OutingApplicationVO.kt b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/vo/OutingApplicationVO.kt index 49895bde2..0912b5325 100644 --- a/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/vo/OutingApplicationVO.kt +++ b/dms-core/src/main/kotlin/team/aliens/dms/domain/outing/spi/vo/OutingApplicationVO.kt @@ -9,7 +9,7 @@ open class OutingApplicationVO( val studentGrade: Int, val studentClassRoom: Int, val studentNumber: Int, - val reason: String, + val reason: String?, val outingType: String, val outingDate: LocalDate, val outingTime: LocalTime, diff --git a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt index e043e95d1..cd371ec5e 100644 --- a/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt +++ b/dms-persistence/src/main/kotlin/team/aliens/dms/persistence/outing/OutingApplicationPersistenceAdapter.kt @@ -65,8 +65,8 @@ class OutingApplicationPersistenceAdapter( studentJpaEntity.grade, studentJpaEntity.classRoom, studentJpaEntity.number, - outingApplicationJpaEntity.reason.coalesce(""), - outingApplicationJpaEntity.reason.coalesce(""), + outingApplicationJpaEntity.reason, + outingApplicationJpaEntity.reason, outingApplicationJpaEntity.outingDate, outingApplicationJpaEntity.outingTime, outingApplicationJpaEntity.arrivalTime, From 9a7fd082197077ab815d9f5213fcb8a304a8bfb8 Mon Sep 17 00:00:00 2001 From: "tae.y" <0211ilyoil@gmail.com> Date: Sun, 22 Sep 2024 14:34:37 +0900 Subject: [PATCH 15/15] =?UTF-8?q?ref:=20(#765)=20=EC=97=91=EC=85=80=20?= =?UTF-8?q?=EB=84=88=EB=B9=84=20=EC=A6=9D=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/team/aliens/dms/thirdparty/parser/port/ExcelPort.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/port/ExcelPort.kt b/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/port/ExcelPort.kt index 05b701b0c..13151614d 100644 --- a/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/port/ExcelPort.kt +++ b/dms-infrastructure/src/main/kotlin/team/aliens/dms/thirdparty/parser/port/ExcelPort.kt @@ -139,7 +139,7 @@ open class ExcelPort { .map { autoSizeColumn(it) val width = getColumnWidth(it) - setColumnWidth(it, ((width * 1.3) - 50).toInt()) + setColumnWidth(it, ((width * 1.3) + 120).toInt()) } } }