feat: 공동 카테고리 함께하는 사람들, 친구 초대 구현 #783

android/Staccato_AN/app/src/main/java/com/on/staccato/data/category/CategoryApiService.kt

@@ -15,7 +15,7 @@ import retrofit2.http.Path
 import retrofit2.http.Query
 
 interface CategoryApiService {
-    @GET(CATEGORY_PATH_WITH_ID_V2)
+    @GET(CATEGORY_PATH_WITH_ID_V3)
     suspend fun getCategory(
         @Path(CATEGORY_ID) categoryId: Long,
     ): ApiResult<CategoryResponse>
@@ -56,7 +56,7 @@ interface CategoryApiService {
         private const val CATEGORY_PATH_WITH_CANDIDATES = "$CATEGORIES_PATH$CANDIDATES_PATH"
         private const val CURRENT_DATE = "currentDate"
         private const val CATEGORIES_PATH_V2 = "/v2${CATEGORIES_PATH}"
-        private const val CATEGORY_PATH_WITH_ID_V2 = "/v2$CATEGORIES_PATH/{$CATEGORY_ID}"
+        private const val CATEGORY_PATH_WITH_ID_V3 = "/v3$CATEGORIES_PATH/{$CATEGORY_ID}"
         private const val CATEGORIES_PATH_V3 = "/v3${CATEGORIES_PATH}"
     }
 }

android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/category/CategoryResponse.kt

@@ -1,6 +1,6 @@
 package com.on.staccato.data.dto.category
 
-import com.on.staccato.data.dto.member.MemberDto
+import com.on.staccato.data.dto.member.ParticipantDto
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
@@ -13,6 +13,8 @@ data class CategoryResponse(
     @SerialName("endAt") val endAt: String? = null,
     @SerialName("description") val description: String? = null,
     @SerialName("categoryColor") val color: String,
-    @SerialName("mates") val mates: List<MemberDto>,
+    @SerialName("members") val participants: List<ParticipantDto>,
     @SerialName("staccatos") val staccatos: List<CategoryStaccatoDto>,
+    @SerialName("isShared") val isShared: Boolean,
+    @SerialName("myRole") val myRole: String,
 )

android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/invitation/InvitationRequest.kt

@@ -0,0 +1,10 @@
+package com.on.staccato.data.dto.invitation
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class InvitationRequest(
+    @SerialName("categoryId") val categoryId: Long,
+    @SerialName("inviteeIds") val inviteeIds: List<Long>,
+)

android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/invitation/InvitationResponse.kt

@@ -0,0 +1,9 @@
+package com.on.staccato.data.dto.invitation
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class InvitationResponse(
+    @SerialName("invitationIds") val invitationIds: List<Long>,
+)

android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/mapper/CategoryMapper.kt

@@ -4,11 +4,15 @@ import com.on.staccato.data.dto.category.CategoriesResponse
 import com.on.staccato.data.dto.category.CategoryRequest
 import com.on.staccato.data.dto.category.CategoryResponse
 import com.on.staccato.data.dto.category.CategoryStaccatoDto
+import com.on.staccato.data.dto.member.ParticipantDto
 import com.on.staccato.domain.model.Category
 import com.on.staccato.domain.model.CategoryCandidate
 import com.on.staccato.domain.model.CategoryCandidates
 import com.on.staccato.domain.model.CategoryStaccato
+import com.on.staccato.domain.model.Member
 import com.on.staccato.domain.model.NewCategory
+import com.on.staccato.domain.model.Participant
+import com.on.staccato.domain.model.Role
 import java.time.LocalDate
 import java.time.LocalDateTime
 
@@ -21,8 +25,10 @@ fun CategoryResponse.toDomain() =
         endAt = endAt?.let { LocalDate.parse(endAt) },
         description = description,
         color = color,
-        mates = mates.map { it.toDomain() },
+        participants = participants.map { it.toDomain() },
         staccatos = staccatos.map { it.toDomain() },
+        isShared = isShared,
+        myRole = Role.of(myRole),
     )
 
 fun CategoriesResponse.toDomain(): CategoryCandidates =
@@ -55,3 +61,14 @@ fun NewCategory.toDto() =
         endAt = endAt?.toString(),
         isShared = isShared,
     )
