Skip to content

Commit

Permalink
Cealnup codes
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkSpace
mkSpace committed Mar 27, 2024
1 parent bd8d3ec commit d86c7fb
Show file tree
Hide file tree
Showing 12 changed files with 125 additions and 100 deletions.
1 change: 0 additions & 1 deletion ...n/kotlin/com/whatever/raisedragon/applicationservice/betting/BettingApplicationService.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.whatever.raisedragon.applicationservice.betting

import com.whatever.raisedragon.applicationservice.betting.dto.BettingCreateServiceRequest
import com.whatever.raisedragon.applicationservice.betting.dto.BettingCreateUpdateResponse
import com.whatever.raisedragon.applicationservice.betting.dto.BettingRetrieveResponse
import com.whatever.raisedragon.applicationservice.betting.dto.BettingUpdateServiceRequest
import com.whatever.raisedragon.common.exception.BaseException
Expand Down
3 changes: 2 additions & 1 deletion ...rc/main/kotlin/com/whatever/raisedragon/applicationservice/goal/GoalApplicationService.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ class GoalApplicationService(
hostUserNickname = hostUser.nickname.value,
betting = betting,
isSuccess = isSuccess,
winnerNickname = winnerNickname)
winnerNickname = winnerNickname
)
}

fun retrieveAllByUserId(userId: Long): List<GoalResponse> {
Expand Down
11 changes: 0 additions & 11 deletions ...otlin/com/whatever/raisedragon/applicationservice/token/RefreshTokenApplicationService.kt
View file

This file was deleted.

2 changes: 1 addition & 1 deletion ...pi/src/main/kotlin/com/whatever/raisedragon/security/resolver/UserInfoArgumentResolver.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class UserInfoArgumentResolver : HandlerMethodArgumentResolver {

override fun supportsParameter(parameter: MethodParameter): Boolean {
return parameter.hasParameterAnnotation(GetAuth::class.java)
&& parameter.parameter.type == UserInfo::class.java
&& parameter.parameter.type == UserInfo::class.java
}

override fun resolveArgument(
Expand Down
8 changes: 0 additions & 8 deletions raisedragon-api/src/test/kotlin/com/whatever/raisedragon/ControllerTestSupport.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,7 @@ package com.whatever.raisedragon
import com.fasterxml.jackson.databind.ObjectMapper
import com.whatever.raisedragon.applicationservice.betting.BettingApplicationService
import com.whatever.raisedragon.controller.betting.BettingController
import com.whatever.raisedragon.domain.user.Nickname
import com.whatever.raisedragon.domain.user.User
import com.whatever.raisedragon.security.authentication.UserInfo
import com.whatever.raisedragon.security.jwt.JwtAgent
import com.whatever.raisedragon.security.jwt.JwtToken
import com.whatever.raisedragon.security.resolver.UserInfoArgumentResolver
import org.junit.jupiter.api.BeforeEach
import org.mockito.Mockito.*
import org.mockito.Spy
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
import org.springframework.boot.test.mock.mockito.MockBean
Expand Down
1 change: 0 additions & 1 deletion ...tlin/com/whatever/raisedragon/applicationservice/betting/BettingApplicationServiceTest.kt
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.whatever.raisedragon.applicationservice.betting

import com.whatever.raisedragon.applicationservice.betting.dto.BettingCreateServiceRequest
import com.whatever.raisedragon.applicationservice.betting.dto.BettingCreateUpdateResponse
import com.whatever.raisedragon.applicationservice.betting.dto.BettingRetrieveResponse
import com.whatever.raisedragon.applicationservice.betting.dto.BettingUpdateServiceRequest
import com.whatever.raisedragon.common.exception.BaseException
Expand Down
2 changes: 1 addition & 1 deletion raisedragon-api/src/test/kotlin/com/whatever/raisedragon/infra/s3/FakeFileUploader.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import org.springframework.web.multipart.MultipartFile

@Service
@Profile("test")
class FakeFileUploader: FileUploader {
class FakeFileUploader : FileUploader {
override fun upload(multipartFile: MultipartFile): String {
return ""
}
Expand Down
80 changes: 54 additions & 26 deletions ...dragon-core/src/test/kotlin/com/whatever/raisedragon/domain/betting/BettingServiceTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,13 @@ class BettingServiceTest : IntegrationTestSupport {
val userEntity = UserEntity(nickname = Nickname("User1"))
userRepository.save(userEntity)

val goalEntity = createGoalEntity(userEntity,
val goalEntity = createGoalEntity(
userEntity,
BILLING,
PROCEEDING,
LocalDateTime.now(),
LocalDateTime.now().plusDays(7))
LocalDateTime.now().plusDays(7)
)
goalRepository.save(goalEntity)

// when
Expand All @@ -69,11 +71,13 @@ class BettingServiceTest : IntegrationTestSupport {
val userEntity = UserEntity(nickname = Nickname("User1"))
userRepository.save(userEntity)

val goalEntity = createGoalEntity(userEntity,
val goalEntity = createGoalEntity(
userEntity,
BILLING,
PROCEEDING,
LocalDateTime.now(),
LocalDateTime.now().plusDays(7))
LocalDateTime.now().plusDays(7)
)
goalRepository.save(goalEntity)

// when // then
Expand All @@ -93,11 +97,13 @@ class BettingServiceTest : IntegrationTestSupport {
val userEntity = UserEntity(nickname = Nickname("User1"))
userRepository.save(userEntity)

val goalEntity = createGoalEntity(userEntity,
val goalEntity = createGoalEntity(
userEntity,
BILLING,
PROCEEDING,
LocalDateTime.now(),
LocalDateTime.now().plusDays(7))
LocalDateTime.now().plusDays(7)
)
goalRepository.save(goalEntity)

// when // then
Expand All @@ -117,11 +123,13 @@ class BettingServiceTest : IntegrationTestSupport {
val userEntity = UserEntity(nickname = Nickname("User1"))
userRepository.save(userEntity)

val goalEntity = createGoalEntity(userEntity,
val goalEntity = createGoalEntity(
userEntity,
BILLING,
PROCEEDING,
LocalDateTime.now(),
LocalDateTime.now().plusDays(7))
LocalDateTime.now().plusDays(7)
)
goalRepository.save(goalEntity)

val bettingEntity = BettingEntity(
Expand Down Expand Up @@ -150,11 +158,13 @@ class BettingServiceTest : IntegrationTestSupport {
val userEntity2 = UserEntity(nickname = Nickname("User2"))
userRepository.saveAll(listOf(userEntity1, userEntity2))

val goalEntity = createGoalEntity(userEntity1,
val goalEntity = createGoalEntity(
userEntity1,
BILLING,
PROCEEDING,
LocalDateTime.now(),
LocalDateTime.now().plusDays(7))
LocalDateTime.now().plusDays(7)
)
goalRepository.save(goalEntity)

val bettingEntity = BettingEntity(
Expand All @@ -180,11 +190,13 @@ class BettingServiceTest : IntegrationTestSupport {
val userEntity2 = UserEntity(nickname = Nickname("User2"))
userRepository.saveAll(listOf(userEntity1, userEntity2))

val goalEntity = createGoalEntity(userEntity1,
val goalEntity = createGoalEntity(
userEntity1,
BILLING,
PROCEEDING,
LocalDateTime.now(),
LocalDateTime.now().plusDays(7))
LocalDateTime.now().plusDays(7)
)
goalRepository.save(goalEntity)

val bettingEntity = BettingEntity(
Expand All @@ -208,11 +220,13 @@ class BettingServiceTest : IntegrationTestSupport {
val userEntity2 = UserEntity(nickname = Nickname("User2"))
userRepository.saveAll(listOf(userEntity1, userEntity2))

val goalEntity = createGoalEntity(userEntity1,
val goalEntity = createGoalEntity(
userEntity1,
BILLING,
PROCEEDING,
LocalDateTime.now(),
LocalDateTime.now().plusDays(7))
LocalDateTime.now().plusDays(7)
)
goalRepository.save(goalEntity)

val bettingEntity = BettingEntity(
Expand Down Expand Up @@ -284,14 +298,18 @@ class BettingServiceTest : IntegrationTestSupport {
assertThat(foundBettingList).hasSize(2)
.extractingBettingProperties()
.containsExactlyInAnyOrder(
tuple(bettingEntity1.userEntity.id,
tuple(
bettingEntity1.userEntity.id,
bettingEntity1.goalEntity.id,
BettingPredictionType.FAIL,
BettingResult.PROCEEDING),
tuple(bettingEntity2.userEntity.id,
BettingResult.PROCEEDING
),
tuple(
bettingEntity2.userEntity.id,
bettingEntity2.goalEntity.id,
BettingPredictionType.SUCCESS,
BettingResult.NO_GIFTICON),
BettingResult.NO_GIFTICON
),
)
}

Expand Down Expand Up @@ -1024,10 +1042,16 @@ class BettingServiceTest : IntegrationTestSupport {
bettingService.hardDeleteByUserId(userEntity.id)

// then
assertThat(bettingRepository.findAllById(setOf(bettingEntity1.id,
bettingEntity2.id,
bettingEntity3.id,
bettingEntity4.id)))
assertThat(
bettingRepository.findAllById(
setOf(
bettingEntity1.id,
bettingEntity2.id,
bettingEntity3.id,
bettingEntity4.id
)
)
)
.isEmpty()
}

Expand Down Expand Up @@ -1079,15 +1103,19 @@ class BettingServiceTest : IntegrationTestSupport {

private fun ObjectAssert<*>.isInstanceOfBetting() = isInstanceOf(Betting::class.java)

private fun ObjectAssert<*>.extractingBettingProperties() = extracting("userId",
private fun ObjectAssert<*>.extractingBettingProperties() = extracting(
"userId",
"goalId",
"bettingPredictionType",
"bettingResult")
"bettingResult"
)

private fun ListAssert<*>.extractingBettingProperties() = extracting("userId",
private fun ListAssert<*>.extractingBettingProperties() = extracting(
"userId",
"goalId",
"bettingPredictionType",
"bettingResult")
"bettingResult"
)

private fun createGoalEntity(
userEntity: UserEntity,
Expand Down
9 changes: 6 additions & 3 deletions ...e/src/test/kotlin/com/whatever/raisedragon/domain/goalgifticon/GoalGifticonServiceTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ class GoalGifticonServiceTest : IntegrationTestSupport {
goalGifticonEntity1,
goalGifticonEntity2,
goalGifticonEntity3,
goalGifticonEntity4)
goalGifticonEntity4
)
)
// when
val foundGoalGifticon = goalGifticonService.findByGoalId(goalEntity1.id)
Expand Down Expand Up @@ -164,7 +165,8 @@ class GoalGifticonServiceTest : IntegrationTestSupport {
goalGifticonEntity1,
goalGifticonEntity2,
goalGifticonEntity3,
goalGifticonEntity4)
goalGifticonEntity4
)
)
// when
val foundGoalGifticon = goalGifticonService.findByGoalId(goalEntity1.id)
Expand Down Expand Up @@ -199,7 +201,8 @@ class GoalGifticonServiceTest : IntegrationTestSupport {
goalGifticonEntity1,
goalGifticonEntity2,
goalGifticonEntity3,
goalGifticonEntity4)
goalGifticonEntity4
)
)
// when // then
assertThatThrownBy { goalGifticonService.findByGoalId(-1L) }
Expand Down
Loading

0 comments on commit d86c7fb

Please sign in to comment.