🐛 Fix: 모임 생성 후 친구 초대 팝업 표시 안 되던 오류 수정

Related to: #347

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

@@ -78,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(

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,

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

@@ -4,18 +4,19 @@ import android.app.Activity
 import android.content.Intent
 import android.util.Log
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.ContextCompat
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mongmong.namo.R
 import com.mongmong.namo.databinding.FragmentMoimBinding
 import com.mongmong.namo.domain.model.Moim
+import com.mongmong.namo.domain.model.MoimCreateInfo
 import com.mongmong.namo.presentation.config.BaseFragment
 import com.mongmong.namo.presentation.ui.common.ConfirmDialog
 import com.mongmong.namo.presentation.ui.common.ConfirmDialog.ConfirmDialogInterface
-import com.mongmong.namo.presentation.ui.community.moim.diary.MoimDiaryDetailActivity
 import com.mongmong.namo.presentation.ui.community.moim.adapter.MoimRVAdapter
+import com.mongmong.namo.presentation.ui.community.moim.diary.MoimDiaryDetailActivity
 import com.mongmong.namo.presentation.ui.community.moim.schedule.FriendInviteActivity
+import com.mongmong.namo.presentation.ui.community.moim.schedule.FriendInviteActivity.Companion.MOIM_INVITE_KEY
 import com.mongmong.namo.presentation.ui.community.moim.schedule.MoimScheduleActivity
 import dagger.hilt.android.AndroidEntryPoint
 
@@ -30,17 +31,20 @@ class MoimFragment : BaseFragment<FragmentMoimBinding>(R.layout.fragment_moim),
     private val getResultText = registerForActivityResult(
         ActivityResultContracts.StartActivityForResult()
     ) { result ->
-        Log.d("MoimFragment", "ActivityResult received")
-        if (result.resultCode == Activity.RESULT_OK) {
-            Log.d("MoimFragment", "Result OK")
-            val isEdited = result.data?.getBooleanExtra(MOIM_EDIT_KEY, false)
-            if (isEdited == true) viewModel.getMoim() // 변경 사항이 있다면 업데이트
-
-            val createdMoimTitle = result.data?.getStringExtra(MOIM_CREATE_KEY)
-            Log.d("MoimFragment", "isEdited: $isEdited, createdMoimTitle: $createdMoimTitle")
-            if (createdMoimTitle != null) showCustomDialog(getString(R.string.dialog_moim_friend_invite_title, createdMoimTitle), R.string.dialog_moim_friend_invite_content, R.string.continuously, 0)
-        } else {
-            Log.d("MoimFragment", "Result not OK: ${result.resultCode}")
+        if (result.resultCode != Activity.RESULT_OK) return@registerForActivityResult
+
+        // 변경사항 확인
+        val isEdited = result.data?.getBooleanExtra(MOIM_EDIT_KEY, false)
+        if (isEdited == true) viewModel.getMoim() // 변경 사항이 있다면 업데이트
+
+        // 생성 모드인지 확인
+        try {
+            val createdMoimInfo = result.data?.getSerializableExtra(MOIM_CREATE_KEY) as MoimCreateInfo
+            Log.d("MoimFragment", "createdMoimInfo: $createdMoimInfo")
+            viewModel.createdMoimId = createdMoimInfo.moimId
+            showFriendInviteDialog(createdMoimInfo) // 친구 초대 다이얼로그 띄우기
+        } catch (e: Exception) {
+            Log.e("MoimFragment", "Error processing MoimCreateInfo: ${e.message}")
         }
     }
 
@@ -55,9 +59,9 @@ class MoimFragment : BaseFragment<FragmentMoimBinding>(R.layout.fragment_moim),
         // + 버튼
         binding.moimCreateFloatingBtn.setOnClickListener {
             // 모임 일정 생성 화면으로 이동
-            requireActivity().startActivity(Intent(context, MoimScheduleActivity::class.java)
+            val intent = Intent(context, MoimScheduleActivity::class.java)
                 .putExtra("moim", Moim())
-            )
+            getResultText.launch(intent)
         }
     }
 
@@ -83,9 +87,14 @@ class MoimFragment : BaseFragment<FragmentMoimBinding>(R.layout.fragment_moim),
         })
     }
 
-    private fun showCustomDialog(title: String, content: Int, buttonText: Int, id: Int) {
-        Log.d("MoimFragment", "showCustomDialog()")
-        val dialog = ConfirmDialog(this, title, getString(content), getString(buttonText), id)
+    private fun showFriendInviteDialog(createdMoimInfo: MoimCreateInfo) {
+        val dialog = ConfirmDialog(
+            this,
+            getString(R.string.dialog_moim_friend_invite_title, createdMoimInfo.title),
+            getString(R.string.dialog_moim_friend_invite_content),
+            getString(R.string.continuously),
+            DIALOG_MOIM_CREATE_ID
+        )
         dialog.isCancelable = false
         activity?.let { dialog.show(it.supportFragmentManager, "ConfirmDialog") }
     }
@@ -101,11 +110,15 @@ class MoimFragment : BaseFragment<FragmentMoimBinding>(R.layout.fragment_moim),
 
     override fun onClickYesButton(id: Int) {
         // 친구 초대 화면으로 이동
-        startActivity(Intent(requireActivity(), FriendInviteActivity::class.java))
+        val intent = Intent(requireActivity(), FriendInviteActivity::class.java)
+            .putExtra(MOIM_INVITE_KEY, viewModel.createdMoimId)
+        getResultText.launch(intent)
     }
 
     companion object {
         const val MOIM_EDIT_KEY = "moim_edit_key"
         const val MOIM_CREATE_KEY = "moim_create_key"
+
+        private const val DIALOG_MOIM_CREATE_ID = 0
     }
 }

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

