feat: 마이페이지 공동 카테고리 초대 관리 #803

android/Staccato_AN/.editorconfig

@@ -1,2 +1,2 @@
 [*.{kt,kts}]
-ktlint_function_naming_ignore_when_annotated_with=Composable
+ktlint_function_naming_ignore_when_annotated_with=Composable

android/Staccato_AN/app/build.gradle.kts

@@ -237,13 +237,19 @@ dependencies {
     implementation(libs.hilt.navigation.compose)
     implementation(libs.androidx.navigation.compose)
 
-    // coil
+    // Compose Coil
     implementation(libs.coil.compose)
 
     // Compose UI Test
     androidTestImplementation(platform(libs.androidx.compose.bom))
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.test.manifest)
+
+    // Compose ViewModel
+    implementation(libs.lifecycle.viewmodel.compose)
+
+    // Compose ConstraintLayout
+    implementation(libs.androidx.constraintlayout.compose)
 }
 
 secrets {

android/Staccato_AN/app/src/main/AndroidManifest.xml

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
     <queries>
         <intent>
             <action android:name="android.intent.action.VIEW" />
             <category android:name="android.intent.category.BROWSABLE" />
-            <data android:scheme="https" android:host="www.instagram.com" />
+            <data
+                android:scheme="https"
+                android:host="www.instagram.com" />
         </intent>
     </queries>
 
@@ -66,8 +67,8 @@
         <activity
             android:name=".presentation.main.MainActivity"
             android:exported="true"
-            android:windowSoftInputMode="adjustPan"
-            android:screenOrientation="portrait" />
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan" />
 
         <activity
             android:name=".presentation.staccatoupdate.StaccatoUpdateActivity"
@@ -94,6 +95,11 @@
             android:exported="false"
             android:screenOrientation="portrait" />
 
+        <activity
+            android:name=".presentation.invitation.InvitationManagementActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
+
         <activity
             android:name=".presentation.webview.WebViewActivity"
             android:exported="false"

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

@@ -0,0 +1,14 @@
+package com.on.staccato.data.dto.invitation
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ReceivedInvitationDto(
+    @SerialName("invitationId") val invitationId: Long,
+    @SerialName("inviterId") val inviterId: Long,
+    @SerialName("inviterNickname") val inviterNickname: String,
+    @SerialName("inviterProfileImageUrl") val inviterProfile: String? = null,
+    @SerialName("categoryId") val categoryId: Long,
+    @SerialName("categoryTitle") val categoryTitle: String,
+)

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

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

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

@@ -0,0 +1,14 @@
+package com.on.staccato.data.dto.invitation
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SentInvitationDto(
+    @SerialName("invitationId") val invitationId: Long,
+    @SerialName("inviteeId") val inviteeId: Long,
+    @SerialName("inviteeNickname") val inviteeNickname: String,
+    @SerialName("inviteeProfileImageUrl") val inviteeProfileImageUrl: String? = null,
+    @SerialName("categoryId") val categoryId: Long,
+    @SerialName("categoryTitle") val categoryTitle: String,
+)

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

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

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

@@ -0,0 +1,39 @@
+package com.on.staccato.data.dto.mapper
+
+import com.on.staccato.data.dto.invitation.ReceivedInvitationDto
+import com.on.staccato.data.dto.invitation.ReceivedInvitationsResponse
+import com.on.staccato.data.dto.invitation.SentInvitationDto
+import com.on.staccato.data.dto.invitation.SentInvitationsResponse
+import com.on.staccato.domain.model.Member
+import com.on.staccato.domain.model.invitation.ReceivedInvitation
+import com.on.staccato.domain.model.invitation.SentInvitation
+
+fun ReceivedInvitationsResponse.toDomain(): List<ReceivedInvitation> = invitations.map { it.toDomain() }
+
+fun ReceivedInvitationDto.toDomain(): ReceivedInvitation =
+    ReceivedInvitation(
+        invitationId = invitationId,
+        inviter =
+            Member(
+                memberId = inviterId,
+                nickname = inviterNickname,
+                memberImage = inviterProfile,
+            ),
+        categoryId = categoryId,
+        categoryTitle = categoryTitle,
+    )
+
+fun SentInvitationsResponse.toDomain(): List<SentInvitation> = invitations.map { it.toDomain() }
+
+fun SentInvitationDto.toDomain(): SentInvitation =
+    SentInvitation(
+        invitationId = invitationId,
+        invitee =
+            Member(
+                memberId = inviteeId,
+                nickname = inviteeNickname,
+                memberImage = inviteeProfileImageUrl,
+            ),
+        categoryId = categoryId,
+        categoryTitle = categoryTitle,
+    )

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

@@ -2,17 +2,49 @@ 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.dto.invitation.ReceivedInvitationsResponse
+import com.on.staccato.data.dto.invitation.SentInvitationsResponse
 import com.on.staccato.data.network.ApiResult
 import retrofit2.http.Body
+import retrofit2.http.GET
 import retrofit2.http.POST
+import retrofit2.http.Path
 
 interface InvitationApiService {
     @POST(INVITATION_PATH)
     suspend fun postInvitation(
         @Body invitation: InvitationRequest,
     ): ApiResult<InvitationResponse>
 
+    @GET(RECEIVED_INVITATION_PATH)
+    suspend fun getReceivedInvitations(): ApiResult<ReceivedInvitationsResponse>
+
+    @POST(INVITATION_ACCEPT_PATH)
+    suspend fun postInvitationAccept(
+        @Path(INVITATION_ID) invitationId: Long,
+    ): ApiResult<Unit>
+
+    @POST(INVITATION_REJECT_PATH)
+    suspend fun postInvitationReject(
+        @Path(INVITATION_ID) invitationId: Long,
+    ): ApiResult<Unit>
+
+    @GET(SENT_INVITATION_PATH)
+    suspend fun getSentInvitations(): ApiResult<SentInvitationsResponse>
+
+    @POST(INVITATION_CANCEL_PATH)
+    suspend fun postInvitationCancel(
+        @Path(INVITATION_ID) invitationId: Long,
+    ): ApiResult<Unit>
+
     companion object {
         const val INVITATION_PATH = "/invitations"
+        private const val INVITATION_ID = "invitationId"
+        private const val RECEIVED_INVITATION_PATH = "$INVITATION_PATH/received"
+        private const val SENT_INVITATION_PATH = "$INVITATION_PATH/sent"
+        private const val INVITATION_PATH_WITH_ID = "$INVITATION_PATH/{$INVITATION_ID}"
+        private const val INVITATION_ACCEPT_PATH = "$INVITATION_PATH_WITH_ID/accept"
+        private const val INVITATION_REJECT_PATH = "$INVITATION_PATH_WITH_ID/reject"
+        private const val INVITATION_CANCEL_PATH = "$INVITATION_PATH_WITH_ID/cancel"
     }
 }

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

@@ -1,8 +1,11 @@
 package com.on.staccato.data.invitation
 
 import com.on.staccato.data.dto.invitation.InvitationRequest
+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.invitation.ReceivedInvitation
+import com.on.staccato.domain.model.invitation.SentInvitation
 import com.on.staccato.domain.repository.InvitationRepository
 import javax.inject.Inject
 
@@ -17,4 +20,19 @@ class InvitationDefaultRepository
         ): ApiResult<List<Long>> =
             invitationApiService.postInvitation(InvitationRequest(categoryId, inviteeIds))
                 .handle { it.invitationIds }
