test: 적용된 기능으로 인한 테스트 변경

yourssu · Dec 12, 2023 · bb6766b · bb6766b
1 parent af76516
commit bb6766b
Show file tree

Hide file tree

Showing 11 changed files with 130 additions and 311 deletions.
diff --git a/src/main/kotlin/com/yourssu/ssudateserver/controller/SSUDateController.kt b/src/main/kotlin/com/yourssu/ssudateserver/controller/SSUDateController.kt
@@ -1,10 +1,8 @@
 package com.yourssu.ssudateserver.controller
 
-import com.yourssu.ssudateserver.dto.request.AuthRequestDto
 import com.yourssu.ssudateserver.dto.request.ContactRequestDto
 import com.yourssu.ssudateserver.dto.request.RegisterFemaleRequestDto
 import com.yourssu.ssudateserver.dto.request.RegisterMaleRequestDto
-import com.yourssu.ssudateserver.dto.response.AuthResponseDto
 import com.yourssu.ssudateserver.dto.response.ContactResponseDto
 import com.yourssu.ssudateserver.dto.response.RegisterResponseDto
 import com.yourssu.ssudateserver.dto.response.SearchResponseDto
@@ -14,36 +12,29 @@ import com.yourssu.ssudateserver.enums.Gender
 import com.yourssu.ssudateserver.enums.MaleAnimals
 import com.yourssu.ssudateserver.exception.logic.AllCanNotRegisterException
 import com.yourssu.ssudateserver.service.SSUDateService
-import org.springframework.web.bind.annotation.GetMapping
-import org.springframework.web.bind.annotation.PathVariable
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestBody
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
+import javax.servlet.http.HttpServletResponse
 import javax.validation.Valid
 
 @RestController