+
+fun ParticipantDto.toDomain(): Participant =
+    Participant(
+        member =
+            Member(
+                memberId = id,
+                nickname = nickname,
+                memberImage = imageUrl,
+            ),
+        role = Role.of(role),
+    )

android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/member/MemberSearchResponse.kt

@@ -0,0 +1,9 @@
+package com.on.staccato.data.dto.member
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class MemberSearchResponse(
+    @SerialName("members") val members: List<MemberDto>,
+)

android/Staccato_AN/app/src/main/java/com/on/staccato/data/dto/member/ParticipantDto.kt

@@ -0,0 +1,12 @@
+package com.on.staccato.data.dto.member
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ParticipantDto(
+    @SerialName("memberId") val id: Long,
+    @SerialName("nickname") val nickname: String,
+    @SerialName("memberImageUrl") val imageUrl: String? = null,
+    @SerialName("memberRole") val role: String,
+)

android/Staccato_AN/app/src/main/java/com/on/staccato/data/invitation/InvitationApiService.kt

@@ -0,0 +1,18 @@
+package com.on.staccato.data.invitation
+
+import com.on.staccato.data.dto.invitation.InvitationRequest
+import com.on.staccato.data.dto.invitation.InvitationResponse
+import com.on.staccato.data.network.ApiResult
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface InvitationApiService {
+    @POST(INVITATION_PATH)
+    suspend fun postInvitation(
+        @Body invitation: InvitationRequest,
+    ): ApiResult<InvitationResponse>
+
+    companion object {
+        const val INVITATION_PATH = "/invitations"
+    }
+}

android/Staccato_AN/app/src/main/java/com/on/staccato/data/invitation/InvitationDefaultRepository.kt

@@ -0,0 +1,20 @@
+package com.on.staccato.data.invitation
+
+import com.on.staccato.data.dto.invitation.InvitationRequest
+import com.on.staccato.data.network.ApiResult
+import com.on.staccato.data.network.handle
+import com.on.staccato.domain.repository.InvitationRepository
+import javax.inject.Inject
+
+class InvitationDefaultRepository
+    @Inject
+    constructor(
+        private val invitationApiService: InvitationApiService,
+    ) : InvitationRepository {
+        override suspend fun invite(
+            categoryId: Long,
+            inviteeIds: List<Long>,
+        ): ApiResult<List<Long>> =
+            invitationApiService.postInvitation(InvitationRequest(categoryId, inviteeIds))
+                .handle { it.invitationIds }
+    }

android/Staccato_AN/app/src/main/java/com/on/staccato/data/member/MemberApiService.kt

@@ -1,7 +1,9 @@
 package com.on.staccato.data.member
 
+import com.on.staccato.data.dto.member.MemberSearchResponse
 import com.on.staccato.data.dto.member.RecoveryCodeResponse
 import com.on.staccato.data.network.ApiResult
+import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Query
 
@@ -11,8 +13,15 @@ interface MemberApiService {
         @Query(RECOVERY_CODE) recoveryCode: String,
     ): ApiResult<RecoveryCodeResponse>
 
+    @GET(MEMBERS_SEARCH_PATH)
+    suspend fun getMembersBy(
+        @Query(NICKNAME) nickname: String,
+    ): ApiResult<MemberSearchResponse>
+
     companion object {
         private const val MEMBERS_PATH = "/members"
         private const val RECOVERY_CODE = "code"
+        private const val NICKNAME = "nickname"
+        private const val MEMBERS_SEARCH_PATH = "$MEMBERS_PATH/search"
     }
 }

android/Staccato_AN/app/src/main/java/com/on/staccato/data/member/MemberDefaultRepository.kt

@@ -1,9 +1,13 @@
 package com.on.staccato.data.member
 
 import com.on.staccato.StaccatoApplication
+import com.on.staccato.data.dto.mapper.toDomain
 import com.on.staccato.data.network.ApiResult
 import com.on.staccato.data.network.handle
+import com.on.staccato.domain.model.Members
 import com.on.staccato.domain.repository.MemberRepository
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flow
 import javax.inject.Inject
 
 class MemberDefaultRepository
