Skip to content
Merged
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1e6e67c
feat :: ๊ณต์ง€์‚ฌํ•ญ ํŽ˜์ด์ง€ ์ˆ˜ ์‘๋‹ต ์ถ”๊ฐ€
ashxom Nov 19, 2026
94370c8
feat :: ๊ณต์ง€์‚ฌํ•ญ ๊ฐœ์ˆ˜ ์กฐํšŒ ๊ฒฝ๋กœ ์ถ”๊ฐ€
ashxom Nov 19, 2026
9790c8c
feat :: ๊ณต์ง€์‚ฌํ•ญ ํŽ˜์ด์ง€ ์กฐํšŒ API ์ถ”๊ฐ€
ashxom Nov 19, 2026
9898cf2
feat :: ๊ณต์ง€์‚ฌํ•ญ ํŽ˜์ด์ง€ ์กฐํšŒ ๋ฐ์ดํ„ฐ์†Œ์Šค ์ถ”๊ฐ€
ashxom Nov 19, 2026
b6e2bf4
feat :: ๊ณต์ง€์‚ฌํ•ญ ํŽ˜์ด์ง€ ์กฐํšŒ ๋ฐ์ดํ„ฐ์†Œ์Šค ๊ตฌํ˜„ ์ถ”๊ฐ€
ashxom Nov 19, 2026
2fcd402
feat :: ๊ณต์ง€์‚ฌํ•ญ ํŽ˜์ด์ง€ ์กฐํšŒ Repository ์ถ”๊ฐ€
ashxom Nov 19, 2026
40951ca
feat :: ๊ณต์ง€์‚ฌํ•ญ ํŽ˜์ด์ง€ ์กฐํšŒ Repository ๊ตฌํ˜„ ์ถ”๊ฐ€
ashxom Nov 19, 2026
040789a
feat :: ๊ณต์ง€์‚ฌํ•ญ ํŽ˜์ด์ง€ ์ˆ˜ Entity ์ถ”๊ฐ€
ashxom Nov 19, 2026
a09a01e
feat :: ๊ณต์ง€์‚ฌํ•ญ ํŽ˜์ด์ง€ ์ˆ˜ UseCase ์ถ”๊ฐ€
ashxom Nov 19, 2026
51b5fdc
fix :: ๊ณต์ง€์‚ฌํ•ญ ํŽ˜์ด์ง€ ์กฐํšŒ UseCase ์ˆ˜์ •
ashxom Nov 19, 2026
1af264e
feat :: ๊ณต์ง€์‚ฌํ•ญ ๋ชฉ๋ก ํŽ˜์ด์ง€๋„ค์ด์…˜ ์ถ”๊ฐ€
ashxom Nov 19, 2026
afdd2d7
feat :: ๊ณต์ง€์‚ฌํ•ญ ๋‹ค์Œ ํŽ˜์ด์ง€ ์กฐํšŒ UI ์ถ”๊ฐ€
ashxom Nov 19, 2026
4d1d5d9
fix :: ๊ณต์ง€์‚ฌํ•ญ ๋ชฉ๋ก ์กฐํšŒ ์•ˆ์ •์„ฑ ์ˆ˜์ •
ashxom Nov 20, 2026
5231789
fix :: ๊ณต์ง€์‚ฌํ•ญ ๋‹ค์Œ ํŽ˜์ด์ง€ ์š”์ฒญ ์œ„์น˜ ์ˆ˜์ •
ashxom Nov 20, 2026
4df466b
fix :: ๊ณต์ง€์‚ฌํ•ญ ๋‹ค์Œ ํŽ˜์ด์ง€ ์žฌ์š”์ฒญ ๋ฐฉ์ง€ ์ˆ˜์ •
ashxom Nov 20, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package team.retum.data.repository.notice

import team.retum.network.model.response.notice.FetchNoticeDetailsResponse
import team.retum.network.model.response.notice.FetchNoticesCountResponse
import team.retum.network.model.response.notice.FetchNoticesResponse

