Merge pull request #16621 from wordpress-mobile/issue/sync-bp-reminde…

…rs-swith-with-store

Issue/sync bp reminders swith with store

WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersModelMapper.kt

@@ -29,7 +29,8 @@ class BloggingRemindersModelMapper
                     }
                 }.toSet(),
                 uiModel.hour,
-                uiModel.minute
+                uiModel.minute,
+                uiModel.isPromptIncluded
         )
     }
 
@@ -38,7 +39,8 @@ class BloggingRemindersModelMapper
                 domainModel.siteId,
                 domainModel.enabledDays.map { DayOfWeek.valueOf(it.name) }.toSet(),
                 domainModel.hour,
-                domainModel.minute
+                domainModel.minute,
+                domainModel.isPromptIncluded
         )
     }
 }

WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersUiModel.kt

@@ -11,7 +11,7 @@ data class BloggingRemindersUiModel(
     val enabledDays: Set<DayOfWeek> = setOf(),
     val hour: Int,
     val minute: Int,
-    val isPromptIncluded: Boolean = true // TODO: get a real value here when implemented
+    val isPromptIncluded: Boolean
 ) {
     fun getNotificationTime(): CharSequence =
             LocalTime.of(hour, minute).format(DateTimeFormatter.ofLocalizedTime(FormatStyle.SHORT))

WordPress/src/main/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModel.kt

@@ -215,6 +215,7 @@ class BloggingRemindersViewModel @Inject constructor(
             outState.putStringArrayList(SELECTED_DAYS, ArrayList(model.enabledDays.map { it.name }))
             outState.putInt(SELECTED_HOUR, model.hour)
             outState.putInt(SELECTED_MINUTE, model.minute)
+            outState.putBoolean(IS_BLOGGING_PROMPT_INCLUDED, model.isPromptIncluded)
         }
         _isFirstTimeFlow.value?.let {
             outState.putBoolean(IS_FIRST_TIME_FLOW, it)
@@ -230,7 +231,14 @@ class BloggingRemindersViewModel @Inject constructor(
             val enabledDays = state.getStringArrayList(SELECTED_DAYS)?.map { DayOfWeek.valueOf(it) }?.toSet() ?: setOf()
             val selectedHour = state.getInt(SELECTED_HOUR)
             val selectedMinute = state.getInt(SELECTED_MINUTE)
-            _bloggingRemindersModel.value = BloggingRemindersUiModel(siteId, enabledDays, selectedHour, selectedMinute)
+            val isPromptIncluded = state.getBoolean(IS_BLOGGING_PROMPT_INCLUDED)
+            _bloggingRemindersModel.value = BloggingRemindersUiModel(
+                    siteId,
+                    enabledDays,
+                    selectedHour,
+                    selectedMinute,
+                    isPromptIncluded
+            )
         }
         _isFirstTimeFlow.value = state.getBoolean(IS_FIRST_TIME_FLOW)
     }
@@ -295,6 +303,7 @@ class BloggingRemindersViewModel @Inject constructor(
         private const val SELECTED_DAYS = "key_selected_days"
         private const val SELECTED_HOUR = "key_selected_hour"
         private const val SELECTED_MINUTE = "key_selected_minute"
+        private const val IS_BLOGGING_PROMPT_INCLUDED = "key_is_blogging_prompt_included"
         private const val IS_FIRST_TIME_FLOW = "is_first_time_flow"
         private const val SITE_ID = "key_site_id"
     }

WordPress/src/main/java/org/wordpress/android/workers/reminder/PromptReminderNotifier.kt

@@ -7,6 +7,7 @@ import androidx.core.app.NotificationCompat.PRIORITY_DEFAULT
 import kotlinx.coroutines.flow.firstOrNull
 import org.wordpress.android.R
 import org.wordpress.android.fluxc.store.AccountStore
+import org.wordpress.android.fluxc.store.BloggingRemindersStore
 import org.wordpress.android.fluxc.store.SiteStore
 import org.wordpress.android.fluxc.store.bloggingprompts.BloggingPromptsStore
 import org.wordpress.android.push.NotificationPushIds.REMINDER_NOTIFICATION_ID
@@ -26,11 +27,9 @@ class PromptReminderNotifier @Inject constructor(
     val accountStore: AccountStore,
     val reminderNotificationManager: ReminderNotificationManager,
     val bloggingPromptsFeatureConfig: BloggingPromptsFeatureConfig,
-    val bloggingPromptsStore: BloggingPromptsStore
+    val bloggingPromptsStore: BloggingPromptsStore,
+    private val bloggingRemindersStore: BloggingRemindersStore
 ) {
-    // TODO @RenanLukas replace with remote field in SiteModel after endpoint integration
-    var hasOptedInBloggingPromptsReminders = true
-
     suspend fun notify(siteId: Int) {
         val notificationId = REMINDER_NOTIFICATION_ID + siteId
         val context = contextProvider.getContext()
@@ -89,11 +88,17 @@ class PromptReminderNotifier @Inject constructor(
         //  analyticsTracker.trackNotificationReceived()
     }
 
-    fun shouldNotify(siteId: Int): Boolean {
+    suspend fun shouldNotify(siteId: Int): Boolean {
         val hasAccessToken = accountStore.hasAccessToken()
         val isBloggingPromptsEnabled = bloggingPromptsFeatureConfig.isEnabled()
         val siteModel = siteStore.getSiteByLocalId(siteId)
-        val hasOptedInBloggingPromptsReminders = siteModel != null && hasOptedInBloggingPromptsReminders
+
+        val isPromptOptedIn = bloggingRemindersStore.bloggingRemindersModel(siteId).firstOrNull()?.isPromptIncluded
+                ?: false
+        // TODO @klymyam check the value from the site model when we will start syncing the settings with remote
+        // val isPromptOptedIn = siteModel.isBloggingPromptsOptedIn
+
+        val hasOptedInBloggingPromptsReminders = siteModel != null && isPromptOptedIn
         return hasAccessToken && isBloggingPromptsEnabled && hasOptedInBloggingPromptsReminders
     }
 

WordPress/src/test/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersAnalyticsTrackerTest.kt

@@ -135,7 +135,7 @@ class BloggingRemindersAnalyticsTrackerTest {
     @Test
     fun `trackRemindersScheduled tracks correct event and properties`() {
         bloggingRemindersUiModel = BloggingRemindersUiModel(
-                1, setOf(MONDAY, THURSDAY, FRIDAY), 14, 30)
+                1, setOf(MONDAY, THURSDAY, FRIDAY), 14, 30, true)
         bloggingRemindersAnalyticsTracker.trackRemindersScheduled(
                 bloggingRemindersUiModel.enabledDays.size, bloggingRemindersUiModel.getNotificationTime24hour())
         verify(analyticsTracker).track(eq(BLOGGING_REMINDERS_SCHEDULED), checkMap {

WordPress/src/test/java/org/wordpress/android/ui/bloggingreminders/BloggingRemindersViewModelTest.kt

@@ -171,7 +171,8 @@ class BloggingRemindersViewModelTest : BaseUnitTest() {
                                 siteId,
                                 setOf(DayOfWeek.MONDAY, DayOfWeek.SUNDAY),
                                 hour,
-                                minute
+                                minute,
+                                false
                         )
                 )
         ).thenReturn(dayLabel)
@@ -423,7 +424,7 @@ class BloggingRemindersViewModelTest : BaseUnitTest() {
     private fun initEmptyStore(): BloggingRemindersUiModel {
         val emptyModel = BloggingRemindersModel(siteId)
         whenever(bloggingRemindersStore.bloggingRemindersModel(siteId)).thenReturn(flowOf(emptyModel))
-        return BloggingRemindersUiModel(siteId, hour = hour, minute = minute)
+        return BloggingRemindersUiModel(siteId, hour = hour, minute = minute, isPromptIncluded = false)
     }
 
     private fun assertPrologue() {

WordPress/src/test/java/org/wordpress/android/ui/bloggingreminders/DaySelectionBuilderTest.kt

@@ -74,7 +74,7 @@ class DaySelectionBuilderTest {
 
     @Test
     fun `builds UI model with no selected days`() {
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, hour = hour, minute = minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(1, hour = hour, minute = minute, isPromptIncluded = false)
         val dayLabel = UiStringText("Not set")
         whenever(dayLabelUtils.buildNTimesLabel(bloggingRemindersModel))
                 .thenReturn(dayLabel)
@@ -92,7 +92,13 @@ class DaySelectionBuilderTest {
 
     @Test
     fun `builds UI model with selected days`() {
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(
+                1,
+                setOf(WEDNESDAY, SUNDAY),
+                hour,
+                minute,
+                isPromptIncluded = false
+        )
         val dayLabel = UiStringText("Twice a week")
         whenever(dayLabelUtils.buildNTimesLabel(bloggingRemindersModel))
                 .thenReturn(dayLabel)
@@ -110,7 +116,7 @@ class DaySelectionBuilderTest {
 
     @Test
     fun `click on a day select day`() {
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, hour = hour, minute = minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(1, hour = hour, minute = minute, isPromptIncluded = false)
         whenever(dayLabelUtils.buildNTimesLabel(bloggingRemindersModel)).thenReturn(UiStringText("Once a week"))
 
         val uiModel = daySelectionBuilder.buildSelection(
@@ -129,7 +135,7 @@ class DaySelectionBuilderTest {
 
     @Test
     fun `primary button disabled when model is empty and is first time flow`() {
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, hour = hour, minute = minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(1, hour = hour, minute = minute, isPromptIncluded = false)
 
         val primaryButton = daySelectionBuilder.buildPrimaryButton(bloggingRemindersModel, true, onConfirm)
 
@@ -144,7 +150,13 @@ class DaySelectionBuilderTest {
 
     @Test
     fun `primary button enabled when model is not empty and is first time flow`() {
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(
+                1,
+                setOf(WEDNESDAY, SUNDAY),
+                hour,
+                minute,
+                isPromptIncluded = false
+        )
 
         val primaryButton = daySelectionBuilder.buildPrimaryButton(bloggingRemindersModel, true, onConfirm)
 
@@ -159,7 +171,7 @@ class DaySelectionBuilderTest {
 
     @Test
     fun `primary button enabled when model is empty and is not first time flow`() {
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, hour = hour, minute = minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(1, hour = hour, minute = minute, isPromptIncluded = false)
 
         val primaryButton = daySelectionBuilder.buildPrimaryButton(bloggingRemindersModel, false, onConfirm)
 
@@ -176,7 +188,13 @@ class DaySelectionBuilderTest {
     fun `primary button shows a different label when blogging prompt FF is on`() {
         whenever(bloggingPromptsFeatureConfig.isEnabled()).thenReturn(true)
 
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(
+                1,
+                setOf(WEDNESDAY, SUNDAY),
+                hour,
+                minute,
+                isPromptIncluded = false
+        )
 
         val primaryButton = daySelectionBuilder.buildPrimaryButton(bloggingRemindersModel, true, onConfirm)
 
@@ -191,7 +209,7 @@ class DaySelectionBuilderTest {
 
     @Test
     fun `click on primary button confirm selection`() {
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute, false)
 
         val primaryButton = daySelectionBuilder.buildPrimaryButton(bloggingRemindersModel, false, onConfirm)
 
@@ -204,7 +222,7 @@ class DaySelectionBuilderTest {
     fun `include prompt switch is visible when days are selected`() {
         whenever(bloggingPromptsFeatureConfig.isEnabled()).thenReturn(true)
 
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute, false)
         val dayLabel = UiStringText("Twice a week")
         whenever(dayLabelUtils.buildNTimesLabel(bloggingRemindersModel))
                 .thenReturn(dayLabel)
@@ -223,7 +241,7 @@ class DaySelectionBuilderTest {
 
     @Test
     fun `include prompt switch is not visible when days are not selected`() {
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, hour = hour, minute = minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(1, hour = hour, minute = minute, isPromptIncluded = false)
         val dayLabel = UiStringText("Not set")
         whenever(dayLabelUtils.buildNTimesLabel(bloggingRemindersModel))
                 .thenReturn(dayLabel)
@@ -244,7 +262,7 @@ class DaySelectionBuilderTest {
     fun `single include prompt switch is visible when FF is on`() {
         whenever(bloggingPromptsFeatureConfig.isEnabled()).thenReturn(true)
 
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute, false)
         val dayLabel = UiStringText("Twice a week")
         whenever(dayLabelUtils.buildNTimesLabel(bloggingRemindersModel))
                 .thenReturn(dayLabel)
@@ -265,7 +283,7 @@ class DaySelectionBuilderTest {
     fun `include prompt switch is not visible when FF is off`() {
         whenever(bloggingPromptsFeatureConfig.isEnabled()).thenReturn(false)
 
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute, false)
         val dayLabel = UiStringText("Twice a week")
         whenever(dayLabelUtils.buildNTimesLabel(bloggingRemindersModel))
                 .thenReturn(dayLabel)
@@ -286,7 +304,7 @@ class DaySelectionBuilderTest {
     fun `click on a prompt switch toggles the prompt state`() {
         whenever(bloggingPromptsFeatureConfig.isEnabled()).thenReturn(true)
 
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute, false)
         val dayLabel = UiStringText("Twice a week")
         whenever(dayLabelUtils.buildNTimesLabel(bloggingRemindersModel))
                 .thenReturn(dayLabel)
@@ -309,7 +327,7 @@ class DaySelectionBuilderTest {
     fun `click on a blogging prompt help button shows blogging prompt dialog`() {
         whenever(bloggingPromptsFeatureConfig.isEnabled()).thenReturn(true)
 
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(WEDNESDAY, SUNDAY), hour, minute, false)
         val dayLabel = UiStringText("Twice a week")
         whenever(dayLabelUtils.buildNTimesLabel(bloggingRemindersModel))
                 .thenReturn(dayLabel)

WordPress/src/test/java/org/wordpress/android/ui/bloggingreminders/EpilogueBuilderTest.kt

@@ -46,7 +46,7 @@ class EpilogueBuilderTest {
 
     @Test
     fun `builds UI model with no selected days`() {
-        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(), hour, minute)
+        val bloggingRemindersModel = BloggingRemindersUiModel(1, setOf(), hour, minute, false)
         val uiModel = epilogueBuilder.buildUiItems(bloggingRemindersModel)
 
         assertModelWithNoSelection(uiModel)
@@ -58,7 +58,8 @@ class EpilogueBuilderTest {
                 1,
                 setOf(DayOfWeek.WEDNESDAY, DayOfWeek.SUNDAY),
                 hour,
-                minute
+                minute,
+                false
         )
         val dayLabel = "twice"
         whenever(dayLabelUtils.buildLowercaseNTimesLabel(bloggingRemindersModel))
@@ -88,7 +89,8 @@ class EpilogueBuilderTest {
                 1,
                 DayOfWeek.values().toSet(),
                 hour,
-                minute
+                minute,
+                false
         )
         val message = "You'll get reminders to blog <b>everyday</b> at <b>10:00 am</b>."
         whenever(