@@ -12,5 +16,14 @@ class MemberDefaultRepository
         private val memberApiService: MemberApiService,
     ) : MemberRepository {
         override suspend fun fetchTokenWithRecoveryCode(recoveryCode: String): ApiResult<Unit> =
-            memberApiService.postRecoveryCode(recoveryCode).handle { StaccatoApplication.userInfoPrefsManager.setToken(it.token) }
+            memberApiService.postRecoveryCode(recoveryCode)
+                .handle { StaccatoApplication.userInfoPrefsManager.setToken(it.token) }
+
+        override suspend fun searchMembersBy(nickname: String): Flow<ApiResult<Members>> =
+            flow {
+                emit(
+                    memberApiService.getMembersBy(nickname)
+                        .handle { Members(it.members.map { it.toDomain() }) },
+                )
+            }
     }

android/Staccato_AN/app/src/main/java/com/on/staccato/di/module/RepositoryModule.kt

@@ -3,6 +3,7 @@ package com.on.staccato.di.module
 import com.on.staccato.data.category.CategoryDefaultRepository
 import com.on.staccato.data.comment.CommentDefaultRepository
 import com.on.staccato.data.image.ImageDefaultRepository
+import com.on.staccato.data.invitation.InvitationDefaultRepository
 import com.on.staccato.data.location.LocationDefaultRepository
 import com.on.staccato.data.login.LoginDefaultRepository
 import com.on.staccato.data.member.MemberDefaultRepository
@@ -12,6 +13,7 @@ import com.on.staccato.data.timeline.TimelineDefaultRepository
 import com.on.staccato.domain.repository.CategoryRepository
 import com.on.staccato.domain.repository.CommentRepository
 import com.on.staccato.domain.repository.ImageRepository
+import com.on.staccato.domain.repository.InvitationRepository
 import com.on.staccato.domain.repository.LocationRepository
 import com.on.staccato.domain.repository.LoginRepository
 import com.on.staccato.domain.repository.MemberRepository
@@ -52,4 +54,7 @@ abstract class RepositoryModule {
 
     @Binds
     abstract fun bindLocationRepository(locationDefaultRepository: LocationDefaultRepository): LocationRepository
+
+    @Binds
+    abstract fun bindInvitationRepository(invitationDefaultRepository: InvitationDefaultRepository): InvitationRepository
 }

android/Staccato_AN/app/src/main/java/com/on/staccato/di/module/RetrofitModule.kt

@@ -4,6 +4,7 @@ import com.on.staccato.StaccatoApplication.Companion.retrofit
 import com.on.staccato.data.category.CategoryApiService
 import com.on.staccato.data.comment.CommentApiService
 import com.on.staccato.data.image.ImageApiService
+import com.on.staccato.data.invitation.InvitationApiService
 import com.on.staccato.data.login.LoginApiService
 import com.on.staccato.data.member.MemberApiService
 import com.on.staccato.data.mypage.MyPageApiService
@@ -49,4 +50,8 @@ object RetrofitModule {
     @Singleton
     @Provides
     fun myPageApiService(): MyPageApiService = retrofit.create(MyPageApiService::class.java)
+
+    @Singleton
+    @Provides
+    fun invitationApiService(): InvitationApiService = retrofit.create(InvitationApiService::class.java)
 }

android/Staccato_AN/app/src/main/java/com/on/staccato/domain/model/Category.kt

@@ -10,6 +10,8 @@ data class Category(
     val endAt: LocalDate? = null,
     val description: String? = null,
     val color: String,
-    val mates: List<Member>,
+    val participants: List<Participant>,
     val staccatos: List<CategoryStaccato>,
+    val isShared: Boolean,
+    val myRole: Role,
 )

android/Staccato_AN/app/src/main/java/com/on/staccato/domain/model/Member.kt

@@ -5,3 +5,12 @@ data class Member(
     val nickname: String,
     val memberImage: String? = null,
 )
+
+val dummyMember =
+    Member(
+        memberId = 0L,
+        nickname = "빙티",
+        memberImage = "",
+    )
+
+val longNameMember = dummyMember.copy(nickname = "엄청나게아주매우아주매우아주매우아주매우아주매우닉네임")

android/Staccato_AN/app/src/main/java/com/on/staccato/domain/model/Members.kt