interface NoticeRepository {
suspend fun fetchNotices(): FetchNoticesResponse
suspend fun fetchNotices(page: Long): FetchNoticesResponse

suspend fun fetchNoticesCount(): FetchNoticesCountResponse

suspend fun fetchNoticeDetails(noticeId: Long): FetchNoticeDetailsResponse
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@ package team.retum.data.repository.notice

import team.retum.network.datasource.notice.NoticeDataSource
import team.retum.network.model.response.notice.FetchNoticeDetailsResponse
import team.retum.network.model.response.notice.FetchNoticesCountResponse
import team.retum.network.model.response.notice.FetchNoticesResponse
import javax.inject.Inject

class NoticeRepositoryImpl @Inject constructor(
private val noticeDataSource: NoticeDataSource,
) : NoticeRepository {
override suspend fun fetchNotices(): FetchNoticesResponse =
noticeDataSource.fetchNotices()
override suspend fun fetchNotices(page: Long): FetchNoticesResponse =
noticeDataSource.fetchNotices(page = page)

override suspend fun fetchNoticesCount(): FetchNoticesCountResponse =
noticeDataSource.fetchNoticesCount()

override suspend fun fetchNoticeDetails(noticeId: Long): FetchNoticeDetailsResponse =
noticeDataSource.fetchNoticeDetails(noticeId = noticeId)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package team.retum.usecase.entity.notice

import team.retum.network.model.response.notice.FetchNoticesCountResponse

data class NoticesCountEntity(
val totalPageCount: Long,
)

internal fun FetchNoticesCountResponse.toEntity() = NoticesCountEntity(
totalPageCount = totalPageCount,
)
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package team.retum.usecase.usecase.notice

import team.retum.data.repository.notice.NoticeRepository
import team.retum.usecase.entity.notice.toEntity
import javax.inject.Inject

class FetchNoticesCountUseCase @Inject constructor(
private val noticeRepository: NoticeRepository,
) {
suspend operator fun invoke() = runCatching {
noticeRepository.fetchNoticesCount().toEntity()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import javax.inject.Inject
class FetchNoticesUseCase @Inject constructor(
private val noticeRepository: NoticeRepository,
) {
suspend operator fun invoke() = runCatching {
noticeRepository.fetchNotices().toNoticesEntity()
suspend operator fun invoke(page: Long) = runCatching {
noticeRepository.fetchNotices(page = page).toNoticesEntity()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,20 @@ package team.retum.network.api

import retrofit2.http.GET
import retrofit2.http.Path
import retrofit2.http.Query
import team.retum.network.di.RequestUrls
import team.retum.network.model.response.notice.FetchNoticeDetailsResponse
import team.retum.network.model.response.notice.FetchNoticesCountResponse
import team.retum.network.model.response.notice.FetchNoticesResponse

interface NoticeApi {
@GET(RequestUrls.Notice.notices)
suspend fun fetchNotices(): FetchNoticesResponse
suspend fun fetchNotices(
@Query("page") page: Long,
): FetchNoticesResponse

@GET(RequestUrls.Notice.count)
suspend fun fetchNoticesCount(): FetchNoticesCountResponse

@GET(RequestUrls.Notice.details)
suspend fun fetchNoticeDetails(
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package team.retum.network.datasource.notice

import team.retum.network.model.response.notice.FetchNoticeDetailsResponse
import team.retum.network.model.response.notice.FetchNoticesCountResponse
import team.retum.network.model.response.notice.FetchNoticesResponse

interface NoticeDataSource {
suspend fun fetchNotices(): FetchNoticesResponse
suspend fun fetchNotices(page: Long): FetchNoticesResponse

suspend fun fetchNoticesCount(): FetchNoticesCountResponse

suspend fun fetchNoticeDetails(noticeId: Long): FetchNoticeDetailsResponse
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,22 @@ package team.retum.network.datasource.notice

import team.retum.network.api.NoticeApi
import team.retum.network.model.response.notice.FetchNoticeDetailsResponse
import team.retum.network.model.response.notice.FetchNoticesCountResponse
import team.retum.network.model.response.notice.FetchNoticesResponse
import team.retum.network.util.RequestHandler
import javax.inject.Inject

class NoticeDataSourceImpl @Inject constructor(
private val noticeApi: NoticeApi,
) : NoticeDataSource {
override suspend fun fetchNotices(): FetchNoticesResponse =
override suspend fun fetchNotices(page: Long): FetchNoticesResponse =
RequestHandler<FetchNoticesResponse>().request {
noticeApi.fetchNotices()
noticeApi.fetchNotices(page = page)
}

override suspend fun fetchNoticesCount(): FetchNoticesCountResponse =
RequestHandler<FetchNoticesCountResponse>().request {
noticeApi.fetchNoticesCount()
}

override suspend fun fetchNoticeDetails(noticeId: Long): FetchNoticeDetailsResponse =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ internal object RequestUrls {
private const val path = "/notices"

const val notices = path
const val count = "$path/count"
const val details = "$path/{${PATH.noticeId}}"
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package team.retum.network.model.response.notice

import com.squareup.moshi.Json
import com.squareup.moshi.JsonClass

@JsonClass(generateAdapter = true)
data class FetchNoticesCountResponse(
@Json(name = "total_page_count") val totalPageCount: Long,
)
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.itemsIndexed
import androidx.compose.material3.Icon
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
Expand Down Expand Up @@ -46,7 +46,7 @@ internal fun Notices(
val context = LocalContext.current

LaunchedEffect(Unit) {
noticesViewModel.fetchNotices()
noticesViewModel.fetchTotalNoticeCount()
noticesViewModel.sideEffect.collect {
when (it) {
is NoticesSideEffect.BadRequest -> {
Expand All @@ -64,6 +64,8 @@ internal fun Notices(
onBackPressed = onBackPressed,
navigateToDetail = navigateToDetail,
notices = state.value.notices.toPersistentList(),
whetherFetchNextPage = noticesViewModel::whetherFetchNextPage,
fetchNextPage = noticesViewModel::fetchNotices,
)
}

Expand All @@ -72,6 +74,8 @@ private fun NoticesScreen(
onBackPressed: () -> Unit,
navigateToDetail: (Long) -> Unit,
notices: ImmutableList<NoticesEntity.NoticeEntity>,
whetherFetchNextPage: (Int) -> Boolean,
fetchNextPage: () -> Unit,
) {
Column(
modifier = Modifier
Expand All @@ -86,12 +90,13 @@ private fun NoticesScreen(
modifier = Modifier
.padding(horizontal = 24.dp),
) {
items(notices) {
itemsIndexed(notices) { index, notice ->
NoticesItem(
noticeTitle = it.title,
noticeDate = it.createdAt,
onClick = { navigateToDetail(it.id) },
noticeTitle = notice.title,
noticeDate = notice.createdAt,
onClick = { navigateToDetail(notice.id) },
)
if (whetherFetchNextPage(index)) fetchNextPage()
}
}
if (notices.isEmpty()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,48 @@ import kotlinx.coroutines.launch
import team.retum.common.base.BaseViewModel
import team.retum.common.exception.BadRequestException
import team.retum.usecase.entity.notice.NoticesEntity
import team.retum.usecase.usecase.notice.FetchNoticesCountUseCase
import team.retum.usecase.usecase.notice.FetchNoticesUseCase
import javax.inject.Inject

@HiltViewModel
internal class NoticesViewModel @Inject constructor(
private val fetchNoticesUseCase: FetchNoticesUseCase,
private val fetchNoticesCountUseCase: FetchNoticesCountUseCase,
) : BaseViewModel<NoticesState, NoticesSideEffect>(NoticesState.getDefaultState()) {
internal fun fetchNotices() {
val currentState = state.value
if (currentState.isLoading || currentState.page >= currentState.totalPage) return

val page = currentState.page + 1
setState { state.value.copy(isLoading = true) }
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
viewModelScope.launch(Dispatchers.IO) {
fetchNoticesUseCase(page = page)
.onSuccess {
setState {
state.value.copy(
page = page,
notices = state.value.notices + it.notices,
isLoading = false,
)
}
}.onFailure {
setState { state.value.copy(isLoading = false) }
when (it) {
is BadRequestException -> {
postSideEffect(NoticesSideEffect.BadRequest)
}
}
}
}
}

internal fun fetchTotalNoticeCount() {
viewModelScope.launch(Dispatchers.IO) {
fetchNoticesUseCase()
fetchNoticesCountUseCase()
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
.onSuccess {
setState { state.value.copy(notices = it.notices) }
setState { state.value.copy(totalPage = it.totalPageCount) }
fetchNotices()
}.onFailure {
when (it) {
is BadRequestException -> {
Expand All @@ -29,16 +59,24 @@ internal class NoticesViewModel @Inject constructor(
}
}
}

internal fun whetherFetchNextPage(lastVisibleItemIndex: Int): Boolean = with(state.value) {
return !isLoading && lastVisibleItemIndex == notices.lastIndex && page < totalPage
}
}

internal data class NoticesState(
val noticeId: Long,
val notices: List<NoticesEntity.NoticeEntity>,
val page: Long,
val totalPage: Long,
val isLoading: Boolean,
) {
companion object {
fun getDefaultState() = NoticesState(
noticeId = 0,
notices = mutableStateListOf(),
page = 0,
totalPage = 0,
isLoading = false,
)
}
}
Expand Down
Loading