[MBL-18013][Student][Parent] Refactor reminder logic

apps/parent/src/androidTest/java/com/instructure/parentapp/ui/interaction/AssignmentDetailsInteractionTest.kt

@@ -19,8 +19,13 @@ import androidx.compose.ui.platform.ComposeView
 import androidx.test.espresso.matcher.ViewMatchers
 import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils
 import com.google.android.apps.common.testing.accessibility.framework.checks.SpeakableTextPresentCheck
+import com.instructure.canvas.espresso.FeatureCategory
+import com.instructure.canvas.espresso.Priority
+import com.instructure.canvas.espresso.TestCategory
+import com.instructure.canvas.espresso.TestMetaData
 import com.instructure.canvas.espresso.checkToastText
 import com.instructure.canvas.espresso.common.pages.AssignmentDetailsPage
+import com.instructure.canvas.espresso.common.pages.ReminderPage
 import com.instructure.canvas.espresso.mockCanvas.MockCanvas
 import com.instructure.canvas.espresso.mockCanvas.addAssignment
 import com.instructure.canvas.espresso.mockCanvas.addAssignmentsToGroups
@@ -33,6 +38,7 @@ import com.instructure.canvasapi2.models.Assignment
 import com.instructure.canvasapi2.models.CourseSettings
 import com.instructure.canvasapi2.utils.toApiString
 import com.instructure.espresso.ModuleItemInteractions
+import com.instructure.pandautils.utils.toFormattedString
 import com.instructure.parentapp.R
 import com.instructure.parentapp.utils.ParentComposeTest
 import com.instructure.parentapp.utils.tokenLogin
@@ -47,6 +53,7 @@ class AssignmentDetailsInteractionTest : ParentComposeTest() {
     override fun displaysPageObjects() = Unit
 
     private val assignmentDetailsPage = AssignmentDetailsPage(ModuleItemInteractions())
+    private val reminderPage = ReminderPage(composeTestRule)
 
     @Test
     fun testSubmissionStatus_Missing() {
@@ -242,132 +249,132 @@ class AssignmentDetailsInteractionTest : ParentComposeTest() {
     }
 
     @Test
-    fun testReminderSectionIsNotVisibleWhenThereIsNoFutureDueDate() {
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION)
+    fun testReminderSectionIsVisibleWhenThereIsNoFutureDueDate() {
         val data = setupData()
         val course = data.courses.values.first()
         val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply {
             add(Calendar.DAY_OF_MONTH, -1)
         }.time.toApiString())
         gotoAssignment(data, assignment)
 
-        assignmentDetailsPage.assertReminderSectionNotDisplayed()
+        reminderPage.assertReminderSectionDisplayed()
     }
 
     @Test
-    fun testReminderSectionIsVisibleWhenThereIsFutureDueDate() {
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION)
+    fun testReminderSectionIsVisibleWhenThereIsNoDueDate() {
         val data = setupData()
         val course = data.courses.values.first()
-        val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply {
-            add(Calendar.DAY_OF_MONTH, 1)
-        }.time.toApiString())
+        val assignment = data.addAssignment(course.id, name = "Test Assignment")
         gotoAssignment(data, assignment)
 
-        assignmentDetailsPage.assertReminderSectionDisplayed()
+        reminderPage.assertReminderSectionDisplayed()
     }
 
     @Test
-    fun testAddReminder() {
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION)
+    fun testReminderSectionIsVisibleWhenThereIsFutureDueDate() {
         val data = setupData()
         val course = data.courses.values.first()
         val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply {
             add(Calendar.DAY_OF_MONTH, 1)
         }.time.toApiString())
         gotoAssignment(data, assignment)
 
-        assignmentDetailsPage.clickAddReminder()
-        assignmentDetailsPage.selectTimeOption("1 Hour Before")
-
-        assignmentDetailsPage.assertReminderDisplayedWithText("1 Hour Before")
+        reminderPage.assertReminderSectionDisplayed()
     }
 
     @Test
