refactor: Rename EnrollmentStatus field (#385)

openedx · Oct 17, 2024 · bbf71e3 · bbf71e3
1 parent a8b7395
commit bbf71e3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/core/src/main/java/org/openedx/core/data/model/EnrollmentStatus.kt b/core/src/main/java/org/openedx/core/data/model/EnrollmentStatus.kt
@@ -8,12 +8,12 @@ data class EnrollmentStatus(
     val courseId: String?,
     @SerializedName("course_name")
     val courseName: String?,
-    @SerializedName("is_active")
-    val isActive: Boolean?
+    @SerializedName("recently_active")
+    val recentlyActive: Boolean?
 ) {
     fun mapToDomain() = EnrollmentStatus(
         courseId = courseId ?: "",
         courseName = courseName ?: "",
-        isActive = isActive ?: false
+        recentlyActive = recentlyActive ?: false
     )
 }
diff --git a/core/src/main/java/org/openedx/core/domain/model/EnrollmentStatus.kt b/core/src/main/java/org/openedx/core/domain/model/EnrollmentStatus.kt
@@ -3,5 +3,5 @@ package org.openedx.core.domain.model
 data class EnrollmentStatus(
     val courseId: String,
     val courseName: String,
-    val isActive: Boolean
+    val recentlyActive: Boolean
 )
diff --git a/core/src/main/java/org/openedx/core/worker/CalendarSyncWorker.kt b/core/src/main/java/org/openedx/core/worker/CalendarSyncWorker.kt
@@ -136,7 +136,7 @@ class CalendarSyncWorker(
         val courseId = enrollmentStatus.courseId
         try {
             createCalendarState(enrollmentStatus)
-            if (enrollmentStatus.isActive && isCourseSyncEnabled(courseId)) {
+            if (enrollmentStatus.recentlyActive && isCourseSyncEnabled(courseId)) {
                 val courseDates = calendarInteractor.getCourseDates(courseId)
                 val isCourseCalendarUpToDate = isCourseCalendarUpToDate(courseId, courseDates)
                 if (!isCourseCalendarUpToDate) {
@@ -191,7 +191,7 @@ class CalendarSyncWorker(
         if (courseCalendarStateChecksum == null) {
             val courseCalendarStateEntity = CourseCalendarStateEntity(
                 courseId = enrollmentStatus.courseId,
-                isCourseSyncEnabled = enrollmentStatus.isActive
+                isCourseSyncEnabled = enrollmentStatus.recentlyActive
             )
             calendarInteractor.insertCourseCalendarStateEntityToCache(courseCalendarStateEntity)
         }

diff --git a/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt b/profile/src/main/java/org/openedx/profile/presentation/calendar/CoursesToSyncFragment.kt
@@ -281,7 +281,7 @@ private fun CourseCheckboxList(
                 .filter { it.courseId in courseIds }
                 .let { enrollments ->
                     if (uiState.isHideInactiveCourses) {
-                        enrollments.filter { it.isActive }
+                        enrollments.filter { it.recentlyActive }
                     } else {
                         enrollments
                     }
@@ -299,7 +299,7 @@ private fun CourseCheckboxList(
                             ?: false
                     val annotatedString = buildAnnotatedString {
                         append(course.courseName)
-                        if (!course.isActive) {
+                        if (!course.recentlyActive) {
                             append(" ")
                             withStyle(
                                 style = SpanStyle(
@@ -327,7 +327,7 @@ private fun CourseCheckboxList(
                                 uncheckedColor = MaterialTheme.appColors.textFieldText
                             ),
                             checked = isCourseSyncEnabled,
-                            enabled = course.isActive,
+                            enabled = course.recentlyActive,
                             onCheckedChange = { isEnabled ->
                                 onCourseSyncCheckChange(isEnabled, course.courseId)
                             }