Feature/android/#35 join event : 일정 참여, 일정 멤버 자세히 보기, 알림 화면 구현

android/app/src/main/java/com/teameetmeet/meetmeet/data/ExceptionHandler.kt

@@ -7,6 +7,7 @@ class NoDataException : Exception() //데이터 요청 시 반환되는 데이
 class ExpiredTokenException(): Exception()
 class ExpiredRefreshTokenException(): Exception() // refreshToken 만료인 경우
 
+
 fun Throwable.toException(): Throwable {
  return when(this) {
  is HttpException -> {

android/app/src/main/java/com/teameetmeet/meetmeet/data/model/EventMember.kt

@@ -1,8 +1,43 @@
 package com.teameetmeet.meetmeet.data.model
 
+import android.os.Parcel
+import android.os.Parcelable
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
 data class EventMember(
+ @Json(name = "id")
  val id: Int,
+ @Json(name = "nickname")
  val nickname: String,
+ @Json(name = "profile")
  val profile: String
+) : Parcelable {
+ constructor(parcel: Parcel) : this(
+ parcel.readInt(),
+ parcel.readString().toString(),
+ parcel.readString().toString()
+ ) {
+ }
+
+ override fun describeContents(): Int {
+ return id
+ }
+
+ override fun writeToParcel(parcel: Parcel, flags: Int) {
+ parcel.writeInt(id)
+ parcel.writeString(nickname)
+ parcel.writeString(profile)
+ }
+
+ companion object CREATOR : Parcelable.Creator<EventMember> {
+ override fun createFromParcel(parcel: Parcel): EventMember {
+ return EventMember(parcel)
+ }
 
-)
+ override fun newArray(size: Int): Array<EventMember?> {
+ return arrayOfNulls(size)
+ }
+ }
+}

android/app/src/main/java/com/teameetmeet/meetmeet/data/model/UserWithFollowStatus.kt

@@ -0,0 +1,17 @@
+package com.teameetmeet.meetmeet.data.model
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class UserWithFollowStatus(
+ @Json(name = "id")
+ val id: Int,
+ @Json(name = "nickname")
+ val nickname: String,
+ @Json(name = "profile")
+ val profile: String,
+ @Json(name = "isFollowed")
+ val isFollowed: Boolean,
+ val isMe: Boolean = false
+)

android/app/src/main/java/com/teameetmeet/meetmeet/data/network/api/EventStoryApi.kt

@@ -27,6 +27,9 @@ interface EventStoryApi {
  @POST()
  suspend fun editNotification(@Body singleStringRequest: KakaoLoginRequest)
 
+ @POST("event/schedule/join/{eventId}")
+ suspend fun joinEventStory(@Path("eventId") eventId: Int)
+
  @DELETE("event/{eventId}")
  suspend fun deleteEventStory(
  @Path("eventId") id: String,

android/app/src/main/java/com/teameetmeet/meetmeet/data/network/api/FollowApi.kt

@@ -0,0 +1,16 @@
+package com.teameetmeet.meetmeet.data.network.api
+
+import com.teameetmeet.meetmeet.data.network.entity.FollowRequest
+import retrofit2.http.Body
+import retrofit2.http.DELETE
+import retrofit2.http.POST
+import retrofit2.http.Query
+
+interface FollowApi {
+
+ @POST("follow")
+ suspend fun follow(@Body followRequest: FollowRequest)
+
+ @DELETE("follow/follow")
+ suspend fun unFollow(@Query("userId") userId: Int)
+}

android/app/src/main/java/com/teameetmeet/meetmeet/data/network/api/UserApi.kt

@@ -1,6 +1,7 @@
 package com.teameetmeet.meetmeet.data.network.api
 
 import com.teameetmeet.meetmeet.data.model.UserProfile
+import com.teameetmeet.meetmeet.data.model.UserWithFollowStatus
 import com.teameetmeet.meetmeet.data.network.entity.AvailableResponse
 import com.teameetmeet.meetmeet.data.network.entity.PasswordChangeRequest
 import okhttp3.MultipartBody
@@ -24,6 +25,9 @@ interface UserApi {
  @GET("auth/check/nickname")
  suspend fun checkNickNameDuplication(@Query("nickname") nickname: String): AvailableResponse
 
+ @GET("user/search")
+ suspend fun getUserWithFollowStatus(@Query("nickname") nickname: String): UserWithFollowStatus
+
  @PATCH("user/account")
  suspend fun patchPassword(@Body passwordChangeRequest: PasswordChangeRequest): UserProfile
 

android/app/src/main/java/com/teameetmeet/meetmeet/data/network/di/NetworkModule.kt

@@ -5,6 +5,7 @@ import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import com.teameetmeet.meetmeet.data.network.api.AuthApi
 import com.teameetmeet.meetmeet.data.network.api.CalendarApi
 import com.teameetmeet.meetmeet.data.network.api.EventStoryApi
+import com.teameetmeet.meetmeet.data.network.api.FollowApi
 import com.teameetmeet.meetmeet.data.network.api.LoginApi
 import com.teameetmeet.meetmeet.data.network.api.UserApi
 import com.teameetmeet.meetmeet.data.repository.TokenRepository
@@ -135,4 +136,9 @@ class NetworkModule {
  fun provideEventStoryApi(@Named("retrofitWithAuth") retrofit: Retrofit): EventStoryApi
  = retrofit.create(EventStoryApi::class.java)
 
+ @Singleton
+ @Provides
+ fun provideFollowApi(@Named("retrofitWithAuth") retrofit: Retrofit): FollowApi
+ = retrofit.create(FollowApi::class.java)
+
 }

android/app/src/main/java/com/teameetmeet/meetmeet/data/network/entity/FollowRequest.kt

@@ -0,0 +1,10 @@
+package com.teameetmeet.meetmeet.data.network.entity
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class FollowRequest(
+ @Json(name = "userId")
+ val userId: Int
+)

android/app/src/main/java/com/teameetmeet/meetmeet/data/repository/EventStoryRepository.kt

@@ -38,7 +38,6 @@ class EventStoryRepository @Inject constructor(
  }.catch {
  throw it.toException()
  }
- //TODO("이벤트 세부 정보 가져오고 로컬에 이벤트가 있으면 색과 알림 가져오기 아니면 DEFAULT 색 일정으로 파싱해서 내리기")
  }
 
  fun deleteEventStory(id: Int, isAll: Boolean = false): Flow<Unit> {
@@ -94,7 +93,7 @@ class EventStoryRepository @Inject constructor(
  .map {
  eventStoryApi.editNotification(KakaoLoginRequest(message))
  }.catch {
- throw it
+ throw it.toException()
  }
  }
 
@@ -114,4 +113,12 @@ class EventStoryRepository @Inject constructor(
  }
  }
 
+ fun joinEventStory(eventId: Int): Flow<Unit> {
+ return flowOf(true).map {
+ eventStoryApi.joinEventStory(eventId)
+ }.catch {
+ throw it.toException()
+ }
+ }
+
 }

android/app/src/main/java/com/teameetmeet/meetmeet/data/repository/FollowRepository.kt

@@ -0,0 +1,33 @@
+package com.teameetmeet.meetmeet.data.repository
+
+import com.teameetmeet.meetmeet.data.network.api.FollowApi
+import com.teameetmeet.meetmeet.data.network.entity.FollowRequest
+import com.teameetmeet.meetmeet.data.toException
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.flow.map
+import javax.inject.Inject
+
+class FollowRepository @Inject constructor(
+ private val followApi: FollowApi
+) {
+
+ fun follow(userId: Int): Flow<Unit> {
+ return flowOf(true)
+ .map{
+ followApi.follow(FollowRequest(userId = userId))
+ }.catch {
+ throw it.toException()
+ }
+ }
+
+ fun unFollow(userId: Int): Flow<Unit> {
+ return flowOf(true)
+ .map {
+ followApi.unFollow(userId = userId)
+ }.catch {
+ throw it.toException()
+ }
+ }
+}

android/app/src/main/java/com/teameetmeet/meetmeet/data/repository/UserRepository.kt

@@ -1,10 +1,11 @@
 package com.teameetmeet.meetmeet.data.repository
 
-import com.teameetmeet.meetmeet.data.NoDataException
 import com.teameetmeet.meetmeet.data.local.datastore.DataStoreHelper
 import com.teameetmeet.meetmeet.data.model.UserProfile
+import com.teameetmeet.meetmeet.data.model.UserWithFollowStatus
 import com.teameetmeet.meetmeet.data.network.api.UserApi
 import com.teameetmeet.meetmeet.data.network.entity.PasswordChangeRequest
+import com.teameetmeet.meetmeet.data.toException
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
 import kotlinx.coroutines.flow.first
@@ -25,9 +26,7 @@ class UserRepository @Inject constructor(
  fun getUserProfile(): Flow<UserProfile> {
  return flowOf(true)
  .map {
- val token = dataStore.getAppToken().first() ?: throw NoDataException()
- val result = userApi.getUserProfile()
- result
+ userApi.getUserProfile()
  }.onEach {
  fetchUserProfile(it)
  }.catch {
@@ -50,6 +49,22 @@ class UserRepository @Inject constructor(
  }
  }
 
+ suspend fun getUserWithFollowStatus(nickname: String): Flow<UserWithFollowStatus> {
+ val userNickname = dataStore.getUserProfile().first().nickname
+ return flowOf(true)
+ .map {
+ val user = userApi.getUserWithFollowStatus(nickname)
+ if(user.nickname == userNickname) {
+ user.copy(isMe = true)
+ } else {
+ user
+ }
+ }.catch {
+ throw it.toException()
+ }
+ }
+
+
  private suspend fun fetchUserProfile(userProfile: UserProfile) {
  dataStore.fetchUserProfile(userProfile)
  }

android/app/src/main/java/com/teameetmeet/meetmeet/data/repository/di/RepositoryModule.kt

@@ -5,10 +5,12 @@ import com.teameetmeet.meetmeet.data.datasource.RemoteCalendarDataSource
 import com.teameetmeet.meetmeet.data.local.datastore.DataStoreHelper
 import com.teameetmeet.meetmeet.data.network.api.AuthApi
 import com.teameetmeet.meetmeet.data.network.api.EventStoryApi
+import com.teameetmeet.meetmeet.data.network.api.FollowApi
 import com.teameetmeet.meetmeet.data.network.api.LoginApi
 import com.teameetmeet.meetmeet.data.network.api.UserApi
 import com.teameetmeet.meetmeet.data.repository.CalendarRepository
 import com.teameetmeet.meetmeet.data.repository.EventStoryRepository
+import com.teameetmeet.meetmeet.data.repository.FollowRepository
 import com.teameetmeet.meetmeet.data.repository.LoginRepository
 import com.teameetmeet.meetmeet.data.repository.SettingRepository
 import com.teameetmeet.meetmeet.data.repository.TokenRepository
@@ -63,4 +65,10 @@ class RepositoryModule {
  dataStore: DataStoreHelper,
  authApi: AuthApi
  ) = TokenRepository(dataStore, authApi)
+
+ @Singleton
+ @Provides
+ fun provideFollowRepository(
+ followApi: FollowApi
+ ) = FollowRepository(followApi)
 }

android/app/src/main/java/com/teameetmeet/meetmeet/presentation/eventstory/eventstory/EventStoryFragment.kt

@@ -55,21 +55,21 @@ class EventStoryFragment : BaseFragment<FragmentEventStoryBinding>(R.layout.frag
  showDialog(viewModel.getNoti())
  }
  eventStoryIbSeeMoreMember.setOnClickListener {
- //TODO("더보기")
+ findNavController().navigate(EventStoryFragmentDirections.actionEventStoryFragmentToEventMemberFragment(viewModel.eventStoryUiState.value.eventStory?.eventMembers?.toTypedArray().orEmpty()))
  }
  eventStoryCvInviteMember.setOnClickListener {
  when (viewModel.eventStoryUiState.value.authority) {
- EventAuthority.GUEST -> {}//TODO("참여 신청")
+ EventAuthority.GUEST -> {
+ viewModel.joinEventStory()
+ }
  EventAuthority.OWNER -> {
- //TODO("초대 페이지로 이동")
  viewModel.eventStoryUiState.value.eventStory?.let { story ->
  findNavController().navigate(
  EventStoryFragmentDirections.actionEventStoryFragmentToFollowFragment()
  .setId(story.id)
  )
  }
  }
-
  else -> return@setOnClickListener
  }
  }

android/app/src/main/java/com/teameetmeet/meetmeet/presentation/eventstory/eventstory/EventStoryViewModel.kt

@@ -75,6 +75,20 @@ class EventStoryViewModel @Inject constructor(
  return eventStoryUiState.value.eventStory?.announcement.orEmpty()
  }
 
+ fun joinEventStory() {
+ viewModelScope.launch {
+ eventStoryRepository.joinEventStory(eventStoryUiState.value.eventId).catch { exception ->
+ when(exception) {
+ is ExpiredRefreshTokenException -> _event.emit(EventStoryEvent.NavigateToLoginActivity)
+ is UnknownHostException -> _event.emit(EventStoryEvent.ShowMessage(R.string.common_message_no_internet))
+ else -> _event.emit(EventStoryEvent.ShowMessage(R.string.event_story_message_join_event_fail, exception.message.orEmpty()))
+ }
+ }.collect {
+ _event.emit(EventStoryEvent.ShowMessage(R.string.event_story_message_join_event_success))
+ }
+ }
+ }
+
 
  override fun onItemClick() {
  _eventStoryUiState.update {
@@ -86,6 +100,7 @@ class EventStoryViewModel @Inject constructor(
  }
  }
 
+
  override fun onSaveButtonClick(message: String) {
  viewModelScope.launch {
  eventStoryRepository.editNotification(message).catch {
@@ -94,7 +109,6 @@ class EventStoryViewModel @Inject constructor(
  _eventStoryUiState.update {
  it.copy(eventStory = eventStoryUiState.value.eventStory?.copy(announcement = message))
  }
- //TODO("일정 공지 수정되는 거 봐야함")
  }
  }
  }

android/app/src/main/java/com/teameetmeet/meetmeet/presentation/eventstory/eventstory/eventmember/EventMemberAdapter.kt

@@ -0,0 +1,42 @@
+package com.teameetmeet.meetmeet.presentation.eventstory.eventstory.eventmember
+
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.DiffUtil
+import androidx.recyclerview.widget.ListAdapter
+import com.teameetmeet.meetmeet.data.model.UserWithFollowStatus
+import com.teameetmeet.meetmeet.databinding.ItemEventJoinMemberBinding
+
+class EventMemberAdapter(private val eventMemberClickListener: EventMemberClickListener) : ListAdapter<UserWithFollowStatus, EventMemberViewHolder>(diffCallback) {
+ override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): EventMemberViewHolder {
+ val binding = ItemEventJoinMemberBinding.inflate(
+ LayoutInflater.from(parent.context),
+ parent,
+ false
+ )
+ return EventMemberViewHolder(binding, eventMemberClickListener)
+ }
+
+ override fun onBindViewHolder(holder: EventMemberViewHolder, position: Int) {
+ holder.bind(getItem(position))
+ }
+
+ companion object {
+ private val diffCallback = object: DiffUtil.ItemCallback<UserWithFollowStatus>() {
+ override fun areItemsTheSame(
+ oldItem: UserWithFollowStatus,
+ newItem: UserWithFollowStatus
+ ): Boolean {
+ return oldItem.id == newItem.id
+ }
+
+ override fun areContentsTheSame(
+ oldItem: UserWithFollowStatus,
+ newItem: UserWithFollowStatus
+ ): Boolean {
+ return oldItem == newItem
+ }
+
+ }
+ }
+}