Refactoring to use requireNotNull and GenericError with message

Author: develric

WordPress/src/main/java/org/wordpress/android/reader/savedposts/ReaderSavedPostsAnalyticsTracker.kt

@@ -2,6 +2,7 @@ package org.wordpress.android.reader.savedposts
 
 import org.wordpress.android.analytics.AnalyticsTracker.Stat
 import org.wordpress.android.reader.savedposts.ReaderSavedPostsAnalyticsTracker.ErrorType.Companion.ERROR_TYPE
+import org.wordpress.android.reader.savedposts.ReaderSavedPostsAnalyticsTracker.ErrorType.Companion.EXPORTED_POSTS
 import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import javax.inject.Inject
 
@@ -10,20 +11,20 @@ class ReaderSavedPostsAnalyticsTracker @Inject constructor(
 ) {
     fun trackStart() = analyticsTracker.track(Stat.READER_SAVED_POSTS_START)
 
-    fun trackSuccess() = analyticsTracker.track(Stat.READER_SAVED_POSTS_SUCCESS)
+    fun trackSuccess(numPosts: Int) = analyticsTracker.track(Stat.READER_SAVED_POSTS_SUCCESS, mapOf(EXPORTED_POSTS to numPosts))
 
     fun trackFailed(errorType: ErrorType) =
             analyticsTracker.track(Stat.READER_SAVED_POSTS_FAILED, mapOf(ERROR_TYPE to errorType.value))
 
-    sealed class ErrorType(val value: String) {
-        object NoUserSavedPostsError : ErrorType("no_saved_posts_found_error")
-
+    sealed class ErrorType(open val value: String) {
         object QuerySavedPostsError : ErrorType("query_saved_posts_error")
 
-        object UpdateSavedPostsError : ErrorType("update_saved_posts_error")
+        class GenericError(errorMessage: String?) : ErrorType("generic_error: ${errorMessage?.take(EXCEPTION_MESSAGE_MAX_LENGTH) ?: ""}")
 
         companion object {
             const val ERROR_TYPE = "error_type"
+            const val EXPORTED_POSTS = "exported_posts"
+            const val EXCEPTION_MESSAGE_MAX_LENGTH = 100
         }
     }
 }

WordPress/src/main/java/org/wordpress/android/reader/savedposts/resolver/ReaderSavedPostsResolver.kt

@@ -49,12 +49,7 @@ class ReaderSavedPostsResolver @Inject constructor(
         if (savedPostsCursor != null) {
             val posts = queryResult.getValue<ReaderPostList>(savedPostsCursor) ?: ReaderPostList()
 
-            if (posts.isNotEmpty()) {
-                updateReaderSavedPosts(onSuccess, onFailure, posts)
-            } else {
-                readerSavedPostsAnalyticsTracker.trackFailed(ErrorType.NoUserSavedPostsError)
-                onFailure()
-            }
+            updateReaderSavedPosts(onSuccess, onFailure, posts)
         } else {
             readerSavedPostsAnalyticsTracker.trackFailed(ErrorType.QuerySavedPostsError)
             onFailure()
@@ -77,25 +72,29 @@ class ReaderSavedPostsResolver @Inject constructor(
         posts: ReaderPostList
     ) {
         try {
-            readerDatabaseWrapper.reset(false)
-            readerTagTableWrapper.addOrUpdateTag(
-                    ReaderTag(
-                            "",
-                            contextProvider.getContext().getString(R.string.reader_save_for_later_display_name),
-                            contextProvider.getContext().getString(R.string.reader_save_for_later_title),
-                            "",
-                            BOOKMARKED
-                    )
-            )
+            if (posts.isNotEmpty()) {
+                readerDatabaseWrapper.reset(false)
+                readerTagTableWrapper.addOrUpdateTag(
+                        ReaderTag(
+                                "",
+                                contextProvider.getContext().getString(R.string.reader_save_for_later_display_name),
+                                contextProvider.getContext().getString(R.string.reader_save_for_later_title),
+                                "",
+                                BOOKMARKED
+                        )
+                )
 
-            readerTagTableWrapper.getBookmarkTags()!!.first().let {
-                readerPostTableWrapper.addOrUpdatePosts(it, posts)
+                requireNotNull(readerTagTableWrapper.getBookmarkTags()) {
+                    "unexpected null bookmark tags"
+                }.first().let {
+                    readerPostTableWrapper.addOrUpdatePosts(it, posts)
+                }
             }
 
-            readerSavedPostsAnalyticsTracker.trackSuccess()
+            readerSavedPostsAnalyticsTracker.trackSuccess(posts.size)
             onSuccess()
         } catch (exception: Exception) {
-            readerSavedPostsAnalyticsTracker.trackFailed(ErrorType.UpdateSavedPostsError)
+            readerSavedPostsAnalyticsTracker.trackFailed(ErrorType.GenericError(exception.message))
             onFailure()
         }
     }