-
Notifications
You must be signed in to change notification settings - Fork 0
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.
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
Feature/android/#35 join event : 일정 참여, 일정 멤버 자세히 보기, 알림 화면 구현 #163
Changes from all commits
07c2586
3c3bb46
ade741c
734fff0
88302b6
da58da6
844704c
1881b60
0d8df01
fc3ef08
0f3d4e9
347d06e
1bd5472
7c3e50e
42fb089
c720fff
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) | ||
} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
) | ||
Comment on lines
+6
to
+17
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 이 부분은 팔로우랑 일정 초대 부분을 묶어서 구현해야할 것 같아서 제가 나중에 수정할 수도 있을 것 같아요 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 넵넵 좋습니다. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) | ||
Comment on lines
+11
to
+15
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 👍👍 |
||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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 | ||
) |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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() | ||
} | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
args로 전달하기 위해 Parcelable로 선언한 부분인가요?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
네 맞습니다!!! 이벤트 멤버를 전달해서 더보기에서 사용하기 위해 Parcelable로 구현을 했습니다.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이거 list를 data class로 한번 더 감싸면 serealizable만 상속받아도 전달할 수 있더라고요! 뭐가 더 나은지는 모르겠어요...