Skip to content

Commit a935e33

Browse files
authored
서버 Spring 마이그레이션 대응 (#159)
* URL과 AUTH 수정 * 대소문자 수정
1 parent 6748f01 commit a935e33

File tree

3 files changed

+15
-18
lines changed

3 files changed

+15
-18
lines changed

app/src/main/java/com/wafflestudio/siksha2/di/NetworkModule.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,7 @@ object NetworkModule {
2828
return OkHttpClient.Builder()
2929
.addInterceptor { chain ->
3030
val newRequest = chain.request().newBuilder()
31-
.addHeader(
32-
AUTH_TOKEN_HEADER_KEY,
33-
sikshaPrefObjects.accessToken.getValue()
34-
)
31+
.header(AUTH_TOKEN_HEADER_KEY, sikshaPrefObjects.accessToken.getValue())
3532
.build()
3633
chain.proceed(newRequest)
3734
}
@@ -70,5 +67,5 @@ object NetworkModule {
7067
return retrofit.create(SikshaApi::class.java)
7168
}
7269

73-
private const val AUTH_TOKEN_HEADER_KEY = "authorization-token"
70+
private const val AUTH_TOKEN_HEADER_KEY = "Authorization"
7471
}

app/src/main/java/com/wafflestudio/siksha2/network/SikshaApi.kt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import retrofit2.http.*
1010
import java.time.LocalDate
1111

1212
interface SikshaApi {
13-
@GET("/menus/lo")
13+
@GET("/menus")
1414
suspend fun fetchMenuGroups(
1515
@Query("start_date") startDate: LocalDate,
1616
@Query("end_date") endDate: LocalDate
@@ -25,7 +25,7 @@ interface SikshaApi {
2525
@GET("/menus/festival")
2626
suspend fun isFestivalDate(@Path(value = "input_date") inputDate: String): NetworkResult<FestivalDateCheckResponse>
2727

28-
@GET("/reviews/")
28+
@GET("/reviews")
2929
suspend fun fetchReviews(
3030
@Query("menu_id") menuId: Long,
3131
@Query("page") page: Long,
@@ -40,10 +40,10 @@ interface SikshaApi {
4040
@Query("etc") etc: Boolean = true
4141
): NetworkResult<FetchReviewsResult>
4242

43-
@GET("/restaurants/")
43+
@GET("/restaurants")
4444
suspend fun fetchRestaurants(): NetworkResult<FetchRestaurantsResult>
4545

46-
@POST("/reviews/")
46+
@POST("/reviews")
4747
suspend fun leaveMenuReview(@Body req: LeaveReviewParam): NetworkResult<LeaveReviewResult>
4848

4949
@Multipart
@@ -56,16 +56,16 @@ interface SikshaApi {
5656
): NetworkResult<LeaveReviewResult>
5757

5858
@POST("/auth/login/kakao")
59-
suspend fun loginKakao(@Header("kakao-token") kakaoToken: String): NetworkResult<LoginOAuthResult>
59+
suspend fun loginKakao(@Header("Authorization") kakaoToken: String): NetworkResult<LoginOAuthResult>
6060

6161
@POST("/auth/login/google")
62-
suspend fun loginGoogle(@Header("google-token") googleToken: String): NetworkResult<LoginOAuthResult>
62+
suspend fun loginGoogle(@Header("Authorization") googleToken: String): NetworkResult<LoginOAuthResult>
6363

64-
@DELETE("/auth/")
64+
@DELETE("/auth")
6565
suspend fun deleteAccount()
6666

6767
@POST("/auth/refresh")
68-
suspend fun refreshToken(@Header("authorization-token") token: String): NetworkResult<LoginOAuthResult>
68+
suspend fun refreshToken(@Header("Authorization") token: String): NetworkResult<LoginOAuthResult>
6969

7070
@GET("/reviews/comments/recommendation")
7171
suspend fun fetchRecommendationReviewComments(@Query("score") score: Long):
@@ -80,11 +80,11 @@ interface SikshaApi {
8080
@Body req: VocParam
8181
): NetworkResult<Unit>
8282

83-
@GET("/auth/me/image")
83+
@GET("/auth/me")
8484
suspend fun getUserData(): NetworkResult<GetUserDataResult>
8585

8686
@Multipart
87-
@PATCH("/auth/me/image/profile")
87+
@PATCH("/auth/me/profile")
8888
suspend fun updateUserData(
8989
@Part image: MultipartBody.Part?,
9090
@Part("change_to_default_image") changeToDefaultImage: Boolean,

app/src/main/java/com/wafflestudio/siksha2/network/dto/FetchMenuGroupsResult.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ data class FetchMenuGroupsResult(
1313
@JsonClass(generateAdapter = true)
1414
data class DailyMenuGroupResponse(
1515
@Json(name = "date") val date: String,
16-
@Json(name = "BR") val breakfast: List<MenuGroup>,
17-
@Json(name = "LU") val lunch: List<MenuGroup>,
18-
@Json(name = "DN") val dinner: List<MenuGroup>
16+
@Json(name = "br") val breakfast: List<MenuGroup>,
17+
@Json(name = "lu") val lunch: List<MenuGroup>,
18+
@Json(name = "dn") val dinner: List<MenuGroup>
1919
)
2020
}
2121

0 commit comments

Comments
 (0)