hlaeja-old/hlaeja-account-registry
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add get accounts

Browse Source 
- add get accounts to account.http
- add getAccounts to AccountController
- add missing test in AccountServiceTest
- add getAccounts to AccountService
This commit is contained in:
Mr. Swordsteel
2025-01-21 11:08:20 +01:00
parent f8154fe05f
commit 72ac37e603
4 changed files with 188 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/kotlin/ltd/hlaeja/controller/AccountController.kt
View File

@@ -11,6 +11,7 @@ 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 reactor.core.publisher.Flux
import reactor.core.publisher.Mono
@RestController
@@ -18,6 +19,10 @@ class AccountController(
private val accountService: AccountService,
private val passwordEncoder: PasswordEncoder,
) {
companion object {
const val DEFAULT_PAGE: Int = 1
const val DEFAULT_SIZE: Int = 25
}
@GetMapping("/account-{uuid}")
fun getAccount(
@@ -30,4 +35,24 @@ class AccountController(
@RequestBody request: Account.Request,
): Mono<Account.Response> = accountService.addAccount(request.toAccountEntity(passwordEncoder))
.map { it.toAccountResponse() }
@GetMapping("/accounts")
fun getDefaultAccounts(): Flux<Account.Response> = getAccounts(DEFAULT_PAGE, DEFAULT_SIZE)
@GetMapping("/accounts/page-{page}")
fun getAccountsPage(
@PathVariable page: Int,
): Flux<Account.Response> = getAccounts(page, DEFAULT_SIZE)
@GetMapping("/accounts/page-{page}/show-{size}")
fun getAccountsPageSize(
@PathVariable page: Int,
@PathVariable size: Int,
): Flux<Account.Response> = getAccounts(page, size)
private fun getAccounts(
page: Int,
size: Int,
): Flux<Account.Response> = accountService.getAccounts(page, size)
.map { it.toAccountResponse() }
}

11
src/main/kotlin/ltd/hlaeja/service/AccountService.kt
View File

@@ -1,6 +1,7 @@
package ltd.hlaeja.service
import io.github.oshai.kotlinlogging.KotlinLogging
import java.lang.IllegalArgumentException
import java.util.UUID
import ltd.hlaeja.entity.AccountEntity
import ltd.hlaeja.repository.AccountRepository
@@ -8,6 +9,7 @@ import org.springframework.dao.DuplicateKeyException
import org.springframework.http.HttpStatus
import org.springframework.stereotype.Service
import org.springframework.web.server.ResponseStatusException
import reactor.core.publisher.Flux
import reactor.core.publisher.Mono
private val log = KotlinLogging.logger {}
@@ -40,4 +42,13 @@ class AccountService(
else -> Mono.error(ResponseStatusException(HttpStatus.BAD_REQUEST))
}
}
fun getAccounts(page: Int, size: Int): Flux<AccountEntity> = try {
accountRepository.findAll()
.skip((page - 1).toLong() * size)
.take(size.toLong())
.doOnNext { log.debug { "Retrieved accounts $page with size $size" } }
} catch (e: IllegalArgumentException) {
Flux.error(ResponseStatusException(HttpStatus.BAD_REQUEST))
}
}

153
src/test/kotlin/ltd/hlaeja/service/AccountServiceTest.kt
View File

@@ -9,13 +9,31 @@ import ltd.hlaeja.entity.AccountEntity
import ltd.hlaeja.repository.AccountRepository
import org.junit.jupiter.api.BeforeEach
import org.junit.jupiter.api.Test
import org.springframework.dao.DuplicateKeyException
import org.springframework.http.HttpStatus.BAD_REQUEST
import org.springframework.http.HttpStatus.CONFLICT
import org.springframework.web.server.ResponseStatusException
import reactor.core.publisher.Flux
import reactor.core.publisher.Mono
import reactor.test.StepVerifier
class AccountServiceTest {
companion object {
val account = UUID.fromString("00000000-0000-0000-0000-000000000002")
val accountEntity = AccountEntity(
account,
ZonedDateTime.now(),
ZonedDateTime.now(),
true,
"username",
"password",
"ROLE_TEST",
)
val accounts = Flux.just(
accountEntity.copy(username = "username1"),
accountEntity.copy(username = "username2"),
accountEntity.copy(username = "username3"),
)
}
private lateinit var accountRepository: AccountRepository
@@ -30,16 +48,6 @@ class AccountServiceTest {
@Test
fun `get account by id - success`() {
// given
val accountEntity = AccountEntity(
account,
ZonedDateTime.now(),
ZonedDateTime.now(),
true,
"username",
"password",
"ROLE_TEST",
)
every { accountRepository.findById(any(UUID::class)) } returns Mono.just(accountEntity)
// when
@@ -64,4 +72,129 @@ class AccountServiceTest {
// then
verify { accountRepository.findById(any(UUID::class)) }
}
@Test
fun `get account by username - success`() {
// given
every { accountRepository.findByUsername(any()) } returns Mono.just(accountEntity)
// when
StepVerifier.create(accountService.getUserByUsername("username"))
.expectNext(accountEntity)
.verifyComplete()
// then
verify { accountRepository.findByUsername(any()) }
}
@Test
fun `get account by username - fail does not exist`() {
// given
every { accountRepository.findByUsername(any()) } returns Mono.empty()
// when
StepVerifier.create(accountService.getUserByUsername("username"))
.expectError(ResponseStatusException::class.java)
.verify()
// then
verify { accountRepository.findByUsername(any()) }
}
@Test
fun `add account - success`() {
// given
every { accountRepository.save(any()) } returns Mono.just(accountEntity)
// when
StepVerifier.create(accountService.addAccount(accountEntity))
.expectNext(accountEntity)
.verifyComplete()
// then
verify { accountRepository.save(any()) }
}
@Test
fun `add account - fail duplicated user`() {
// given
every { accountRepository.save(any()) } returns Mono.error(DuplicateKeyException("Test"))
// when
StepVerifier.create(accountService.addAccount(accountEntity))
.expectErrorMatches { error ->
error is ResponseStatusException && error.statusCode == CONFLICT
}
.verify()
// then
verify { accountRepository.save(any()) }
}
@Test
fun `add account - fail`() {
// given
every { accountRepository.save(any()) } returns Mono.error(RuntimeException())
// when
StepVerifier.create(accountService.addAccount(accountEntity))
.expectErrorMatches { error ->
error is ResponseStatusException && error.statusCode == BAD_REQUEST
}
.verify()
// then
verify { accountRepository.save(any()) }
}
@Test
fun `get accounts - limit size success`() {
// given
every { accountRepository.findAll() } returns accounts
// when
StepVerifier.create(accountService.getAccounts(1,2))
.expectNextMatches { accountEntity ->
accountEntity.username == "username1"
}
.expectNextMatches {accountEntity ->
accountEntity.username == "username2"
}
.verifyComplete()
// then
verify { accountRepository.findAll() }
}
@Test
fun `get accounts - negative page fail`() {
// given
every { accountRepository.findAll() } returns accounts
// when
StepVerifier.create(accountService.getAccounts(-1,10))
.expectErrorMatches { error ->
error is ResponseStatusException && error.statusCode == BAD_REQUEST
}
.verify()
// then
verify { accountRepository.findAll() }
}
@Test
fun `get accounts - negative size fail`() {
// given
every { accountRepository.findAll() } returns accounts
// when
StepVerifier.create(accountService.getAccounts(1,-10))
.expectErrorMatches { error ->
error is ResponseStatusException && error.statusCode == BAD_REQUEST
}
.verify()
// then
verify { accountRepository.findAll() }
}
}