#143,144,146 - 쪽지 Overview 및 디테일 조회 개발

app/build.gradle.kts

@@ -19,5 +19,6 @@ dependencies {
     testImplementation("io.jsonwebtoken:jjwt-impl:0.11.2")
     testImplementation("io.jsonwebtoken:jjwt-jackson:0.11.2")
     testImplementation("io.rest-assured:rest-assured")
+    testImplementation("org.apache.commons:commons-lang3:3.0")
 
 }

app/src/main/kotlin/com/wespot/message/v2/CreateMessageV2Controller.kt

@@ -4,25 +4,23 @@ import com.wespot.message.dto.request.CreatedMessageV2Request
 import com.wespot.message.port.`in`.CreatedMessageV2UseCase
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
-import org.springframework.web.bind.annotation.PostMapping
-import org.springframework.web.bind.annotation.RequestMapping
-import org.springframework.web.bind.annotation.RestController
+import org.springframework.web.bind.annotation.*
 
 @RestController
 @RequestMapping("/api/v2/messages")
 class CreateMessageV2Controller(
-    private val createdMessageV2Usecase: CreatedMessageV2UseCase
+    private val createdMessageV2UseCase: CreatedMessageV2UseCase,
 ) {
 
     @PostMapping
     fun createMessageV2(
         createdMessageV2Request: CreatedMessageV2Request
     ): ResponseEntity<Unit> {
-        createdMessageV2Usecase.createMessage(createdMessageV2Request)
+        createdMessageV2UseCase.createMessage(createdMessageV2Request)
 
         return ResponseEntity
             .status(HttpStatus.CREATED)
-            .build();
+            .build()
     }
 
 }

app/src/main/kotlin/com/wespot/message/v2/GetMessageV2Controller.kt

@@ -0,0 +1,35 @@
+package com.wespot.message.v2
+
+import com.wespot.message.dto.response.MessageV2DetailsResponse
+import com.wespot.message.dto.response.MessageV2OverviewResponse
+import com.wespot.message.port.`in`.GetMessageV2UseCase
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.*
+
+@RestController
+@RequestMapping("/api/v2/messages")
+class GetMessageV2Controller(
+    private val getMessageV2UseCase: GetMessageV2UseCase
+) {
+
+    @GetMapping
+    fun getMessagesOverview(): ResponseEntity<List<MessageV2OverviewResponse>> {
+        val response = getMessageV2UseCase.getMessageOverview()
+
+        return ResponseEntity.ok(response)
+    }
+
+    @GetMapping("/bookmarks")
+    fun getBookmarkedMessagesOverview(): ResponseEntity<List<MessageV2OverviewResponse>> {
+        val response = getMessageV2UseCase.getBookmarkedMessageOverview()
+
+        return ResponseEntity.ok(response)
+    }
+
+    @GetMapping("/{messageId}/details")
+    fun getMessageDetails(@PathVariable messageId: Long): ResponseEntity<MessageV2DetailsResponse> {
+        val response = getMessageV2UseCase.getMessageDetails(messageId)
+
+        return ResponseEntity.ok(response)
+    }
+}

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

@@ -4,6 +4,7 @@ import com.wespot.auth.dto.AuthData
 import com.wespot.auth.dto.request.SignUpRequest
 import com.wespot.auth.dto.request.ConsentsRequest
 import com.wespot.auth.dto.response.TokenResponse
+import com.wespot.school.fixture.SchoolFixture
 import com.wespot.user.Gender
 import com.wespot.user.User
 import com.wespot.user.fixture.UserFixture
@@ -46,6 +47,6 @@ object AuthFixture {
     }
 
     fun createUser(): User {
-        return UserFixture.createWithId(1)
+        return UserFixture.createWithIdSchool(1, school = SchoolFixture.generate(id = 1))
     }
 }

app/src/test/kotlin/com/wespot/auth/service/AuthServiceTest.kt

@@ -25,7 +25,6 @@ import com.wespot.user.port.out.UserConsentPort
 import com.wespot.user.port.out.UserPort
 import com.wespot.user.port.out.RestrictionPort
 import com.wespot.auth.port.out.PersonalInfoPort
-import com.wespot.common.ViewedOnBoardingSheet
 import com.wespot.common.out.ViewedOnBoardingSheetPort
 import com.wespot.user.port.out.UserVersionPort
 