-    fun testRemoveReminder() {
+    @TestMetaData(Priority.MANDATORY, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION)
+    fun testAddReminder() {
+        val reminderCalendar = Calendar.getInstance().apply {
+            add(Calendar.DAY_OF_MONTH, 1)
+        }
         val data = setupData()
         val course = data.courses.values.first()
         val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply {
-            add(Calendar.DAY_OF_MONTH, 1)
+            add(Calendar.DAY_OF_MONTH, 2)
         }.time.toApiString())
         gotoAssignment(data, assignment)
 
-        assignmentDetailsPage.clickAddReminder()
-        assignmentDetailsPage.selectTimeOption("1 Hour Before")
-
-        assignmentDetailsPage.assertReminderDisplayedWithText("1 Hour Before")
+        reminderPage.clickAddReminder()
+        reminderPage.clickCustomReminderOption()
+        reminderPage.selectDate(reminderCalendar)
+        reminderPage.selectTime(reminderCalendar)
 
-        assignmentDetailsPage.removeReminderWithText("1 Hour Before")
-
-        assignmentDetailsPage.assertReminderNotDisplayedWithText("1 Hour Before")
+        reminderPage.assertReminderDisplayedWithText(reminderCalendar.time.toFormattedString())
     }
 
     @Test
-    fun testAddCustomReminder() {
+    @TestMetaData(Priority.MANDATORY, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION)
+    fun testRemoveReminder() {
+        val reminderCalendar = Calendar.getInstance().apply {
+            add(Calendar.DAY_OF_MONTH, 1)
+        }
         val data = setupData()
         val course = data.courses.values.first()
         val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply {
-            add(Calendar.DAY_OF_MONTH, 1)
+            add(Calendar.DAY_OF_MONTH, 2)
         }.time.toApiString())
         gotoAssignment(data, assignment)
 
-        assignmentDetailsPage.clickAddReminder()
-        assignmentDetailsPage.clickCustom()
-        assignmentDetailsPage.assertDoneButtonIsDisabled()
-        assignmentDetailsPage.fillQuantity("15")
-        assignmentDetailsPage.assertDoneButtonIsDisabled()
-        assignmentDetailsPage.clickHoursBefore()
-        assignmentDetailsPage.clickDone()
+        reminderPage.clickAddReminder()
+        reminderPage.clickCustomReminderOption()
+        reminderPage.selectDate(reminderCalendar)
+        reminderPage.selectTime(reminderCalendar)
 
-        assignmentDetailsPage.assertReminderDisplayedWithText("15 Hours Before")
+
+        reminderPage.assertReminderDisplayedWithText(reminderCalendar.time.toFormattedString())
+
+        reminderPage.removeReminderWithText(reminderCalendar.time.toFormattedString())
+
+        reminderPage.assertReminderNotDisplayedWithText(reminderCalendar.time.toFormattedString())
     }
 
     @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION)
     fun testAddReminderInPastShowsError() {
+        val reminderCalendar = Calendar.getInstance().apply {
+            add(Calendar.DAY_OF_MONTH, -1)
+        }
         val data = setupData()
         val course = data.courses.values.first()
         val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply {
             add(Calendar.MINUTE, 30)
         }.time.toApiString())
         gotoAssignment(data, assignment)
 
-        assignmentDetailsPage.clickAddReminder()
-        assignmentDetailsPage.selectTimeOption("1 Hour Before")
+        reminderPage.clickAddReminder()
+        reminderPage.clickCustomReminderOption()
+        reminderPage.selectDate(reminderCalendar)
+        reminderPage.selectTime(reminderCalendar)
 
         checkToastText(R.string.reminderInPast, activityRule.activity)
     }
 
     @Test
