#86 - 사용자의 기본 프로필을 설정 및 차단된 유저의 프로필을 설정한다

app/src/main/kotlin/com/wespot/config/TimeZoneConfig.kt

@@ -0,0 +1,17 @@
+package com.wespot.config
+
+import jakarta.annotation.PostConstruct
+import org.springframework.context.annotation.Configuration
+import org.springframework.context.annotation.Profile
+import java.util.*
+
+@Configuration
+@Profile("!local")
+class TimeZoneConfig {
+
+ @PostConstruct
+ fun timeZoneSetUp() {
+ TimeZone.setDefault(TimeZone.getTimeZone("Asia/Seoul"))
+ }
+
+}

app/src/main/kotlin/com/wespot/user/BlockedUserController.kt

@@ -3,7 +3,6 @@ package com.wespot.user
 import com.wespot.user.dto.response.BlockedUserResponse
 import com.wespot.user.port.`in`.BlockedUserUseCase
 import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.DeleteMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.RequestMapping

app/src/test/kotlin/com/wespot/auth/fixture/AuthFixture.kt

@@ -6,6 +6,7 @@ import com.wespot.auth.dto.request.SignUpRequest
 import com.wespot.auth.dto.request.ConsentsRequest
 import com.wespot.auth.dto.response.TokenResponse
 import com.wespot.user.ConsentType
+import com.wespot.user.Gender
 import com.wespot.user.User
 import com.wespot.user.fixture.UserFixture
 