@@ -154,7 +153,7 @@ class AuthServiceTest : BehaviorSpec({
         }
 
         `when`("기존 사용자가 loginAccess를 호출할 때") {
-            val user = UserFixture.createWithId(1)
+            val user = UserFixture.createWithIdSchool(id = 1)
             val tokenResponse = TokenAndUserDetailResponse(
                 accessToken = "accessToken",
                 refreshToken = "refreshToken",
@@ -285,7 +284,7 @@ class AuthServiceTest : BehaviorSpec({
 
         val refreshTokenExpiredAt = getExpirationLocalDateTime(60 * 60 * 24 * 30).toString()
 
-        val user = UserFixture.createWithId(1)
+        val user = UserFixture.createWithIdSchool(1)
         val authentication = mockk<Authentication>()
         val generateToken = AuthFixture.createTokenResponse(refreshTokenExpiredAt)
 
@@ -329,7 +328,7 @@ class AuthServiceTest : BehaviorSpec({
             refreshToken = "testRefreshToken"
         )
 
-        val user = UserFixture.createWithId(1)
+        val user = UserFixture.createWithIdSchool(1)
         val authentication = mockk<Authentication>()
         val generateToken = AuthFixture.createTokenResponse(refreshTokenExpiredAt)
 
@@ -381,7 +380,7 @@ class AuthServiceTest : BehaviorSpec({
 
     given("revoke 테스트") {
 
-        val user = UserFixture.createWithId(1)
+        val user = UserFixture.createWithIdSchool(1)
 
         every { authService.getLoginUserId() } returns user.id
         every { userPort.findById(user.id) } returns user

app/src/test/kotlin/com/wespot/auth/service/AuthenticationServiceTest.kt

@@ -18,7 +18,7 @@ class AuthenticationServiceTest : BehaviorSpec({
 
     given("authenticationService 테스트") {
 
-        val user = UserFixture.createWithId(1)
+        val user = UserFixture.createWithIdSchool(1)
         val token = "token"
 
         val claims = mockk<Claims>()

app/src/test/kotlin/com/wespot/auth/service/PrincipalDetailServiceTest.kt

@@ -13,7 +13,7 @@ class PrincipalDetailServiceTest: BehaviorSpec({
 
     given("principalDetailService 테스트") {
 
-        val user = UserFixture.createWithId(1)
+        val user = UserFixture.createWithIdSchool(1)
 
         `when`("유저 아이디로 유저 정보를 가져올 때") {
             every { userPort.findByEmail(user.email) } returns user

app/src/test/kotlin/com/wespot/auth/service/RefreshTokenServiceTest.kt

@@ -19,7 +19,7 @@ class RefreshTokenServiceTest : BehaviorSpec({
 
     given("refreshTokenService 테스트") {
         val token = "newRefreshToken"
-        val user = UserFixture.createWithId(1)
+        val user = UserFixture.createWithIdSchool(1)
 
         val now = LocalDateTime.now()
         mockkStatic(LocalDateTime::class)

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

@@ -1,11 +1,8 @@
 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

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

@@ -3,7 +3,6 @@ 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

app/src/test/kotlin/com/wespot/common/util/RandomGenerator.kt

@@ -0,0 +1,98 @@
+package com.wespot.common.util
+
+import org.apache.commons.lang3.RandomStringUtils
+import java.util.*
+import java.util.function.Supplier
+import kotlin.reflect.KClass
+
+object RandomGenerator {
+    private val RANDOM = Random()
+    private const val NULL_VALUE_PROBABILITY = 0.1
+
+    fun generateNonNullString(length: Int): String {
+        return RandomStringUtils.randomAlphabetic(length)
+    }
+
+    fun generateString(length: Int): String? {
+        return generateNullAbleObject {
+            RandomStringUtils.randomAlphabetic(
+                length
+            )
+        }
+    }
+
+    fun generateNonNullNumeric(length: Int): Int {
+        return RandomStringUtils.randomNumeric(length).toInt()
+    }
+
+    fun generateNumeric(length: Int): Int? {
+        return generateNullAbleObject {
+            RandomStringUtils.randomNumeric(
+                length
+            ).toInt()
+        }
+    }
+
+    private fun <T> generateNullAbleObject(supplier: Supplier<T>): T? {
+        val probability = RANDOM.nextDouble()
+
+        if (probability < NULL_VALUE_PROBABILITY) {
+            return null
+        }
+
+        return supplier.get()
+    }
+
+    fun generateNonNullDouble(numberLength: Int, decimalLength: Int): Double {
+        return getRandomDouble(numberLength, decimalLength)
+    }
+
+    private fun getRandomDouble(numberLength: Int, decimalLength: Int): Double {
+        return (RandomStringUtils.randomNumeric(numberLength) +
+            "." + RandomStringUtils.randomNumeric(decimalLength)).toDouble()
+    }
+
+    fun generateDouble(numberLength: Int, decimalLength: Int): Double? {
+        return generateNullAbleObject {
+            getRandomDouble(
+                numberLength,
+                decimalLength
+            )
+        }
+    }
+
+    fun generateBoolean(): Boolean {
+        return RANDOM.nextBoolean()
+    }
+
+    fun <ENUM : Enum<*>> generateEnum(enumClass: KClass<ENUM>): ENUM? {
+        val enumConstants = enumClass.java.enumConstants
+        return generateNullAbleObject { enumConstants[RANDOM.nextInt(enumConstants.size)] }
+    }
+
+    fun <ENUM : Enum<*>> generateNonNullEnum(enumClass: KClass<ENUM>): ENUM {
+        val enumConstants = enumClass.java.enumConstants
+        return enumConstants[RANDOM.nextInt(enumConstants.size)]
+    }
+
+    fun generateNonNullCharacter(): Char {
+        return RandomStringUtils.randomAlphabetic(1)[0]
+    }
+
+    fun generateCharacter(): Char? {
+        return generateNullAbleObject {
+            RandomStringUtils.randomAlphabetic(
+                1
+            )[0]
+        }
+    }
+
+    fun generateNonNullUUID(): UUID {
+        return UUID.randomUUID()
+    }
+
+    fun generateUUID(): UUID? {
+        return generateNullAbleObject { UUID.randomUUID() }
+    }
+
+}