Refactor/#861 network view model 적용

android/2023-emmsale/app/proguard-rules.pro

@@ -9,4 +9,4 @@
 -keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
 
 # ApiResponse 클래스 축소 및 난독화 해제하여 CallAdapter에서 retrofit2.Call<ApiResponse>를 반환하는 CallAdapter 만들 수 있도록 변경
--keep class com.emmsale.data.common.retrofit.callAdapter.ApiResponse
+-keepnames class com.emmsale.data.common.retrofit.callAdapter.ApiResponse

android/2023-emmsale/app/src/main/AndroidManifest.xml

@@ -40,15 +40,17 @@
         </activity>
         <activity android:name=".presentation.ui.myRecruitmentList.MyRecruitmentActivity" />
         <activity android:name=".presentation.ui.notificationTagConfig.NotificationTagConfigActivity" />
+        <activity android:name=".presentation.ui.notificationList.NotificationsActivity" />
         <activity android:name=".presentation.ui.myCommentList.MyCommentsActivity" />
-        <activity android:name=".presentation.ui.blockMemberList.MemberBlockActivity" />
+        <activity android:name=".presentation.ui.blockMemberList.BlockedMembersActivity" />
         <activity android:name=".presentation.ui.notificationConfig.NotificationConfigActivity" />
-        <activity android:name=".presentation.ui.recruitmentWriting.RecruitmentPostWritingActivity" />
-        <activity android:name=".presentation.ui.recruitmentDetail.RecruitmentPostDetailActivity" />
+        <activity
+            android:name=".presentation.ui.recruitmentWriting.RecruitmentWritingActivity"
+            android:windowSoftInputMode="adjustResize" />
+        <activity android:name=".presentation.ui.recruitmentDetail.RecruitmentDetailActivity" />
         <activity android:name=".presentation.ui.editMyProfile.EditMyProfileActivity" />
         <activity android:name=".presentation.ui.profile.ProfileActivity" />
-        <activity android:name=".presentation.ui.notificationPageList.NotificationBoxActivity" />
-        <activity android:name=".presentation.ui.childCommentList.ChildCommentActivity" />
+        <activity android:name=".presentation.ui.childCommentList.ChildCommentsActivity" />
         <activity android:name=".presentation.ui.useTerm.UseTermWebViewActivity" />
         <activity android:name=".presentation.ui.conferenceFilter.ConferenceFilterActivity" />
         <activity android:name=".presentation.ui.competitionFilter.CompetitionFilterActivity" />

android/2023-emmsale/app/src/main/java/com/emmsale/data/apiModel/response/BlockedMemberResponse.kt