-class SSUDateController(private val ssuDateService: SSUDateService) {
-    @PostMapping("/auth")
-    fun auth(
-        @Valid @RequestBody
-        authRequestDto: AuthRequestDto,
-    ): AuthResponseDto {
-        return ssuDateService.auth(authRequestDto.code)
-    }
+class SSUDateController(
+    private val ssuDateService: SSUDateService,
+) {
 
     @PostMapping("/register/male")
     fun registerMale(
         @Valid @RequestBody
         registerRequestDto: RegisterMaleRequestDto,
     ): RegisterResponseDto {
+
         if (registerRequestDto.animals == MaleAnimals.ALL) {
             throw AllCanNotRegisterException("ALL은 등록불가능 합니다.")
         }
 
         return ssuDateService.register(
-            registerRequestDto.code,
             Animals.valueOf(registerRequestDto.animals.toString()),
             registerRequestDto.nickName,
+            registerRequestDto.oauthName,
             registerRequestDto.mbti,
             registerRequestDto.introduce,
             registerRequestDto.contact,
@@ -61,9 +52,9 @@ class SSUDateController(private val ssuDateService: SSUDateService) {
         }
 
         return ssuDateService.register(
-            registerRequestDto.code,
             Animals.valueOf(registerRequestDto.animals.toString()),
             registerRequestDto.nickName,
+            registerRequestDto.oauthName,
             registerRequestDto.mbti,
             registerRequestDto.introduce,
             registerRequestDto.contact,

diff --git a/src/test/kotlin/com/yourssu/ssudateserver/SsuDateServerApplicationTests.kt b/src/test/kotlin/com/yourssu/ssudateserver/SsuDateServerApplicationTests.kt
@@ -2,8 +2,12 @@ package com.yourssu.ssudateserver
 
 import org.junit.jupiter.api.Test
 import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.context.annotation.Profile
+import org.springframework.test.context.ActiveProfiles
+
 
 @SpringBootTest
+@ActiveProfiles("test")
 class SsuDateServerApplicationTests {
 
     @Test

diff --git a/src/test/kotlin/com/yourssu/ssudateserver/common/BaseTest.kt b/src/test/kotlin/com/yourssu/ssudateserver/common/BaseTest.kt
@@ -3,23 +3,22 @@ package com.yourssu.ssudateserver.common
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.yourssu.ssudateserver.entity.Auth
 import com.yourssu.ssudateserver.entity.User
-import com.yourssu.ssudateserver.enums.Animals
-import com.yourssu.ssudateserver.enums.FemaleAnimals
-import com.yourssu.ssudateserver.enums.Gender
-import com.yourssu.ssudateserver.enums.MBTI
-import com.yourssu.ssudateserver.enums.MaleAnimals
+import com.yourssu.ssudateserver.enums.*
 import com.yourssu.ssudateserver.repository.AuthRepository
 import com.yourssu.ssudateserver.repository.UserRepository
 import org.junit.jupiter.api.AfterEach
 import org.junit.jupiter.api.BeforeEach
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.context.annotation.Profile
+import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.web.servlet.MockMvc
 import java.time.LocalDateTime
 
 @SpringBootTest
 @AutoConfigureMockMvc
+@ActiveProfiles("test")
 class BaseTest {
     @Autowired
     protected lateinit var mockMvc: MockMvc
@@ -75,11 +74,13 @@ class BaseTest {
                 animals = animal,
                 mbti = mbti,
                 nickName = "testNick${it + 1}",
+                oauthName = "oauthName${it + 1}",
                 introduction = "Introduction${it + 1}",
                 contact = "Contact${it + 1}",
                 weight = it % 2,
                 createdAt = currentDateTime.plusSeconds(it.toLong()),
                 gender = gender,
+                role = RoleType.USER,
             )
             userList.add(user)
 //            println("${user.animals} ${user.createdAt} ${user.weight} ${user.mbti} ${user.gender}")

diff --git a/src/test/kotlin/com/yourssu/ssudateserver/controller/AuthTest.kt b/src/test/kotlin/com/yourssu/ssudateserver/controller/AuthTest.kt
diff --git a/src/test/kotlin/com/yourssu/ssudateserver/controller/ContactTest.kt b/src/test/kotlin/com/yourssu/ssudateserver/controller/ContactTest.kt
@@ -5,10 +5,15 @@ import com.yourssu.ssudateserver.dto.request.ContactRequestDto
 import org.assertj.core.api.Assertions
 import org.junit.jupiter.api.Test
 import org.springframework.http.MediaType
+import org.springframework.security.test.context.support.WithMockUser
+import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.web.servlet.post
 
+@ActiveProfiles("test")
 class ContactTest : BaseTest() {
+
     @Test
+    @WithMockUser
     fun contactTest() {
         val requestDto = ContactRequestDto(
             code = validCode,
@@ -32,6 +37,7 @@ class ContactTest : BaseTest() {
     }
 
     @Test
+    @WithMockUser
     fun contactTestFailCodeNotFound() {
         val requestDto = ContactRequestDto(
             code = invalidCode,
@@ -51,6 +57,7 @@ class ContactTest : BaseTest() {
     }
 
     @Test
+    @WithMockUser
     fun contactTestFailInvalidCodeLengthUnder10() {
         val requestDto = ContactRequestDto(
             code = invalidCodeUnder10,
@@ -70,6 +77,7 @@ class ContactTest : BaseTest() {
     }
 
     @Test
+    @WithMockUser
     fun contactTestFailInvalidCodeLengthOver10() {
         val requestDto = ContactRequestDto(
             code = invalidCodeOver10,
@@ -89,6 +97,7 @@ class ContactTest : BaseTest() {
     }
 
     @Test
+    @WithMockUser
     fun contactTestFailNotFoundNickName() {
         val requestDto = ContactRequestDto(
             code = validCode,
@@ -108,6 +117,7 @@ class ContactTest : BaseTest() {
     }
 
     @Test
+    @WithMockUser
     fun contactTestFailUnderZeroTicket() {
         val requestDto = ContactRequestDto(
             code = validCode,