+    @TestMetaData(Priority.IMPORTANT, FeatureCategory.ASSIGNMENTS, TestCategory.INTERACTION)
     fun testAddReminderForTheSameTimeShowsError() {
-        val data = setupData()
-        val course = data.courses.values.first()
-        val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply {
+        val reminderCalendar = Calendar.getInstance().apply {
             add(Calendar.DAY_OF_MONTH, 1)
-        }.time.toApiString())
-        gotoAssignment(data, assignment)
-
-        assignmentDetailsPage.clickAddReminder()
-        assignmentDetailsPage.selectTimeOption("1 Hour Before")
-        assignmentDetailsPage.clickAddReminder()
-        assignmentDetailsPage.selectTimeOption("1 Hour Before")
-
-        checkToastText(R.string.reminderAlreadySet, activityRule.activity)
-    }
-
-    @Test
-    fun testAddReminderForTheSameTimeWithDifferentMeasureOfTimeShowsError() {
+        }
         val data = setupData()
         val course = data.courses.values.first()
         val assignment = data.addAssignment(course.id, name = "Test Assignment", dueAt = Calendar.getInstance().apply {
-            add(Calendar.DAY_OF_MONTH, 10)
+            add(Calendar.DAY_OF_MONTH, 2)
         }.time.toApiString())
         gotoAssignment(data, assignment)
 
-        assignmentDetailsPage.clickAddReminder()
-        assignmentDetailsPage.selectTimeOption("1 Week Before")
-        assignmentDetailsPage.clickAddReminder()
+        reminderPage.clickAddReminder()
+        reminderPage.clickCustomReminderOption()
+        reminderPage.selectDate(reminderCalendar)
+        reminderPage.selectTime(reminderCalendar)
 
-        assignmentDetailsPage.clickCustom()
-        assignmentDetailsPage.fillQuantity("7")
-        assignmentDetailsPage.clickDaysBefore()
-        assignmentDetailsPage.clickDone()
+        reminderPage.clickAddReminder()
+        reminderPage.clickCustomReminderOption()
+        reminderPage.selectDate(reminderCalendar)
+        reminderPage.selectTime(reminderCalendar)
 
         checkToastText(R.string.reminderAlreadySet, activityRule.activity)
     }

apps/parent/src/main/java/com/instructure/parentapp/features/assignment/details/ParentAssignmentDetailsBehaviour.kt

@@ -133,4 +133,8 @@ class ParentAssignmentDetailsBehaviour @Inject constructor(
     private fun getContextURL(courseId: Long, assignmentId: Long): String {
         return "${apiPrefs.fullDomain}/courses/$courseId/assignments/$assignmentId"
     }
+
+    override fun getThemeColor(course: Course): Int {
+        return parentPrefs.currentStudent.studentColor
+    }
 }

apps/parent/src/main/java/com/instructure/parentapp/features/assignment/details/receiver/ParentAlarmReceiverNotificationHandler.kt

@@ -27,8 +27,8 @@ import com.instructure.parentapp.R
 import com.instructure.parentapp.features.main.MainActivity
 
 class ParentAlarmReceiverNotificationHandler: AlarmReceiverNotificationHandler {
-    override fun showNotification(context: Context, assignmentId: Long, assignmentPath: String, assignmentName: String, dueIn: String) {
-        val intent = MainActivity.createIntent(context, Uri.parse(assignmentPath))
+    override fun showNotification(context: Context, contentId: Long, htmlPath: String, title: String, message: String) {
+        val intent = MainActivity.createIntent(context, Uri.parse(htmlPath))
 
         val pendingIntent = PendingIntent.getActivity(
             context, 0, intent,
@@ -37,14 +37,14 @@ class ParentAlarmReceiverNotificationHandler: AlarmReceiverNotificationHandler {
 
         val builder = NotificationCompat.Builder(context, AlarmReceiver.CHANNEL_ID)
             .setSmallIcon(R.drawable.ic_notification_canvas_logo)
-            .setContentTitle(context.getString(R.string.reminderNotificationTitle))
-            .setContentText(context.getString(R.string.reminderNotificationDescription, dueIn, assignmentName))
+            .setContentTitle(title)
+            .setContentText(message)
             .setAutoCancel(true)
             .setContentIntent(pendingIntent)
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)
 
         val notificationManager = context.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-        notificationManager.notify(assignmentId.toInt(), builder.build())
+        notificationManager.notify(contentId.toInt(), builder.build())
     }
 
     override fun createNotificationChannel(context: Context) {