Skip to content

서버 Spring 마이그레이션 대응 #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wjshim2003 merged 2 commits into from
Oct 5, 2025
Merged

서버 Spring 마이그레이션 대응 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1054abc
URL과 AUTH 수정
wjshim2003 Oct 4, 2025
913bbe0
대소문자 수정
wjshim2003 Oct 4, 2025
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
7 changes: 2 additions & 5 deletions app/src/main/java/com/wafflestudio/siksha2/di/NetworkModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ object NetworkModule {
return OkHttpClient.Builder()
.addInterceptor { chain ->
val newRequest = chain.request().newBuilder()
.addHeader(
AUTH_TOKEN_HEADER_KEY,
sikshaPrefObjects.accessToken.getValue()
)
.header(AUTH_TOKEN_HEADER_KEY, sikshaPrefObjects.accessToken.getValue())
.build()
chain.proceed(newRequest)
}
Expand Down Expand Up @@ -70,5 +67,5 @@ object NetworkModule {
return retrofit.create(SikshaApi::class.java)
}

private const val AUTH_TOKEN_HEADER_KEY = "authorization-token"
private const val AUTH_TOKEN_HEADER_KEY = "Authorization"
}
20 changes: 10 additions & 10 deletions app/src/main/java/com/wafflestudio/siksha2/network/SikshaApi.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import retrofit2.http.*
import java.time.LocalDate

interface SikshaApi {
@GET("/menus/lo")
@GET("/menus")
suspend fun fetchMenuGroups(
@Query("start_date") startDate: LocalDate,
@Query("end_date") endDate: LocalDate
Expand All @@ -25,7 +25,7 @@ interface SikshaApi {
@GET("/menus/festival")
suspend fun isFestivalDate(@Path(value = "input_date") inputDate: String): NetworkResult<FestivalDateCheckResponse>

@GET("/reviews/")
@GET("/reviews")
suspend fun fetchReviews(
@Query("menu_id") menuId: Long,
@Query("page") page: Long,
Expand All @@ -40,10 +40,10 @@ interface SikshaApi {
@Query("etc") etc: Boolean = true
): NetworkResult<FetchReviewsResult>

@GET("/restaurants/")
@GET("/restaurants")
suspend fun fetchRestaurants(): NetworkResult<FetchRestaurantsResult>

@POST("/reviews/")
@POST("/reviews")
suspend fun leaveMenuReview(@Body req: LeaveReviewParam): NetworkResult<LeaveReviewResult>

@Multipart
Expand All @@ -56,16 +56,16 @@ interface SikshaApi {
): NetworkResult<LeaveReviewResult>

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

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

@DELETE("/auth/")
@DELETE("/auth")
suspend fun deleteAccount()

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

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

@GET("/auth/me/image")
@GET("/auth/me")
suspend fun getUserData(): NetworkResult<GetUserDataResult>

@Multipart
@PATCH("/auth/me/image/profile")
@PATCH("/auth/me/profile")
suspend fun updateUserData(
@Part image: MultipartBody.Part?,
@Part("change_to_default_image") changeToDefaultImage: Boolean,
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/com/wafflestudio/siksha2/network/dto/FetchMenuGroupsResult.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ data class FetchMenuGroupsResult(
@JsonClass(generateAdapter = true)
data class DailyMenuGroupResponse(
@Json(name = "date") val date: String,
@Json(name = "BR") val breakfast: List<MenuGroup>,
@Json(name = "LU") val lunch: List<MenuGroup>,
@Json(name = "DN") val dinner: List<MenuGroup>
@Json(name = "br") val breakfast: List<MenuGroup>,
@Json(name = "lu") val lunch: List<MenuGroup>,
@Json(name = "dn") val dinner: List<MenuGroup>
)
}

Expand Down
Loading