@@ -15,7 +16,7 @@ object AuthFixture {
  return SignUpRequest(
  signUpToken = "signUpToken",
  name = "Test User",
- gender = "male",
+ gender = Gender.MALE,
  consents = ConsentsRequest(
  marketing = true
  ),

app/src/test/kotlin/com/wespot/common/infra/TestContainer.kt

@@ -1,24 +1,30 @@
 package com.wespot.common.infra
 
 import org.springframework.boot.test.context.TestConfiguration
+import org.springframework.context.annotation.Bean
+import org.springframework.jdbc.datasource.init.DataSourceInitializer
 import org.testcontainers.containers.GenericContainer
 import org.testcontainers.utility.DockerImageName
+import javax.sql.DataSource
+
 
 @TestConfiguration
 class TestContainer {
 
  companion object {
  private const val REDIS_DOCKER_IMAGE: String = "redis:7.0.8-alpine"
 
- init {
- val REDIS_CONTAINER = GenericContainer(DockerImageName.parse(REDIS_DOCKER_IMAGE))
- .withExposedPorts(6379)
- .withReuse(true)
+ private val REDIS_CONTAINER = GenericContainer(DockerImageName.parse(REDIS_DOCKER_IMAGE))
+ .withExposedPorts(6379)
+ .withReuse(true)
 
+ init {
  REDIS_CONTAINER.start()
 
- System.setProperty("spring.data.redis.host", REDIS_CONTAINER.getHost())
+ System.setProperty("spring.data.redis.host", REDIS_CONTAINER.host)
  System.setProperty("spring.data.redis.port", REDIS_CONTAINER.getMappedPort(6379).toString())
  }
+
  }
+
 }

app/src/test/kotlin/com/wespot/common/presentation/IntegrationTest.kt

@@ -15,16 +15,17 @@ class IntegrationTest {
  private var port: Int? = null
 
  @Autowired
- private var databaseCleanup: DatabaseCleanup? = null
+ private lateinit var databaseCleanup: DatabaseCleanup
 
  @BeforeEach
  fun setUp() {
  RestAssured.port = port!!
+ databaseCleanup.execute()
  }
 
  @AfterEach
  fun tearDown() {
- databaseCleanup!!.execute()
+ databaseCleanup.execute()
  }
 
 }

app/src/test/kotlin/com/wespot/common/service/ServiceTest.kt

@@ -3,6 +3,7 @@ package com.wespot.common.service
 import com.wespot.DatabaseCleanup
 import com.wespot.common.infra.TestContainer
 import org.junit.jupiter.api.AfterEach
+import org.junit.jupiter.api.BeforeEach
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.context.annotation.Import
@@ -12,7 +13,7 @@ import org.springframework.context.annotation.Import
 class ServiceTest {
 
  @Autowired
- private lateinit var databaseCleanup: DatabaseCleanup
+ lateinit var databaseCleanup: DatabaseCleanup
 
  @AfterEach
  fun tearDown() {

app/src/test/kotlin/com/wespot/message/service/GetMessageServiceTest.kt

@@ -3,15 +3,13 @@ package com.wespot.message.service
 import com.wespot.auth.service.SecurityUtils
 import com.wespot.message.Message
 import com.wespot.message.MessageTimeValidator
-import com.wespot.message.MessageType
 import com.wespot.message.dto.response.*
 import com.wespot.message.fixture.MessageFixture
 import com.wespot.message.port.out.MessagePort
 import com.wespot.school.School
 import com.wespot.school.SchoolType
 import com.wespot.school.fixture.SchoolFixture
 import com.wespot.school.port.out.SchoolPort
-import com.wespot.user.Profile
 import com.wespot.user.User
 import com.wespot.user.fixture.BlockedUserFixture
 import com.wespot.user.fixture.UserFixture

app/src/test/kotlin/com/wespot/notification/domain/vote/ReceivedVoteNotificationServiceTest.kt

@@ -2,6 +2,7 @@ package com.wespot.notification.domain.vote
 
 import com.wespot.notification.NotificationType
 import com.wespot.notification.vote.ReceivedVoteNotificationService
+import com.wespot.user.Gender
 import io.kotest.core.spec.style.BehaviorSpec
 import io.kotest.matchers.shouldBe
 import java.time.LocalDate
@@ -11,7 +12,7 @@ class ReceivedVoteNotificationServiceTest : BehaviorSpec({
  given("남학생이 투표를 완료했을 때") {
  val service = ReceivedVoteNotificationService()
  `when`("투표를 받은이에게") {
- val notification = service.getNotification(100L, "female")
+ val notification = service.getNotification(100L, Gender.FEMALE)
  then("알림이 발송된다.") {
  notification.userId shouldBe 100L
  notification.type shouldBe NotificationType.VOTE_RECEIVED
@@ -26,7 +27,7 @@ class ReceivedVoteNotificationServiceTest : BehaviorSpec({
  given("여학생이 투표를 완료했을 때") {
  val service = ReceivedVoteNotificationService()
  `when`("투표를 받은이에게") {
- val notification = service.getNotification(100L, "male")
+ val notification = service.getNotification(100L, Gender.MALE)
  then("알림이 발송된다.") {
  notification.userId shouldBe 100L
  notification.type shouldBe NotificationType.VOTE_RECEIVED

app/src/test/kotlin/com/wespot/report/service/SavedReportServiceTest.kt

@@ -23,7 +23,6 @@ class SavedReportServiceTest @Autowired constructor(
  private val userJpaRepository: UserJpaRepository,
  private val messageJpaRepository: MessageJpaRepository,
  private val reportJpaRepository: ReportJpaRepository,
- private val restrictionJpaRepository: RestrictionJpaRepository
 ) : ServiceTest() {
 
  @Test

app/src/test/kotlin/com/wespot/user/fixture/UserFixture.kt

@@ -13,6 +13,7 @@ import com.wespot.user.SocialType
 import com.wespot.user.User
 import com.wespot.user.UserConsent
 import com.wespot.user.UserIntroduction
+import com.wespot.user.Gender
 import com.wespot.user.dto.request.UpdateProfileRequest
 import org.springframework.security.authentication.TestingAuthenticationToken
 import org.springframework.security.core.context.SecurityContextHolder
@@ -29,7 +30,7 @@ object UserFixture {
  role = Role.USER,
  name = "TestUser",
  introduction = UserIntroduction.from("hello"),
- gender = "male",
+ gender = Gender.MALE,
  schoolId = 1L,
  grade = 1,
  classNumber = 1,
@@ -64,7 +65,7 @@ object UserFixture {
  role = Role.USER,
  name = "TestUser",
  introduction = UserIntroduction.from("hello"),
- gender = "male",
+ gender = Gender.MALE,
  schoolId = 1L,
  grade = 1,
  classNumber = 1,
@@ -98,7 +99,7 @@ object UserFixture {
  role = Role.USER,
  name = "Sender",
  introduction = UserIntroduction.from("intro"),
- gender = "M",
+ gender = Gender.MALE,
  schoolId = 1L,
  grade = 1,
  classNumber = 1,
@@ -132,7 +133,7 @@ object UserFixture {
  role = Role.USER,
  name = "Receiver",
  introduction = UserIntroduction.from("intro"),
- gender = "M",
+ gender = Gender.MALE,
  schoolId = 1L,
  grade = 1,
  classNumber = 1,
@@ -189,7 +190,7 @@ object UserFixture {
  password = "password",
  name = name,
  introduction = UserIntroduction.from("소개 $id"),
- gender = "M",
+ gender = Gender.MALE,
  schoolId = schoolId,
  profile = Profile(profileId, "", ""),
  fcm = null,
@@ -227,7 +228,7 @@ object UserFixture {
  role = Role.USER,
  name = "TestUser",
  introduction = UserIntroduction.from("hello"),
- gender = "male",
+ gender = Gender.MALE,
  schoolId = schoolId,
  grade = grade,
  classNumber = classNumber,
@@ -264,7 +265,7 @@ object UserFixture {
  role = Role.USER,
  name = "TestUser",
  introduction = UserIntroduction.from("hello"),
- gender = "male",
+ gender = Gender.MALE,
  schoolId = schoolId,
  grade = grade,
  classNumber = classNumber,
@@ -301,7 +302,7 @@ object UserFixture {
  role = Role.USER,
  name = "TestUser",
  introduction = UserIntroduction.from("hello"),
- gender = "male",
+ gender = Gender.MALE,
  schoolId = schoolId,
  grade = grade,
  classNumber = classNumber,

app/src/test/kotlin/com/wespot/user/service/UserServiceTest.kt

@@ -77,23 +77,26 @@ class UserServiceTest : BehaviorSpec({
  val profileRequest = UserFixture.updateProfileRequest()
 
  every { getLoginUser(userPort) } returns user
- every { user.updateProfile(any()) } returns user.copy(
- introduction = UserIntroduction.from(profileRequest.introduction)
- )
- every { profile.update(any(), any()) } returns profile.copy(
- backgroundColor = profileRequest.profile.backgroundColor,
- iconUrl = profileRequest.profile.iconUrl
- )
+ every { user.updateProfile(any()) } answers {
+ user.copy(
+ introduction = profileRequest.introduction?.let { UserIntroduction.from(it) } ?: user.introduction,
+ profile = profile.copy(
+ backgroundColor = profileRequest.profile?.backgroundColor ?: user.profile.backgroundColor,
+ iconUrl = profileRequest.profile?.iconUrl ?: user.profile.iconUrl
+ )
+ )
+ }
  every { profilePort.save(any()) } returns profile
  every { userPort.save(any()) } returns user
 
  userService.updateProfile(profileRequest)
 
  then("프로필이 업데이트 되어야 한다") {
  user.introduction.introduction shouldBe profileRequest.introduction
- user.profile.backgroundColor shouldBe profileRequest.profile.backgroundColor
- user.profile.iconUrl shouldBe profileRequest.profile.iconUrl
+ user.profile.backgroundColor shouldBe profileRequest.profile?.backgroundColor
+ user.profile.iconUrl shouldBe profileRequest.profile?.iconUrl
  }
  }
+
  }
 })

app/src/test/kotlin/com/wespot/vote/service/CreatedVoteServiceTest.kt

@@ -145,6 +145,28 @@ class CreatedVoteServiceTest @Autowired constructor(
  votes[0].voteNumber shouldBe 0
  }
 
+ @Test
+ fun `학급에 처음으로 가입하지 않는 경우 투표를 더 이상 생성하지 않는다`() {
+ // given
+ userJpaRepository.deleteAll()
+ val savedUserJpaEntity1 = userJpaRepository.save(UserMapper.mapToJpaEntity(users[0]))
+ val savedUserJpaEntity2 = userJpaRepository.save(UserMapper.mapToJpaEntity(users[1]))
+ val savedUserDomainEntity1 = UserMapper.mapToDomainEntity(savedUserJpaEntity1)
+ val savedUserDomainEntity2 = UserMapper.mapToDomainEntity(savedUserJpaEntity2)
+
+ // when
+ createdVoteService.createVoteByUser(savedUserDomainEntity1)
+ createdVoteService.createVoteByUser(savedUserDomainEntity2)
+ val votes = voteJpaRepository.findAll()
+
+ // then
+ votes.size shouldBe 1
+ votes[0].schoolId shouldBe savedUserDomainEntity1.schoolId
+ votes[0].grade shouldBe savedUserDomainEntity1.grade
+ votes[0].classNumber shouldBe savedUserDomainEntity1.classNumber
+ votes[0].voteNumber shouldBe 0
+ }
+
  @Test
  fun `가입하지 않은 유저가 투표 생성을 요청할 경우 예외가 발생한다`() {
  // given when

app/src/test/kotlin/com/wespot/vote/service/ReceivedVoteServiceTest.kt

@@ -1,5 +1,6 @@
 package com.wespot.vote.service
 
+import com.wespot.DatabaseCleanup
 import com.wespot.common.service.ServiceTest
 import com.wespot.user.entity.UserJpaEntity
 import com.wespot.user.fixture.UserFixture

app/src/test/kotlin/com/wespot/vote/service/SavedVoteServiceTest.kt

@@ -1,5 +1,6 @@
 package com.wespot.vote.service
 
+import com.wespot.DatabaseCleanup
 import com.wespot.common.service.ServiceTest
 import com.wespot.notification.port.out.NotificationPort
 import com.wespot.user.entity.UserJpaEntity

app/src/test/kotlin/com/wespot/vote/service/SentVoteServiceTest.kt

@@ -1,5 +1,6 @@
 package com.wespot.vote.service
 
+import com.wespot.DatabaseCleanup
 import com.wespot.common.service.ServiceTest
 import com.wespot.user.entity.UserJpaEntity
 import com.wespot.user.fixture.UserFixture

app/src/test/kotlin/com/wespot/vote/service/VoteRankServiceTest.kt

@@ -1,5 +1,6 @@
 package com.wespot.vote.service
 
+import com.wespot.DatabaseCleanup
 import com.wespot.common.service.ServiceTest
 import com.wespot.user.entity.UserJpaEntity
 import com.wespot.user.fixture.UserFixture

core/src/main/kotlin/com/wespot/auth/dto/request/ProfileRequest.kt

@@ -1,6 +1,6 @@
 package com.wespot.auth.dto.request
 
 data class ProfileRequest(
- val backgroundColor: String,
- val iconUrl: String,
+ val backgroundColor: String?,
+ val iconUrl: String?,
 )

core/src/main/kotlin/com/wespot/auth/dto/request/SignUpRequest.kt

@@ -1,8 +1,10 @@
 package com.wespot.auth.dto.request
 
+import com.wespot.user.Gender
+
 data class SignUpRequest(
  val name: String,
- val gender: String,
+ val gender: Gender,
  val schoolId: Long,
  val grade: Int,
  val classNumber: Int,

core/src/main/kotlin/com/wespot/message/dto/response/MessageBlockedListResponse.kt

@@ -2,14 +2,16 @@ package com.wespot.message.dto.response
 
 data class MessageBlockedListResponse(
  val messages: List<MessageBlockedResponse>,
- val hasNext: Boolean
+ val hasNext: Boolean,
+ val lastCursorId: Long,
 ) {
  companion object {
 
  fun from(messages: List<MessageBlockedResponse>, hasNext: Boolean): MessageBlockedListResponse {
  return MessageBlockedListResponse(
  messages = messages,
- hasNext = hasNext
+ hasNext = hasNext,
+ lastCursorId = messages.lastOrNull()?.id ?: 0L
  )
  }