+
+        override suspend fun getReceivedInvitations(): ApiResult<List<ReceivedInvitation>> =
+            invitationApiService.getReceivedInvitations().handle { it.toDomain() }
+
+        override suspend fun acceptInvitation(invitationId: Long): ApiResult<Unit> =
+            invitationApiService.postInvitationAccept(invitationId = invitationId).handle()
+
+        override suspend fun rejectInvitation(invitationId: Long): ApiResult<Unit> =
+            invitationApiService.postInvitationReject(invitationId = invitationId).handle()
+
+        override suspend fun getSentInvitations(): ApiResult<List<SentInvitation>> =
+            invitationApiService.getSentInvitations().handle { it.toDomain() }
+
+        override suspend fun cancelInvitation(invitationId: Long): ApiResult<Unit> =
+            invitationApiService.postInvitationCancel(invitationId = invitationId).handle()
     }

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

@@ -45,13 +45,13 @@ object RetrofitModule {
 
     @Singleton
     @Provides
-    fun memberApiService(): MemberApiService = retrofit.create(MemberApiService::class.java)
+    fun provideMemberApiService(): MemberApiService = retrofit.create(MemberApiService::class.java)
 
     @Singleton
     @Provides
-    fun myPageApiService(): MyPageApiService = retrofit.create(MyPageApiService::class.java)
+    fun provideMyPageApiService(): MyPageApiService = retrofit.create(MyPageApiService::class.java)
 
     @Singleton
     @Provides
-    fun invitationApiService(): InvitationApiService = retrofit.create(InvitationApiService::class.java)
+    fun provideInvitationApiService(): InvitationApiService = retrofit.create(InvitationApiService::class.java)
 }

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

@@ -0,0 +1,10 @@
+package com.on.staccato.domain.model.invitation
+
+import com.on.staccato.domain.model.Member
+
+data class ReceivedInvitation(
+    val invitationId: Long,
+    val inviter: Member,
+    val categoryId: Long,
+    val categoryTitle: String,
+)

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

@@ -0,0 +1,10 @@
+package com.on.staccato.domain.model.invitation
+
+import com.on.staccato.domain.model.Member
+
+data class SentInvitation(
+    val invitationId: Long,
+    val invitee: Member,
+    val categoryId: Long,
+    val categoryTitle: String,
+)

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

@@ -1,10 +1,22 @@
 package com.on.staccato.domain.repository
 
 import com.on.staccato.data.network.ApiResult
+import com.on.staccato.domain.model.invitation.ReceivedInvitation
+import com.on.staccato.domain.model.invitation.SentInvitation
 
 interface InvitationRepository {
     suspend fun invite(
         categoryId: Long,
         inviteeIds: List<Long>,
     ): ApiResult<List<Long>>
+
+    suspend fun getReceivedInvitations(): ApiResult<List<ReceivedInvitation>>
+
+    suspend fun acceptInvitation(invitationId: Long): ApiResult<Unit>
+
+    suspend fun rejectInvitation(invitationId: Long): ApiResult<Unit>
+
+    suspend fun getSentInvitations(): ApiResult<List<SentInvitation>>
+
+    suspend fun cancelInvitation(invitationId: Long): ApiResult<Unit>
 }

android/Staccato_AN/app/src/main/java/com/on/staccato/presentation/component/ClickableWithoutRipple.kt

@@ -8,7 +8,7 @@ import androidx.compose.ui.Modifier
 
 @Composable
 fun Modifier.clickableWithoutRipple(onClick: () -> Unit): Modifier =
-    this.clickable(
+    clickable(
         indication = null,
         interactionSource = remember { MutableInteractionSource() },
         onClick = onClick,