[Feat/347] 모임 일정 친구 초대 기능 구현

app/src/main/AndroidManifest.xml

@@ -101,7 +101,7 @@
             android:name=".presentation.ui.home.diary.PersonalDiaryDetailActivity"
             android:exported="false"
             android:windowSoftInputMode="adjustPan" />
-        <activity android:name=".presentation.ui.community.alert.CommunityAlertActivity"/>
+        <activity android:name=".presentation.ui.community.alert.FriendAlertActivity"/>
         <activity android:name=".presentation.ui.community.moim.schedule.FriendInviteActivity"/>
         <activity android:name=".presentation.ui.setting.profile.ProfileEditActivity"/>
 

app/src/main/java/com/mongmong/namo/data/datasource/schedule/RemoteScheduleDataSource.kt

@@ -15,6 +15,7 @@ import com.mongmong.namo.data.dto.GetMoimCalendarResponse
 import com.mongmong.namo.data.dto.GetMoimDetailResponse
 import com.mongmong.namo.data.dto.GetMoimDetailResult
 import com.mongmong.namo.data.dto.GetMoimResponse
+import com.mongmong.namo.data.dto.InviteMoimParticipantRequestBody
 import com.mongmong.namo.data.dto.MoimBaseResponse
 import com.mongmong.namo.data.dto.MoimScheduleRequestBody
 import com.mongmong.namo.data.dto.PostMoimScheduleResponse
@@ -278,6 +279,25 @@ class RemoteScheduleDataSource @Inject constructor(
         return scheduleResponse
     }
 
