From 157787c6b6e599b6fa0c5dffc32a67190e34bbe6 Mon Sep 17 00:00:00 2001 From: klaus Date: Wed, 28 Oct 2026 19:16:07 +0900 Subject: [PATCH] =?UTF-8?q?feat(notice):=20=EC=B5=9C=EC=8B=A0=20=EA=B3=B5?= =?UTF-8?q?=EC=A7=80=EB=A5=BC=20v2=20=EB=B0=B0=EC=97=B4=20API=EB=A1=9C=20?= =?UTF-8?q?=EC=A0=84=ED=99=98=ED=95=9C=EB=8B=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sodalive/settings/notice/NoticeApi.kt | 5 +- .../settings/notice/NoticeRepository.kt | 2 +- .../v2/mypage/notice/LatestNoticeResponse.kt | 15 +++ .../v2/mypage/notice/LatestNoticeApiTest.kt | 92 +++++++++++++++++++ 4 files changed, 111 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/kr/co/vividnext/sodalive/v2/mypage/notice/LatestNoticeResponse.kt create mode 100644 app/src/test/java/kr/co/vividnext/sodalive/v2/mypage/notice/LatestNoticeApiTest.kt diff --git a/app/src/main/java/kr/co/vividnext/sodalive/settings/notice/NoticeApi.kt b/app/src/main/java/kr/co/vividnext/sodalive/settings/notice/NoticeApi.kt index df7f28e3..8642c0d4 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/settings/notice/NoticeApi.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/settings/notice/NoticeApi.kt @@ -2,6 +2,7 @@ package kr.co.vividnext.sodalive.settings.notice import io.reactivex.rxjava3.core.Single import kr.co.vividnext.sodalive.common.ApiResponse +import kr.co.vividnext.sodalive.v2.mypage.notice.LatestNoticeResponse import retrofit2.http.GET import retrofit2.http.Header import retrofit2.http.Query @@ -15,6 +16,6 @@ interface NoticeApi { @Header("Authorization") authHeader: String ): Single> - @GET("/notice/latest") - fun getLatestNotice(): Single> + @GET("/api/v2/notices/latest") + fun getLatestNotices(): Single>> } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/settings/notice/NoticeRepository.kt b/app/src/main/java/kr/co/vividnext/sodalive/settings/notice/NoticeRepository.kt index 30dc7c10..d5a56bf0 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/settings/notice/NoticeRepository.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/settings/notice/NoticeRepository.kt @@ -13,5 +13,5 @@ class NoticeRepository(private val api: NoticeApi) { return api.getNotices(TimeZone.getDefault().id, page, size, authHeader = token) } - fun getLatestNotice() = api.getLatestNotice() + fun getLatestNotices() = api.getLatestNotices() } diff --git a/app/src/main/java/kr/co/vividnext/sodalive/v2/mypage/notice/LatestNoticeResponse.kt b/app/src/main/java/kr/co/vividnext/sodalive/v2/mypage/notice/LatestNoticeResponse.kt new file mode 100644 index 00000000..f3046da9 --- /dev/null +++ b/app/src/main/java/kr/co/vividnext/sodalive/v2/mypage/notice/LatestNoticeResponse.kt @@ -0,0 +1,15 @@ +package kr.co.vividnext.sodalive.v2.mypage.notice + +import androidx.annotation.Keep +import com.google.gson.annotations.SerializedName +import kr.co.vividnext.sodalive.settings.notice.NoticeItem + +@Keep +data class LatestNoticeResponse( + @SerializedName("id") val id: Long, + @SerializedName("title") val title: String, + @SerializedName("content") val content: String, + @SerializedName("date") val date: String +) { + fun toNoticeItem() = NoticeItem(title, content, date) +} diff --git a/app/src/test/java/kr/co/vividnext/sodalive/v2/mypage/notice/LatestNoticeApiTest.kt b/app/src/test/java/kr/co/vividnext/sodalive/v2/mypage/notice/LatestNoticeApiTest.kt new file mode 100644 index 00000000..7b25ea7b --- /dev/null +++ b/app/src/test/java/kr/co/vividnext/sodalive/v2/mypage/notice/LatestNoticeApiTest.kt @@ -0,0 +1,92 @@ +package kr.co.vividnext.sodalive.v2.mypage.notice + +import io.reactivex.rxjava3.schedulers.Schedulers +import kr.co.vividnext.sodalive.settings.notice.NoticeApi +import kr.co.vividnext.sodalive.settings.notice.NoticeRepository +import okhttp3.OkHttpClient +import okhttp3.Protocol +import okhttp3.Request +import okhttp3.Response +import okhttp3.ResponseBody.Companion.toResponseBody +import okhttp3.MediaType.Companion.toMediaType +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Assert.assertTrue +import org.junit.Test +import retrofit2.Retrofit +import retrofit2.adapter.rxjava3.RxJava3CallAdapterFactory +import retrofit2.converter.gson.GsonConverterFactory +import retrofit2.http.GET + +class LatestNoticeApiTest { + @Test + fun `최신 공지는 파라미터 없는 v2 GET을 사용한다`() { + val method = NoticeApi::class.java.declaredMethods.single { it.name.startsWith("getLatestNotice") } + assertEquals("/api/v2/notices/latest", method.getAnnotation(GET::class.java)!!.value) + assertEquals("getLatestNotices", method.name) + assertEquals(0, method.parameterCount) + assertEquals(listOf(GET::class.java), method.annotations.map { it.annotationClass.java }) + } + + @Test + fun `0개 배열을 그대로 전달한다`() = assertArray(0) + + @Test + fun `1개 배열을 그대로 전달한다`() = assertArray(1) + + @Test + fun `2개 배열은 서버 순서를 유지한다`() = assertArray(2) + + @Test + fun `3개 배열은 Long 식별자와 서버 순서를 유지한다`() = assertArray(3) + + @Test + fun `상세 payload는 제목 HTML 본문 날짜 원문 전체를 보존한다`() { + val notice = LatestNoticeResponse(3_000_000_001L, " 공지 & 제목 ", "

원문
전체 & 본문

", "2026-10-28") + val item = notice.toNoticeItem() + assertEquals(" 공지 & 제목 ", item.title) + assertEquals("

원문
전체 & 본문

", item.content) + assertEquals("2026-10-28", item.date) + } + + private fun assertArray(count: Int) { + val ids = listOf(3_000_000_001L, 2L, 9L).take(count) + val data = ids.joinToString(",") { + """{"id":$it,"title":" 공지 & 제목 $it ","content":"

원문
전체 & 본문

","date":"2026-10-28"}""" + } + listOf("", ",\"message\":null,\"errorProperty\":null").forEach { nullableFields -> + var request: Request? = null + val client = OkHttpClient.Builder().addInterceptor { chain -> + request = chain.request() + Response.Builder() + .request(chain.request()) + .protocol(Protocol.HTTP_1_1) + .code(200) + .message("OK") + .body("""{"success":true,"data":[$data]$nullableFields}""".toResponseBody("application/json".toMediaType())) + .build() + }.build() + val api = Retrofit.Builder() + .baseUrl("https://example.invalid/") + .client(client) + .addConverterFactory(GsonConverterFactory.create()) + .addCallAdapterFactory(RxJava3CallAdapterFactory.createWithScheduler(Schedulers.trampoline())) + .build().create(NoticeApi::class.java) + val response = NoticeRepository(api).getLatestNotices().blockingGet() + assertTrue(response.success) + assertNull(response.message) + assertNull(response.errorProperty) + assertEquals(ids, response.data!!.map { it.id }) + response.data.forEach { + assertEquals(" 공지 & 제목 ${it.id} ", it.title) + assertEquals("

원문
전체 & 본문

", it.content) + assertEquals("2026-10-28", it.date) + } + assertEquals("GET", request!!.method) + assertEquals("/api/v2/notices/latest", request!!.url.encodedPath) + assertNull(request!!.url.query) + assertNull(request!!.body) + assertNull(request!!.header("Authorization")) + } + } +}