fix: Changes according QA review

Author: PavloNetrebchuk

app/src/main/java/org/openedx/app/di/ScreenModule.kt

@@ -25,7 +25,6 @@ import org.openedx.course.presentation.dates.CourseDatesViewModel
 import org.openedx.course.presentation.handouts.HandoutsViewModel
 import org.openedx.course.presentation.offline.CourseOfflineViewModel
 import org.openedx.course.presentation.outline.CourseContentAllViewModel
-import org.openedx.course.presentation.outline.CourseOutlineViewModel
 import org.openedx.course.presentation.progress.CourseProgressViewModel
 import org.openedx.course.presentation.section.CourseSectionViewModel
 import org.openedx.course.presentation.unit.container.CourseUnitContainerViewModel

app/src/main/java/org/openedx/app/room/AppDatabase.kt

@@ -26,6 +26,7 @@ import org.openedx.discovery.data.storage.DiscoveryDao
 const val DATABASE_VERSION = 4
 const val DATABASE_NAME = "OpenEdX_db"
 
+@Suppress("MagicNumber")
 @Database(
     entities = [
         CourseEntity::class,

app/src/main/java/org/openedx/app/room/DatabaseManager.kt

@@ -17,7 +17,7 @@ class DatabaseManager(
 ) : DatabaseManager {
     override fun clearTables() {
         CoroutineScope(Dispatchers.IO).launch {
-            courseDao.clearCourseData()
+            courseDao.clearCachedData()
             dashboardDao.clearCachedData()
             downloadDao.clearOfflineProgress()
             discoveryDao.clearCachedData()

core/src/main/java/org/openedx/core/data/model/AssignmentProgress.kt

@@ -17,7 +17,7 @@ data class AssignmentProgress(
     val shortLabel: String?
 ) {
     fun mapToDomain(displayName: String) = AssignmentProgress(
-        assignmentType = assignmentType ?: "",
+        assignmentType = assignmentType,
         numPointsEarned = numPointsEarned ?: 0f,
         numPointsPossible = numPointsPossible ?: 0f,
         shortLabel = shortLabel ?: displayName.take(DEFAULT_LABEL_LENGTH)

core/src/main/java/org/openedx/core/data/model/Block.kt

@@ -136,7 +136,9 @@ data class VideoInfo(
     var fileSize: Long?
 ) {
     fun mapToDomain() = DomainVideoInfo(
-        url = url.orEmpty(),
+        url = url
+            .orEmpty()
+            .trim(),
         fileSize = fileSize ?: 0
     )
 }

core/src/main/java/org/openedx/core/data/model/room/BlockDb.kt

@@ -203,7 +203,9 @@ data class VideoInfoDb(
         fun createFrom(videoInfo: VideoInfo?): VideoInfoDb? {
             if (videoInfo == null) return null
             return VideoInfoDb(
-                videoInfo.url ?: "",
+                videoInfo.url
+                    .orEmpty()
+                    .trim(),
                 videoInfo.fileSize ?: 0,
             )
         }
@@ -233,7 +235,7 @@ data class AssignmentProgressDb(
     val shortLabel: String?
 ) {
     fun mapToDomain() = DomainAssignmentProgress(
-        assignmentType = assignmentType ?: "",
+        assignmentType = assignmentType,
         numPointsEarned = numPointsEarned ?: 0f,
         numPointsPossible = numPointsPossible ?: 0f,
         shortLabel = shortLabel ?: ""

core/src/main/java/org/openedx/core/data/storage/CourseDao.kt

@@ -20,31 +20,31 @@ interface CourseDao {
     suspend fun insertCourseStructureEntity(vararg courseStructureEntity: CourseStructureEntity)
 
     @Transaction
-    suspend fun clearCourseData() {
-        clearCourseStructureData()
-        clearCourseProgressData()
+    suspend fun clearCachedData() {
+        clearCourseStructure()
+        clearVideoProgress()
         clearEnrollmentCachedData()
+        clearCourseProgressData()
     }
 
     @Query("DELETE FROM course_structure_table")
-    suspend fun clearCourseStructureData()
+    suspend fun clearCourseStructure()
 
-    @Query("DELETE FROM course_progress_table")
-    suspend fun clearCourseProgressData()
+    @Query("DELETE FROM video_progress_table")
+    suspend fun clearVideoProgress()
 
     @Query("DELETE FROM course_enrollment_details_table")
     suspend fun clearEnrollmentCachedData()
 
+    @Query("DELETE FROM course_progress_table")
+    suspend fun clearCourseProgressData()
+
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertCourseEnrollmentDetailsEntity(vararg courseEnrollmentDetailsEntity: CourseEnrollmentDetailsEntity)
 
     @Query("SELECT * FROM course_enrollment_details_table WHERE id=:id")
     suspend fun getCourseEnrollmentDetailsById(id: String): CourseEnrollmentDetailsEntity?
 
-
-    @Query("DELETE FROM course_progress_table")
-    suspend fun clearCourseProgressData()
-
     @Insert(onConflict = OnConflictStrategy.REPLACE)
     suspend fun insertVideoProgressEntity(vararg videoProgressEntity: VideoProgressEntity)
 

core/src/main/java/org/openedx/core/domain/model/AssignmentProgress.kt

@@ -7,7 +7,7 @@ import org.openedx.core.extension.safeDivBy
 
 @Parcelize
 data class AssignmentProgress(
-    val assignmentType: String,
+    val assignmentType: String?,
     val numPointsEarned: Float,
     val numPointsPossible: Float,
     val shortLabel: String
@@ -16,8 +16,8 @@ data class AssignmentProgress(
     @IgnoredOnParcel
     val value: Float = numPointsEarned.safeDivBy(numPointsPossible)
 
-    override fun toString(): String {
-        return "${numPointsEarned.toInt()}/${numPointsPossible.toInt()}"
+    fun toPointString(separator: String = ""): String {
+        return "${numPointsEarned.toInt()}$separator/$separator${numPointsPossible.toInt()}"
     }
 
     @IgnoredOnParcel

core/src/main/res/values/strings.xml

@@ -160,7 +160,6 @@
     <string name="core_no_videos">No videos available for this course.</string>
     <string name="core_no_dates">Course dates are currently not available.</string>
     <string name="core_no_progress">This course does not contain exams or graded assignments.</string>
-    <string name="core_no_assignments">Course assignment are currently not available.</string>
     <string name="core_no_assignments">No assignments available for this course.</string>
     <string name="core_no_discussion">Unable to load discussions.\n Please try again later.</string>
     <string name="core_no_handouts">There are currently no handouts for this course.</string>
@@ -185,7 +184,6 @@
     <string name="core_delete_in_process_confirmation" formatted="false">Turning off the switch will stop downloading and delete all downloaded videos for \"%s\"?</string>
     <string name="core_delete_confirmation" formatted="false">Are you sure you want to delete all video(s) for \"%s\"?</string>
     <string name="core_delete_download_confirmation_text" formatted="false">Are you sure you want to delete video(s) for \"%s\"?</string>
-    <string name="core_subsection_assignment_info" translatable="false">%1$s - %2$s - %3$d / %4$d</string>
     <string name="core_download_no_internet_dialog_description">Downloading this content requires an active internet connection. Please connect to the internet and try again.</string>
     <string name="core_wifi_required">Wi-Fi Required</string>
     <string name="core_download_wifi_required_dialog_description">Downloading this content requires an active WiFi connection. Please connect to a WiFi network and try again.</string>

course/src/main/java/org/openedx/course/data/repository/CourseRepository.kt

@@ -241,19 +241,6 @@ class CourseRepository(
         }
     }
 
-    fun getCourseProgress(courseId: String, isRefresh: Boolean): Flow<CourseProgress> =
-        channelFlowWithAwait {
-            if (!isRefresh) {
-                val cached = courseDao.getCourseProgressById(courseId)
-                if (cached != null) {
-                    trySend(cached.mapToDomain())
-                }
-            }
-            val response = api.getCourseProgress(courseId)
-            courseDao.insertCourseProgressEntity(response.mapToRoomEntity(courseId))
-            trySend(response.mapToDomain())
-        }
-
     suspend fun saveVideoProgress(
         blockId: String,
         videoUrl: String,