+    // 모임 일정 참석자 초대
+    suspend fun inviteMoimParticipant(
+        moimScheduleId: Long,
+        request: InviteMoimParticipantRequestBody
+    ): BaseResponse {
+        var scheduleResponse = BaseResponse()
+        withContext(Dispatchers.IO) {
+            runCatching {
+                moimApiService.inviteMoimParticipants(moimScheduleId, request)
+            }.onSuccess {
+                scheduleResponse = it
+                Log.d("RemoteScheduleDataSource", "inviteMoimParticipant Success $it")
+            }.onFailure {
+                Log.d("RemoteScheduleDataSource", "inviteMoimParticipant Failure $it")
+            }
+        }
+        return scheduleResponse
+    }
+
     // 게스트 초대용 링크 조회
     suspend fun getGuestInvitationLink(
         moimScheduleId: Long

app/src/main/java/com/mongmong/namo/data/dto/MoimDTO.kt

@@ -92,4 +92,9 @@ data class EditMoimScheduleRequestBody(
 data class EditMoimScheduleProfileRequestBody(
     var title: String = "",
     var imageUrl: String = ""
+)
+
+/** 모임 일정 참석자 초대 */
+data class InviteMoimParticipantRequestBody(
+    var memberIds: List<Long>
 )

app/src/main/java/com/mongmong/namo/data/remote/MoimApiService.kt

@@ -5,6 +5,7 @@ import com.mongmong.namo.data.dto.EditMoimScheduleRequestBody
 import com.mongmong.namo.data.dto.GetMoimCalendarResponse
 import com.mongmong.namo.data.dto.GetMoimDetailResponse
 import com.mongmong.namo.data.dto.GetMoimResponse
+import com.mongmong.namo.data.dto.InviteMoimParticipantRequestBody
 import com.mongmong.namo.data.dto.MoimBaseResponse
 import com.mongmong.namo.data.dto.MoimScheduleRequestBody
 import com.mongmong.namo.data.dto.PostMoimScheduleResponse
@@ -62,6 +63,13 @@ interface MoimApiService {
         @Body body: EditMoimScheduleProfileRequestBody
     ): BaseResponse
 
+    // 모임 일정 참석자 초대
+    @POST("schedules/meeting/{meetingScheduleId}/invitations")
+    suspend fun inviteMoimParticipants(
+        @Path("meetingScheduleId") moimScheduleId: Long,
+        @Body body: InviteMoimParticipantRequestBody
+    ): BaseResponse
+
     // 게스트 초대용 링크 조회
     @GET("schedules/meeting/{meetingScheduleId}/invitations")
     suspend fun getGuestInvitationLink(

app/src/main/java/com/mongmong/namo/data/repositoriyImpl/ScheduleRepositoryImpl.kt

@@ -3,6 +3,7 @@ package com.mongmong.namo.data.repositoriyImpl
 import android.util.Log
 import com.mongmong.namo.data.datasource.schedule.RemoteScheduleDataSource
 import com.mongmong.namo.data.dto.EditMoimScheduleProfileRequestBody
+import com.mongmong.namo.data.dto.InviteMoimParticipantRequestBody
 import com.mongmong.namo.domain.model.Schedule
 import com.mongmong.namo.data.remote.NetworkChecker
 import com.mongmong.namo.data.dto.PatchMoimScheduleAlarmRequestBody
@@ -77,8 +78,8 @@ class ScheduleRepositoryImpl @Inject constructor(
         }
     }
 
-    override suspend fun addMoimSchedule(moimSchedule: MoimScheduleDetail): Boolean {
-        return remoteScheduleDataSource.addMoimSchedule(moimSchedule.toDTO()).code == SUCCESS_CODE
+    override suspend fun addMoimSchedule(moimSchedule: MoimScheduleDetail): Long {
+        return remoteScheduleDataSource.addMoimSchedule(moimSchedule.toDTO()).result
     }
 
     override suspend fun editMoimSchedule(
@@ -107,7 +108,17 @@ class ScheduleRepositoryImpl @Inject constructor(
         ).isSuccess
     }
 
-    override suspend fun getGuestInvitaionLink(moimScheduleId: Long): String {
+    override suspend fun inviteMoimParticipant(
+        moimScheduleId: Long,
+        memberIdsToInvite: List<Long>
+    ): Boolean {
+        return remoteScheduleDataSource.inviteMoimParticipant(
+            moimScheduleId,
+            InviteMoimParticipantRequestBody(memberIdsToInvite)
+        ).isSuccess
+    }
+
+    override suspend fun getGuestInvitationLink(moimScheduleId: Long): String {
         return remoteScheduleDataSource.getGuestInvitationLink(moimScheduleId).result
     }
 }

app/src/main/java/com/mongmong/namo/data/utils/mappers/FriendMapper.kt

@@ -14,7 +14,7 @@ import com.mongmong.namo.presentation.utils.converter.ScheduleDateConverter
 object FriendMapper {
     fun FriendDTO.toModel(): Friend {
         return Friend(
-            userid = this.memberId,
+            userId = this.memberId,
             profileUrl = this.profileImage,
             nickname = this.nickname,
             name = this.nickname,

app/src/main/java/com/mongmong/namo/domain/model/FriendModel.kt

@@ -4,7 +4,7 @@ import org.joda.time.LocalDateTime
 import java.io.Serializable
 
 data class Friend(
-    val userid: Long,
+    val userId: Long,
     val profileUrl: String?,
     val nickname: String,
     val tag: String,

app/src/main/java/com/mongmong/namo/domain/model/MoimModel.kt

@@ -87,4 +87,9 @@ data class Moim(
             )
         }
     }
-}
+}
+
+data class MoimCreateInfo(
+    val moimId: Long = 0L,
+    val title: String = ""
+): Serializable

app/src/main/java/com/mongmong/namo/domain/repositories/ScheduleRepository.kt

@@ -47,7 +47,7 @@ interface ScheduleRepository {
 
     suspend fun addMoimSchedule(
         moimSchedule: MoimScheduleDetail
-    ): Boolean
+    ): Long
 
     suspend fun editMoimSchedule(
         moimSchedule: MoimScheduleDetail,
@@ -65,7 +65,12 @@ interface ScheduleRepository {
         imageUrl: String
     ): Boolean
 
-    suspend fun getGuestInvitaionLink(
+    suspend fun inviteMoimParticipant(
+        moimScheduleId: Long,
+        memberIdsToInvite: List<Long>
+    ): Boolean
+
+    suspend fun getGuestInvitationLink(
         moimScheduleId: Long
     ): String
 }

app/src/main/java/com/mongmong/namo/presentation/ui/common/ConfirmDialog.kt

@@ -7,11 +7,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.DialogFragment
+import com.mongmong.namo.R
 import com.mongmong.namo.databinding.DialogConfirmBinding
 
 class ConfirmDialog(
     confirmDialogInterface: ConfirmDialogInterface,
-    title: String, content: String?, buttonText: String, id: Int
+    title: String, content: String?, buttonText: String?, id: Int
 ) : DialogFragment() {
 
     interface ConfirmDialogInterface {
@@ -57,7 +58,9 @@ class ConfirmDialog(
             binding.dialogDescTv.text = content
         }
         // 확인 버튼 텍스트
-        binding.dialogYesBtn.text = buttonText
+        if (buttonText != null) {
+            binding.dialogYesBtn.text = buttonText
+        }
 
         // 취소 버튼이 없는 다이얼로그는 id를 -1로 넘겨줌
         if (id == -1) {

app/src/main/java/com/mongmong/namo/presentation/ui/community/CommunityFragment.kt

@@ -5,7 +5,7 @@ import com.google.android.material.tabs.TabLayoutMediator
 import com.mongmong.namo.R
 import com.mongmong.namo.databinding.FragmentCommunityBinding
 import com.mongmong.namo.presentation.config.BaseFragment
-import com.mongmong.namo.presentation.ui.community.alert.CommunityAlertActivity
+import com.mongmong.namo.presentation.ui.community.alert.FriendAlertActivity
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -20,7 +20,7 @@ class CommunityFragment : BaseFragment<FragmentCommunityBinding>(R.layout.fragme
 
     private fun initClickListeners() {
         binding.communityAlertIv.setOnClickListener {
-            startActivity(Intent(requireActivity(), CommunityAlertActivity::class.java))
+            startActivity(Intent(requireActivity(), FriendAlertActivity::class.java))
         }
     }
 

app/src/main/java/com/mongmong/namo/presentation/ui/community/alert/AlertViewModel.kt

@@ -5,14 +5,11 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.mongmong.namo.domain.model.FriendRequest
-import com.mongmong.namo.domain.model.Moim
-import com.mongmong.namo.domain.model.Participant
 import com.mongmong.namo.domain.repositories.FriendRepository
 import com.mongmong.namo.domain.usecases.friend.AcceptFriendRequestUseCase
 import com.mongmong.namo.domain.usecases.friend.DenyFriendRequestUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
-import org.joda.time.LocalDateTime
 import javax.inject.Inject
 
 @HiltViewModel
@@ -21,8 +18,6 @@ class AlertViewModel @Inject constructor(
     private val acceptFriendRequestUseCase: AcceptFriendRequestUseCase,
     private val denyFriendRequestUseCase: DenyFriendRequestUseCase
 ): ViewModel() {
-    private val _moimRequestList = MutableLiveData<List<Moim>>(emptyList())
-    val moimRequestList: LiveData<List<Moim>> = _moimRequestList
 
     private val _friendRequestList = MutableLiveData<List<FriendRequest>>(emptyList())
     val friendRequestList: LiveData<List<FriendRequest>> = _friendRequestList
@@ -31,13 +26,6 @@ class AlertViewModel @Inject constructor(
     val isComplete: LiveData<Boolean> = _isComplete
 
     init {
-        _moimRequestList.value = listOf(
-            Moim(
-                1, LocalDateTime.now(), "", "나모 모임 일정", "강남역",
-                listOf(
-                    Participant(participantId = 3, nickname = "코코아", colorId = 4)
-            ))
-        )
         getFriendRequests()
     }
 

app/src/main/java/com/mongmong/namo/presentation/ui/community/alert/FriendAlertFragment.kt → app/src/main/java/com/mongmong/namo/presentation/ui/community/alert/FriendAlertActivity.kt

@@ -1,24 +1,24 @@
 package com.mongmong.namo.presentation.ui.community.alert
 
-import androidx.fragment.app.activityViewModels
+import androidx.activity.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mongmong.namo.R
 import com.mongmong.namo.databinding.FragmentFriendAlertBinding
-import com.mongmong.namo.presentation.config.BaseFragment
+import com.mongmong.namo.presentation.config.BaseActivity
 import com.mongmong.namo.presentation.ui.community.alert.adapter.FriendAlertRVAdapter
 import com.mongmong.namo.presentation.ui.community.friend.FriendInfoDialog
 import com.mongmong.namo.presentation.ui.community.friend.OnFriendInfoChangedListener
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
-class FriendAlertFragment : BaseFragment<FragmentFriendAlertBinding>(R.layout.fragment_friend_alert), OnFriendInfoChangedListener {
+class FriendAlertActivity : BaseActivity<FragmentFriendAlertBinding>(R.layout.fragment_friend_alert), OnFriendInfoChangedListener {
 
-    private val viewModel: AlertViewModel by activityViewModels()
+    private val viewModel: AlertViewModel by viewModels()
 
     private lateinit var friendAdapter: FriendAlertRVAdapter
 
     override fun setup() {
-        binding.viewModel = this@FriendAlertFragment.viewModel
+        binding.viewModel = this@FriendAlertActivity.viewModel
 
         setAdapter()
         initObserve()
@@ -33,7 +33,7 @@ class FriendAlertFragment : BaseFragment<FragmentFriendAlertBinding>(R.layout.fr
         friendAdapter.setItemClickListener(object : FriendAlertRVAdapter.MyItemClickListener {
             override fun onFriendInfoClick(position: Int) {
                 // 친구 정보 화면으로 이동
-                FriendInfoDialog(null, viewModel.friendRequestList.value!![position], true, this@FriendAlertFragment).show(parentFragmentManager, "FriendInfoDialog")
+                FriendInfoDialog(null, viewModel.friendRequestList.value!![position], true, this@FriendAlertActivity).show(this@FriendAlertActivity.supportFragmentManager, "FiendDialog")
             }
 
             override fun onAcceptBtnClick(position: Int) {
@@ -49,7 +49,7 @@ class FriendAlertFragment : BaseFragment<FragmentFriendAlertBinding>(R.layout.fr
     }
 
     private fun initObserve() {
-        viewModel.friendRequestList.observe(viewLifecycleOwner) { friendRequestList ->
+        viewModel.friendRequestList.observe(this) { friendRequestList ->
             if (friendRequestList.isNotEmpty()) {
                 friendAdapter.addRequest(friendRequestList)
             }