@@ -17,6 +17,8 @@ class MoimViewModel @Inject constructor(
     private val _moimPreviewList = MutableLiveData<List<MoimPreview>>(emptyList())
     val moimPreviewList: LiveData<List<MoimPreview>> = _moimPreviewList
 
+    var createdMoimId: Long = -1
+
     init {
         getMoim()
     }

app/src/main/java/com/mongmong/namo/presentation/ui/community/moim/schedule/FriendInviteActivity.kt

@@ -1,14 +1,21 @@
 package com.mongmong.namo.presentation.ui.community.moim.schedule
 
+import android.app.Activity
+import android.content.Intent
 import android.text.Html
 import android.util.Log
 import android.view.View
 import androidx.activity.viewModels
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.mongmong.namo.R
 import com.mongmong.namo.databinding.ActivityFriendInviteBinding
+import com.mongmong.namo.domain.model.MoimCreateInfo
 import com.mongmong.namo.presentation.config.BaseActivity
+import com.mongmong.namo.presentation.enums.SuccessType
+import com.mongmong.namo.presentation.ui.MainActivity
 import com.mongmong.namo.presentation.ui.common.ConfirmDialog
+import com.mongmong.namo.presentation.ui.community.moim.MoimFragment.Companion.MOIM_CREATE_KEY
+import com.mongmong.namo.presentation.ui.community.moim.MoimFragment.Companion.MOIM_EDIT_KEY
 import com.mongmong.namo.presentation.ui.community.moim.schedule.adapter.FriendInvitePreparatoryRVAdapter
 import com.mongmong.namo.presentation.ui.community.moim.schedule.adapter.FriendInviteRVAdapter
 import dagger.hilt.android.AndroidEntryPoint
@@ -164,6 +171,11 @@ class FriendInviteActivity : BaseActivity<ActivityFriendInviteBinding>(R.layout.
         // API 호출 성공 여부
         viewModel.isSuccess.observe(this) { isSuccess ->
             if (isSuccess) {
+                // 편집여부 전달 (업데이트)
+                val intent = Intent(this, MainActivity::class.java).apply {
+                    putExtra(MOIM_EDIT_KEY, isSuccess) // 편집 여부
+                }
+                setResult(Activity.RESULT_OK, intent)
                 finish()
             }
         }

app/src/main/java/com/mongmong/namo/presentation/ui/community/moim/schedule/MoimScheduleActivity.kt

@@ -33,6 +33,7 @@ import com.kakao.vectormap.label.LabelOptions
 import com.mongmong.namo.presentation.ui.MainActivity.Companion.ORIGIN_ACTIVITY_INTENT_KEY
 import com.mongmong.namo.R
 import com.mongmong.namo.databinding.ActivityMoimScheduleBinding
+import com.mongmong.namo.domain.model.MoimCreateInfo
 import com.mongmong.namo.presentation.config.BaseActivity
 import com.mongmong.namo.presentation.enums.SuccessType
 import com.mongmong.namo.presentation.ui.MainActivity
@@ -224,7 +225,10 @@ class MoimScheduleActivity : BaseActivity<ActivityMoimScheduleBinding>(R.layout.
                 // 편집여부 전달 (업데이트)
                 val intent = Intent(this, MainActivity::class.java).apply {
                     putExtra(MOIM_EDIT_KEY, successState.isSuccess) // 편집 여부
-                    if (successState.type == SuccessType.ADD) putExtra(MOIM_CREATE_KEY, viewModel.moimSchedule.value?.title) // 친구 초대 팝업 표시용
+                    if (successState.type == SuccessType.ADD) putExtra(MOIM_CREATE_KEY, MoimCreateInfo(
+                        moimId = viewModel.createdMoimId,
+                        title = viewModel.moimSchedule.value?.title.toString()
+                    )) // 친구 초대 팝업 표시용
                 }
                 setResult(Activity.RESULT_OK, intent)
                 finish()

app/src/main/java/com/mongmong/namo/presentation/ui/community/moim/schedule/MoimScheduleViewModel.kt

@@ -43,6 +43,8 @@ class MoimScheduleViewModel @Inject constructor(
     var participantIdsToAdd = ArrayList<Long>(arrayListOf()) // 스케줄에 추가할 유저 ID(userId)
     var participantIdsToRemove = ArrayList<Long>(arrayListOf()) // 스케줄에서 삭제할 참가자 ID(participantId)
 
+    var createdMoimId: Long = -1
+
     // API 호출 성공 여부
     private val _successState = MutableLiveData<SuccessState>()
     var successState: LiveData<SuccessState> = _successState
@@ -60,10 +62,11 @@ class MoimScheduleViewModel @Inject constructor(
     fun postMoimSchedule() {
         viewModelScope.launch {
             uploadImageToServer(_moimSchedule.value?.coverImg)
+            createdMoimId = repository.addMoimSchedule(_moimSchedule.value!!)
 
             _successState.value = SuccessState(
                 SuccessType.ADD,
-                repository.addMoimSchedule(_moimSchedule.value!!)
+                createdMoimId >= 0
             )
         }
     }