@@ -6,7 +6,7 @@ import kotlinx.serialization.Serializable
 @Serializable
 data class BlockedMemberResponse(
     @SerialName("blockMemberId")
-    val id: Long,
+    val blockedMemberId: Long,
     @SerialName("id")
     val blockId: Long,
     @SerialName("memberName")

android/2023-emmsale/app/src/main/java/com/emmsale/data/common/retrofit/callAdapter/KerdyCall.kt

@@ -20,7 +20,7 @@ class KerdyCall<T : Any>(
                 val apiResult = when {
                     !result.isSuccessful -> Failure(result.code(), result.errorBody()?.string())
                     responseType == Unit::class.java -> Success(Unit as T, result.headers())
-                    result.body() == null -> Unexpected(IllegalStateException(NOT_EXIST_BODY))
+                    result.body() == null -> Unexpected(Throwable(NOT_EXIST_BODY))
                     else -> Success(result.body()!!, result.headers())
                 }
                 callback.onResponse(this@KerdyCall, Response.success(apiResult))

android/2023-emmsale/app/src/main/java/com/emmsale/data/mapper/BlockedMemberMapper.kt

@@ -6,7 +6,7 @@ import com.emmsale.data.model.BlockedMember
 fun List<BlockedMemberResponse>.toData(): List<BlockedMember> = map(BlockedMemberResponse::toData)
 
 fun BlockedMemberResponse.toData(): BlockedMember = BlockedMember(
-    id = id,
+    blockedMemberId = blockedMemberId,
     memberName = memberName,
     blockId = blockId,
     profileImageUrl = profileImageUrl,

android/2023-emmsale/app/src/main/java/com/emmsale/data/mapper/NotificationMapper.kt

@@ -4,28 +4,34 @@ import com.emmsale.data.apiModel.response.CommentTypeNotificationResponse
 import com.emmsale.data.apiModel.response.EventTypeNotificationResponse
 import com.emmsale.data.apiModel.response.NotificationResponse
 import com.emmsale.data.apiModel.response.NotificationResponse.NotificationType
-import com.emmsale.data.model.updatedNotification.ChildCommentNotification
-import com.emmsale.data.model.updatedNotification.InterestEventNotification
-import com.emmsale.data.model.updatedNotification.UpdatedNotification
+import com.emmsale.data.model.Comment
+import com.emmsale.data.model.Event
+import com.emmsale.data.model.Feed
+import com.emmsale.data.model.Member
+import com.emmsale.data.model.notification.ChildCommentNotification
+import com.emmsale.data.model.notification.InterestEventNotification
+import com.emmsale.data.model.notification.Notification
 import kotlinx.serialization.json.Json
 import java.time.LocalDateTime
 import java.time.format.DateTimeFormatter
 
 @JvmName("NotificationResponse")
-fun List<NotificationResponse>.toData(): List<UpdatedNotification> = map { it.toData() }
+fun List<NotificationResponse>.toData(): List<Notification> = map { it.toData() }
 
-fun NotificationResponse.toData(): UpdatedNotification = when (notificationType) {
+fun NotificationResponse.toData(): Notification = when (notificationType) {
     NotificationType.EVENT -> {
         val eventNotificationInformation = Json.decodeFromString<EventTypeNotificationResponse>(
             requireNotNull(extraNotificationInformation) { "이벤트 알림에 추가 정보가 없어요" },
         )
         InterestEventNotification(
             id = notificationId,
             receiverId = receiverId,
-            eventId = redirectId,
             createdAt = createdAt.toLocalDateTime(),
             isRead = isRead,
-            eventTitle = eventNotificationInformation.eventTitle,
+            event = Event(
+                id = redirectId,
+                name = eventNotificationInformation.eventTitle,
+            ),
         )
     }
 
@@ -40,11 +46,13 @@ fun NotificationResponse.toData(): UpdatedNotification = when (notificationType)
             receiverId = receiverId,
             createdAt = createdAt.toLocalDateTime(),
             isRead = isRead,
-            parentCommentId = commentNotificationInformation.parentId,
-            childCommentId = redirectId,
-            childCommentContent = commentNotificationInformation.content,
-            feedId = commentNotificationInformation.feedId,
-            commentProfileImageUrl = commentNotificationInformation.writerProfileImageUrl,
+            comment = Comment(
+                id = redirectId,
+                content = commentNotificationInformation.content,
+                parentCommentId = commentNotificationInformation.parentId,
+                feed = Feed(id = commentNotificationInformation.feedId),
+                writer = Member(profileImageUrl = commentNotificationInformation.writerProfileImageUrl),
+            ),
         )
     }
 }

android/2023-emmsale/app/src/main/java/com/emmsale/data/model/BlockedMember.kt

@@ -1,7 +1,7 @@
 package com.emmsale.data.model
 
 data class BlockedMember(
-    val id: Long,
+    val blockedMemberId: Long,
     val memberName: String,
     val blockId: Long,
     val profileImageUrl: String,

android/2023-emmsale/app/src/main/java/com/emmsale/data/model/Comment.kt

@@ -12,4 +12,6 @@ data class Comment(
     val updatedAt: LocalDateTime = LocalDateTime.MAX,
     val isDeleted: Boolean = false,
     val childComments: List<Comment> = emptyList(),
-)
+) {
+    val isUpdated: Boolean = createdAt != updatedAt
+}

android/2023-emmsale/app/src/main/java/com/emmsale/data/model/Config.kt

@@ -2,7 +2,6 @@ package com.emmsale.data.model
 
 data class Config(
     val isNotificationReceive: Boolean,
-    val isFollowNotificationReceive: Boolean,
     val isCommentNotificationReceive: Boolean,
     val isInterestEventNotificationReceive: Boolean,
     val isMessageNotificationReceive: Boolean,

android/2023-emmsale/app/src/main/java/com/emmsale/data/model/Event.kt

@@ -3,7 +3,7 @@ package com.emmsale.data.model
 import java.time.LocalDateTime
 
 data class Event(
-    val id: Long,
+    val id: Long = -1,
     val name: String = "",
     val informationUrl: String = "",
     val organization: String? = null,

android/2023-emmsale/app/src/main/java/com/emmsale/data/model/Feed.kt

@@ -14,4 +14,6 @@ data class Feed(
     val updatedAt: LocalDateTime = LocalDateTime.MAX,
 ) {
     val titleImageUrl = imageUrls.firstOrNull()
+
+    val isUpdated = createdAt != updatedAt
 }

android/2023-emmsale/app/src/main/java/com/emmsale/data/model/Recruitment.kt

@@ -3,9 +3,9 @@ package com.emmsale.data.model
 import java.time.LocalDate
 
 data class Recruitment(
-    val id: Long,
-    val writer: Member,
-    val event: Event,
-    val content: String,
-    val updatedDate: LocalDate,
+    val id: Long = -1,
+    val writer: Member = Member(),
+    val event: Event = Event(),
+    val content: String = "",
+    val updatedDate: LocalDate = LocalDate.MAX,
 )

android/2023-emmsale/app/src/main/java/com/emmsale/data/model/updatedNotification/ChildCommentNotification.kt → android/2023-emmsale/app/src/main/java/com/emmsale/data/model/notification/ChildCommentNotification.kt

@@ -1,18 +1,15 @@
-package com.emmsale.data.model.updatedNotification
+package com.emmsale.data.model.notification
 
+import com.emmsale.data.model.Comment
 import java.time.LocalDateTime
 
 class ChildCommentNotification(
     id: Long,
     receiverId: Long,
     createdAt: LocalDateTime,
     isRead: Boolean,
-    val parentCommentId: Long,
-    val childCommentId: Long,
-    val childCommentContent: String,
-    val feedId: Long,
-    val commentProfileImageUrl: String,
-) : UpdatedNotification(
+    val comment: Comment,
+) : Notification(
     id = id,
     receiverId = receiverId,
     createdAt = createdAt,

android/2023-emmsale/app/src/main/java/com/emmsale/data/model/updatedNotification/InterestEventNotification.kt → android/2023-emmsale/app/src/main/java/com/emmsale/data/model/notification/InterestEventNotification.kt

@@ -1,15 +1,15 @@
-package com.emmsale.data.model.updatedNotification
+package com.emmsale.data.model.notification
 
+import com.emmsale.data.model.Event
 import java.time.LocalDateTime
 
 class InterestEventNotification(
     id: Long,
     receiverId: Long,
     createdAt: LocalDateTime,
     isRead: Boolean,
-    val eventId: Long,
-    val eventTitle: String,
-) : UpdatedNotification(
+    val event: Event,
+) : Notification(
     id = id,
     receiverId = receiverId,
     createdAt = createdAt,

android/2023-emmsale/app/src/main/java/com/emmsale/data/model/notification/Notification.kt

@@ -0,0 +1,29 @@
+package com.emmsale.data.model.notification
+
+import java.time.LocalDateTime
+
+sealed class Notification(
+    val id: Long,
+    val receiverId: Long,
+    val createdAt: LocalDateTime,
+    val isRead: Boolean,
+) {
+
+    fun read(): Notification = when (this) {
+        is ChildCommentNotification -> ChildCommentNotification(
+            id = id,
+            receiverId = receiverId,
+            createdAt = createdAt,
+            isRead = true,
+            comment = comment,
+        )
+
+        is InterestEventNotification -> InterestEventNotification(
+            id = id,
+            receiverId = receiverId,
+            createdAt = createdAt,
+            isRead = true,
+            event = event,
+        )
+    }
+}

android/2023-emmsale/app/src/main/java/com/emmsale/data/repository/concretes/DefaultConfigRepository.kt

@@ -15,10 +15,6 @@ class DefaultConfigRepository @Inject constructor(
             KEY_NOTIFICATION_RECEIVE,
             DEFAULT_VALUE_NOTIFICATION_RECEIVE,
         ),
-        isFollowNotificationReceive = preference.getBoolean(
-            KEY_FOLLOW_NOTIFICATION_RECEIVE,
-            DEFAULT_VALUE_FOLLOW_NOTIFICATION_RECEIVE,
-        ),
         isCommentNotificationReceive = preference.getBoolean(
             KEY_CHILD_COMMENT_NOTIFICATION_RECEIVE,
             DEFAULT_VALUE_CHILD_COMMENT_NOTIFICATION_RECEIVE,
@@ -41,10 +37,6 @@ class DefaultConfigRepository @Inject constructor(
         preferenceEditor.putBoolean(KEY_NOTIFICATION_RECEIVE, isReceive).commit()
     }
 
-    override fun saveFollowNotificationReceiveConfig(isReceive: Boolean) {
-        preferenceEditor.putBoolean(KEY_FOLLOW_NOTIFICATION_RECEIVE, isReceive).commit()
-    }
-
     override fun saveCommentNotificationReceiveConfig(isReceive: Boolean) {
         preferenceEditor.putBoolean(KEY_CHILD_COMMENT_NOTIFICATION_RECEIVE, isReceive).commit()
     }
@@ -68,9 +60,6 @@ class DefaultConfigRepository @Inject constructor(
         private const val KEY_AUTO_LOGIN = "auto_login_key"
         private const val DEFAULT_VALUE_AUTO_LOGIN = false
 
-        private const val KEY_FOLLOW_NOTIFICATION_RECEIVE = "follow_notification_receive_key"
-        private const val DEFAULT_VALUE_FOLLOW_NOTIFICATION_RECEIVE = true
-
         private const val KEY_CHILD_COMMENT_NOTIFICATION_RECEIVE =
             "child_comment_notification_receive_key"
         private const val DEFAULT_VALUE_CHILD_COMMENT_NOTIFICATION_RECEIVE = true

android/2023-emmsale/app/src/main/java/com/emmsale/data/repository/concretes/DefaultEventRepository.kt

@@ -103,7 +103,7 @@ class DefaultEventRepository @Inject constructor(
         )
     }
 
-    override suspend fun deleteScrap(eventId: Long): ApiResponse<Unit> {
+    override suspend fun scrapOffEvent(eventId: Long): ApiResponse<Unit> {
         return eventService.deleteScrap(eventId)
     }
 

android/2023-emmsale/app/src/main/java/com/emmsale/data/repository/concretes/DefaultNotificationRepository.kt

@@ -1,11 +1,10 @@
 package com.emmsale.data.repository.concretes
 
 import com.emmsale.data.apiModel.request.NotificationListDeleteRequest
-import com.emmsale.data.apiModel.request.RecruitmentNotificationReportCreateRequest
 import com.emmsale.data.apiModel.response.NotificationResponse
 import com.emmsale.data.common.retrofit.callAdapter.ApiResponse
 import com.emmsale.data.mapper.toData
-import com.emmsale.data.model.updatedNotification.UpdatedNotification
+import com.emmsale.data.model.notification.Notification
 import com.emmsale.data.repository.interfaces.NotificationRepository
 import com.emmsale.data.service.NotificationService
 import com.emmsale.di.modules.other.IoDispatcher
@@ -18,45 +17,25 @@ class DefaultNotificationRepository @Inject constructor(
     private val notificationService: NotificationService,
 ) : NotificationRepository {
 
-    override suspend fun updateNotificationReadStatus(
-        notificationId: Long,
-    ): ApiResponse<Unit> = withContext(dispatcher) {
-        notificationService.updateRecruitmentNotificationReadStatus(notificationId)
-    }
-
-    override suspend fun getUpdatedNotifications(
+    override suspend fun getNotifications(
         memberId: Long,
-    ): ApiResponse<List<UpdatedNotification>> = withContext(dispatcher) {
+    ): ApiResponse<List<Notification>> = withContext(dispatcher) {
         notificationService
             .getNotifications(memberId)
             .map(List<NotificationResponse>::toData)
     }
 
-    override suspend fun updateUpdatedNotificationReadStatus(
+    override suspend fun readNotification(
         notificationId: Long,
     ): ApiResponse<Unit> = withContext(dispatcher) {
-        notificationService.updateNotificationReadStatus(notificationId)
+        notificationService.readNotification(notificationId)
     }
 
-    override suspend fun deleteUpdatedNotifications(
+    override suspend fun deleteNotifications(
         notificationIds: List<Long>,
     ): ApiResponse<Unit> = withContext(dispatcher) {
         notificationService.deleteNotification(
             NotificationListDeleteRequest(notificationIds),
         )
     }
-
-    override suspend fun reportRecruitmentNotification(
-        recruitmentNotificationId: Long,
-        senderId: Long,
-        reporterId: Long,
-    ): ApiResponse<Unit> = withContext(dispatcher) {
-        notificationService.reportRecruitmentNotification(
-            RecruitmentNotificationReportCreateRequest.create(
-                recruitmentNotificationId = recruitmentNotificationId,
-                senderId = senderId,
-                reporterId = reporterId,
-            ),
-        ).map { }
-    }
 }

android/2023-emmsale/app/src/main/java/com/emmsale/data/repository/interfaces/ConfigRepository.kt

@@ -10,8 +10,6 @@ interface ConfigRepository {
 
     fun saveAutoLoginConfig(isAutoLogin: Boolean)
 
-    fun saveFollowNotificationReceiveConfig(isReceive: Boolean)
-
     fun saveCommentNotificationReceiveConfig(isReceive: Boolean)
 
     fun saveInterestEventNotificationReceiveConfig(isReceive: Boolean)

android/2023-emmsale/app/src/main/java/com/emmsale/data/repository/interfaces/EventRepository.kt

@@ -38,7 +38,7 @@ interface EventRepository {
 
     suspend fun scrapEvent(eventId: Long): ApiResponse<Unit>
 
-    suspend fun deleteScrap(eventId: Long): ApiResponse<Unit>
+    suspend fun scrapOffEvent(eventId: Long): ApiResponse<Unit>
 
     suspend fun isScraped(eventId: Long): ApiResponse<Boolean>
 }