@@ -0,0 +1,25 @@
+package com.on.staccato.domain.model
+
+data class Members(val members: List<Member>) {
+    fun addFirst(member: Member): Members = Members((listOf(member) + members).distinct())
+
+    fun filter(member: Member): Members = Members(members.filterNot { it.memberId == member.memberId })
+
+    fun contains(target: Member) = members.contains(target)
+}
+
+val emptyMembers = Members(emptyList())
+
+val dummyMembers =
+    Members(
+        listOf(
+            dummyMember,
+            longNameMember.copy(memberId = 1L),
+            dummyMember.copy(memberId = 2L),
+            longNameMember.copy(memberId = 3L),
+            dummyMember.copy(memberId = 4L),
+            longNameMember.copy(memberId = 5L),
+            dummyMember.copy(memberId = 6L),
+            longNameMember.copy(memberId = 7L),
+        ),
+    )

android/Staccato_AN/app/src/main/java/com/on/staccato/domain/model/Participant.kt

@@ -0,0 +1,6 @@
+package com.on.staccato.domain.model
+
+data class Participant(
+    val member: Member,
+    val role: Role,
+)

android/Staccato_AN/app/src/main/java/com/on/staccato/domain/model/Participants.kt

@@ -0,0 +1,7 @@
+package com.on.staccato.domain.model
+
+data class Participants(val members: List<Participant>)
+
+val emptyParticipants = Participants(emptyList())
+
+fun Participants.toMembers() = Members(members.map { it.member })

android/Staccato_AN/app/src/main/java/com/on/staccato/domain/model/Role.kt

@@ -0,0 +1,16 @@
+package com.on.staccato.domain.model
+
+enum class Role(val value: String) {
+    HOST("host"),
+    GUEST("guest"),
+    ;
+
+    companion object {
+        fun of(value: String) =
+            when (value) {
+                "host" -> HOST
+                "guest" -> GUEST
+                else -> throw IllegalArgumentException("유효하지 않은 Role 입니다.")
+            }
+    }
+}

android/Staccato_AN/app/src/main/java/com/on/staccato/domain/repository/InvitationRepository.kt

@@ -0,0 +1,10 @@
+package com.on.staccato.domain.repository
+
+import com.on.staccato.data.network.ApiResult
+
+interface InvitationRepository {
+    suspend fun invite(
+        categoryId: Long,
+        inviteeIds: List<Long>,
+    ): ApiResult<List<Long>>
+}

android/Staccato_AN/app/src/main/java/com/on/staccato/domain/repository/MemberRepository.kt

@@ -1,7 +1,11 @@
 package com.on.staccato.domain.repository
 
 import com.on.staccato.data.network.ApiResult
+import com.on.staccato.domain.model.Members
+import kotlinx.coroutines.flow.Flow
 
 interface MemberRepository {
     suspend fun fetchTokenWithRecoveryCode(recoveryCode: String): ApiResult<Unit>
+
+    suspend fun searchMembersBy(nickname: String): Flow<ApiResult<Members>>
 }

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/bindingadapter/ImageBindingAdapter.kt

@@ -4,18 +4,30 @@ import android.content.res.ColorStateList
 import android.graphics.PorterDuff
 import android.graphics.drawable.Drawable
 import android.net.Uri
+import android.view.View
 import android.widget.ImageButton
 import android.widget.ImageView
 import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat.getColor
+import androidx.core.view.isGone
 import androidx.databinding.BindingAdapter
 import coil.load
 import coil.transform.RoundedCornersTransformation
 import com.on.staccato.R
 import com.on.staccato.presentation.timeline.model.FilterType
 import com.on.staccato.presentation.util.dpToPx
 
+@BindingAdapter("isGone")
+fun ImageView.setIsGone(isGone: Boolean) {
+    this.isGone = isGone
+}
+
+@BindingAdapter("isInvisible")
+fun ImageView.setVisibility(isInvisible: Boolean) {
+    visibility = if (isInvisible) View.INVISIBLE else View.VISIBLE
+}
+
 @BindingAdapter("imageButtonIcon")
 fun ImageButton.setColorSelectionIcon(
     @DrawableRes drawableRes: Int,