Skip to content

Commit

Permalink
Merge branch 'feat/clustering' of https://github.com/Project-Unifest/…
Browse files Browse the repository at this point in the history
…unifest-android into feat/clustering
  • Loading branch information
wjdtkdgns777 committed Sep 23, 2024
2 parents 949163b + eb29edc commit 9db2479
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package com.unifest.android.core.network.service
import com.unifest.android.core.network.request.BoothWaitingRequest
import com.unifest.android.core.network.request.CheckPinValidationRequest
import com.unifest.android.core.network.request.LikeBoothRequest
import com.unifest.android.core.network.request.WaitingRequest
import com.unifest.android.core.network.request.LikedFestivalRequest
import com.unifest.android.core.network.request.WaitingRequest
import com.unifest.android.core.network.response.AllBoothsResponse
import com.unifest.android.core.network.response.BoothDetailResponse
import com.unifest.android.core.network.response.CheckPinValidationResponse
Expand All @@ -16,8 +16,8 @@ import com.unifest.android.core.network.response.MyWaitingResponse
import com.unifest.android.core.network.response.PopularBoothsResponse
import com.unifest.android.core.network.response.WaitingResponse
import retrofit2.http.Body
import retrofit2.http.DELETE
import retrofit2.http.GET
import retrofit2.http.HTTP
import retrofit2.http.POST
import retrofit2.http.PUT
import retrofit2.http.Path
Expand Down Expand Up @@ -117,7 +117,7 @@ interface UnifestService {
)

// 관심 축제 해제
@DELETE("megaphone/subscribe")
@HTTP(method = "DELETE", path = "megaphone/subscribe", hasBody = true)
suspend fun unregisterLikedFestival(
@Body likedFestivalRequest: LikedFestivalRequest,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.receiveAsFlow
import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import timber.log.Timber
import javax.inject.Inject

@HiltViewModel
Expand Down Expand Up @@ -196,6 +197,7 @@ class FestivalViewModel @Inject constructor(
}
.onFailure { exception ->
_uiEvent.send(FestivalUiEvent.ShowToast(UiText.StringResource(R.string.liked_festival_removed_failed_message)))
Timber.e(exception)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ class MapViewModel @Inject constructor(
try {
val token = messagingRepository.refreshFCMToken()
token?.let {
Timber.d("New FCM token: $it")
messagingRepository.setFCMToken(it)
}
} catch (e: Exception) {
Expand Down

0 comments on commit 9db2479

Please sign in to comment.