diff --git a/ThinkerBell/data/src/main/java/com/neverland/data/remote/model/alarm/AlarmDTO.kt b/ThinkerBell/data/src/main/java/com/neverland/data/remote/model/alarm/AlarmDTO.kt index 28eeb51..0abd300 100644 --- a/ThinkerBell/data/src/main/java/com/neverland/data/remote/model/alarm/AlarmDTO.kt +++ b/ThinkerBell/data/src/main/java/com/neverland/data/remote/model/alarm/AlarmDTO.kt @@ -5,6 +5,8 @@ import com.google.gson.annotations.SerializedName data class AlarmDTO( @SerializedName("id") val id: Int, + @SerializedName("categoryId") + val categoryId: Int, @SerializedName("marked") val marked: Boolean, @SerializedName("noticeTypeEnglish") @@ -12,11 +14,11 @@ data class AlarmDTO( @SerializedName("noticeTypeKorean") val noticeTypeKorean: String, @SerializedName("pubDate") - val pubDate: String, + val pubDate: String?, @SerializedName("title") val title: String, @SerializedName("url") - val url: String, + val url: String?, @SerializedName("viewed") val viewed: Boolean ) \ No newline at end of file diff --git a/ThinkerBell/data/src/main/java/com/neverland/data/repository/AlarmRepositoryImpl.kt b/ThinkerBell/data/src/main/java/com/neverland/data/repository/AlarmRepositoryImpl.kt index 67fe735..4eee42f 100644 --- a/ThinkerBell/data/src/main/java/com/neverland/data/repository/AlarmRepositoryImpl.kt +++ b/ThinkerBell/data/src/main/java/com/neverland/data/repository/AlarmRepositoryImpl.kt @@ -24,12 +24,13 @@ class AlarmRepositoryImpl @Inject constructor( data?.map { Alarm( id = it.id, + categoryId = it.categoryId, title = it.title, noticeTypeKorean = it.noticeTypeKorean, noticeTypeEnglish = it.noticeTypeEnglish, viewed = it.viewed, - pubDate = it.pubDate, - url = it.url, + pubDate = it.pubDate?:"", + url = it.url?:"https://www.mju.ac.kr/mjukr/index.do", marked = it.marked ) } ?: emptyList() diff --git a/ThinkerBell/domain/src/main/java/com/neverland/domain/model/alarm/Alarm.kt b/ThinkerBell/domain/src/main/java/com/neverland/domain/model/alarm/Alarm.kt index 7d04d73..ee06fdb 100644 --- a/ThinkerBell/domain/src/main/java/com/neverland/domain/model/alarm/Alarm.kt +++ b/ThinkerBell/domain/src/main/java/com/neverland/domain/model/alarm/Alarm.kt @@ -2,6 +2,7 @@ package com.neverland.domain.model.alarm data class Alarm ( val id: Int, + val categoryId: Int, val marked: Boolean, val noticeTypeEnglish: String, val noticeTypeKorean: String, diff --git a/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/alarm/AlarmNoticeFragment.kt b/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/alarm/AlarmNoticeFragment.kt index 9510ed4..98e86bc 100644 --- a/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/alarm/AlarmNoticeFragment.kt +++ b/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/alarm/AlarmNoticeFragment.kt @@ -59,9 +59,9 @@ class AlarmNoticeFragment : BaseFragment() { }?: NoticeType.NORMAL_NOTICE LoggerUtil.d(item.first.noticeTypeEnglish) if (item.second) { - alarmNoticeViewModel.postBookmark(noticeType, item.first.id) + alarmNoticeViewModel.postBookmark(noticeType, item.first.categoryId) } else { - alarmNoticeViewModel.deleteBookmark(noticeType, item.first.id) + alarmNoticeViewModel.deleteBookmark(noticeType, item.first.categoryId) } } }) @@ -91,7 +91,7 @@ class AlarmNoticeFragment : BaseFragment() { } is UiState.Error -> { // Handle error state - LoggerUtil.d(state.exception.message.toString()) + LoggerUtil.e("$keyword ${state.exception.message}") } UiState.Empty -> { diff --git a/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/alarm/adapter/AlarmNoticeAdapter.kt b/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/alarm/adapter/AlarmNoticeAdapter.kt index c12f094..eb990d2 100644 --- a/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/alarm/adapter/AlarmNoticeAdapter.kt +++ b/ThinkerBell/presentation/src/main/java/com/neverland/thinkerbell/view/alarm/adapter/AlarmNoticeAdapter.kt @@ -65,7 +65,7 @@ class AlarmNoticeAdapter : ListAdapter() { override fun areItemsTheSame(oldItem: Alarm, newItem: Alarm): Boolean { - return oldItem.url == newItem.url + return oldItem.id == newItem.id } override fun areContentsTheSame(oldItem: Alarm, newItem: Alarm): Boolean {