feat(...) : 없는 스터디면 뒤로가라

iron-mental · Apr 7, 2021 · 0caf924 · 0caf924
1 parent 09bd430
commit 0caf924
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 19 deletions.
diff --git a/app/src/main/java/com/iron/espresso/presentation/home/mystudy/MyStudyDetailActivity.kt b/app/src/main/java/com/iron/espresso/presentation/home/mystudy/MyStudyDetailActivity.kt
@@ -70,22 +70,26 @@ class MyStudyDetailActivity :
 
         binding.topTab.selectTab(binding.topTab.getTabAt(1))
 
-        viewModel.getStudy(studyId)
-
-        viewModel.studyDetail.observe(this, { studyDetailItem ->
-            studyInfoItem = studyDetailItem.studyInfoItem
-            setToolbarTitle(studyInfoItem?.title)
-
-            val findFragment = supportFragmentManager.fragments.find { it is NoticeFragment } as NoticeFragment
-            findFragment.setAuthority(studyInfoItem?.authority.orEmpty())
-
-        })
-
-        viewModel.toastMessage.observe(this, EventObserver { message ->
-            toast(message)
-            setResult(RESULT_OK)
-            finish()
-        })
+        viewModel.run {
+            getStudy(studyId)
+            studyDetail.observe(this@MyStudyDetailActivity, { studyDetailItem ->
+                studyInfoItem = studyDetailItem.studyInfoItem
+                setToolbarTitle(studyInfoItem?.title)
+
+                val findFragment = supportFragmentManager.fragments.find { it is NoticeFragment } as NoticeFragment
+                findFragment.setAuthority(studyInfoItem?.authority.orEmpty())
+
+            })
+            toastMessage.observe(this@MyStudyDetailActivity, EventObserver { message ->
+                toast(message)
+            })
+            successEvent.observe(this@MyStudyDetailActivity, EventObserver { success ->
+                if (success) {
+                    setResult(RESULT_OK)
+                }
+                finish()
+            })
+        }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {

diff --git a/app/src/main/java/com/iron/espresso/presentation/home/mystudy/MyStudyDetailViewModel.kt b/app/src/main/java/com/iron/espresso/presentation/home/mystudy/MyStudyDetailViewModel.kt
@@ -27,6 +27,10 @@ class MyStudyDetailViewModel @Inject constructor(
     val studyDetail: LiveData<StudyDetailItem>
         get() = _studyDetail
 
+    private val _successEvent = MutableLiveData<Event<Boolean>>()
+    val successEvent: LiveData<Event<Boolean>>
+        get() = _successEvent
+
     fun getStudy(studyId: Int) {
         compositeDisposable += studyRepository
             .getStudyDetail(
@@ -41,9 +45,10 @@ class MyStudyDetailViewModel @Inject constructor(
                 Logger.d("$it")
             }, {
                 val errorResponse = (it as? HttpException)?.toErrorResponse()
-                if (errorResponse != null) {
-                    Logger.d("$errorResponse")
-                }
+                Logger.d("$errorResponse")
+                _toastMessage.value = Event(errorResponse?.message.orEmpty())
+                _successEvent.value = Event(false)
+
             })
     }
 
@@ -56,6 +61,7 @@ class MyStudyDetailViewModel @Inject constructor(
             .subscribe({
                 delete(studyId)
                 _toastMessage.value = Event(it.message.orEmpty())
+                _successEvent.value = Event(true)
                 Logger.d("$it")
             }, {
                 val errorResponse = (it as? HttpException)?.toErrorResponse()
@@ -73,6 +79,7 @@ class MyStudyDetailViewModel @Inject constructor(
             .subscribe({
                 deleteAll(studyId)
                 _toastMessage.value = Event(it.message.orEmpty())
+                _successEvent.value = Event(true)
                 Logger.d("$it")
             }, {
                 val errorResponse = (it as? HttpException)?.toErrorResponse()