fix: changes according code review

Author: PavloNetrebchuk

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

@@ -6,7 +6,7 @@ import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import org.openedx.core.data.model.room.CourseCalendarEventEntity
 import org.openedx.core.data.model.room.CourseCalendarStateEntity
-import org.openedx.core.data.model.room.CourseDatesResponseEntity
+import org.openedx.core.data.model.room.CourseDateEntity
 import org.openedx.core.data.model.room.CourseEnrollmentDetailsEntity
 import org.openedx.core.data.model.room.CourseStructureEntity
 import org.openedx.core.data.model.room.DownloadCoursePreview
@@ -37,7 +37,7 @@ const val DATABASE_NAME = "OpenEdX_db"
         CourseCalendarStateEntity::class,
         DownloadCoursePreview::class,
         CourseEnrollmentDetailsEntity::class,
-        CourseDatesResponseEntity::class,
+        CourseDateEntity::class,
     ],
     autoMigrations = [
         AutoMigration(1, DATABASE_VERSION)

app/src/main/res/drawable/app_ic_dates_selector.xml

@@ -2,4 +2,4 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/app_ic_dates_cloud_fill" android:state_checked="true" />
     <item android:drawable="@drawable/app_ic_dates_cloud_outline" />
-</selector>
+</selector>

core/src/main/java/org/openedx/core/data/api/CourseApi.kt

@@ -64,7 +64,6 @@ interface CourseApi {
     @GET("/api/course_home/v1/dates/{course_id}")
     suspend fun getCourseDates(
         @Path("course_id") courseId: String,
-        @Query("mobile") mobile: Boolean = true,
     ): CourseDates
 
     @POST("/api/course_experience/v1/reset_course_deadlines")
@@ -118,5 +117,5 @@ interface CourseApi {
     ): CourseDatesResponse
 
     @POST("/api/course_experience/v1/reset_all_relative_course_deadlines/")
-    suspend fun shiftDueDate()
+    suspend fun shiftAllDueDates()
 }

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

@@ -50,9 +50,7 @@ data class CourseDatesResponse(
             count = count,
             next = next,
             previous = previous,
-            results = results
-                .mapNotNull { it.mapToDomain() }
-                .sortedBy { it.dueDate }
+            results = results.mapNotNull { it.mapToDomain() }
         )
     }
 }

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

@@ -0,0 +1,60 @@
+package org.openedx.core.data.model.room
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import org.openedx.core.data.model.CourseDate
+import org.openedx.core.utils.TimeUtils
+import org.openedx.core.domain.model.CourseDate as DomainCourseDate
+
+@Entity(tableName = "course_dates_table")
+data class CourseDateEntity(
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo("id")
+    val id: Int,
+    @ColumnInfo("first_component_block_id")
+    val firstComponentBlockId: String?,
+    @ColumnInfo("course_id")
+    val courseId: String,
+    @ColumnInfo("due_date")
+    val dueDate: String?,
+    @ColumnInfo("assignment_title")
+    val assignmentTitle: String?,
+    @ColumnInfo("learner_has_access")
+    val learnerHasAccess: Boolean?,
+    @ColumnInfo("relative")
+    val relative: Boolean?,
+    @ColumnInfo("course_name")
+    val courseName: String?,
+) {
+
+    fun mapToDomain(): DomainCourseDate? {
+        val dueDate = TimeUtils.iso8601ToDate(dueDate ?: "")
+        return DomainCourseDate(
+            courseId = courseId,
+            firstComponentBlockId = firstComponentBlockId ?: "",
+            dueDate = dueDate ?: return null,
+            assignmentTitle = assignmentTitle ?: "",
+            learnerHasAccess = learnerHasAccess ?: false,
+            relative = relative ?: false,
+            courseName = courseName ?: ""
+        )
+    }
+
+    companion object {
+        fun createFrom(courseDate: CourseDate): CourseDateEntity {
+            with(courseDate) {
+                return CourseDateEntity(
+                    id = 0,
+                    courseId = courseId,
+                    firstComponentBlockId = firstComponentBlockId,
+                    dueDate = dueDate,
+                    assignmentTitle = assignmentTitle,
+                    learnerHasAccess = learnerHasAccess,
+                    relative = relative,
+                    courseName = courseName
+                )
+            }
+        }
+    }
+}

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

@@ -35,6 +35,7 @@ import org.openedx.core.ui.theme.appColors
 import org.openedx.core.ui.theme.appTypography
 import org.openedx.core.utils.TimeUtils.formatToString
 import org.openedx.core.utils.clearTime
+import org.openedx.core.utils.isToday
 
 @Composable
 private fun CourseDateBlockSectionGeneric(
@@ -261,13 +262,15 @@ private fun CourseDateItem(
         if (isMiddleChild) {
             Spacer(modifier = Modifier.height(20.dp))
         }
-        val timeTitle = formatToString(context, dateBlock.dueDate, useRelativeDates)
-        Text(
-            text = timeTitle,
-            style = MaterialTheme.appTypography.labelMedium,
-            color = MaterialTheme.appColors.textDark,
-            maxLines = 1,
-        )
+        if (!dateBlock.dueDate.isToday()) {
+            val timeTitle = formatToString(context, dateBlock.dueDate, useRelativeDates)
+            Text(
+                text = timeTitle,
+                style = MaterialTheme.appTypography.labelMedium,
+                color = MaterialTheme.appColors.textDark,
+                maxLines = 1,
+            )
+        }
         Row(
             modifier = Modifier
                 .fillMaxWidth()

core/src/main/java/org/openedx/core/presentation/dates/DatesUI.kt

@@ -3,26 +3,11 @@ package org.openedx.course.data.storage
 import androidx.room.TypeConverter
 import com.google.gson.Gson
 import org.openedx.core.data.model.room.BlockDb
-import org.openedx.core.data.model.room.CourseDateDB
-import org.openedx.core.data.model.room.VideoInfoDb
 import org.openedx.core.data.model.room.discovery.CourseDateBlockDb
 import org.openedx.foundation.extension.genericType
 
 class CourseConverter {
 
-    @TypeConverter
-    fun fromVideoDb(value: VideoInfoDb?): String {
-        if (value == null) return ""
-        val json = Gson().toJson(value)
-        return json.toString()
-    }
-
-    @TypeConverter
-    fun toVideoDb(value: String): VideoInfoDb? {
-        if (value.isEmpty()) return null
-        return Gson().fromJson(value, VideoInfoDb::class.java)
-    }
-
     @TypeConverter
     fun fromListOfString(value: List<String>): String {
         val json = Gson().toJson(value)
@@ -47,18 +32,6 @@ class CourseConverter {
         return Gson().fromJson(value, type)
     }
 
-    @TypeConverter
-    fun fromStringToMap(value: String?): Map<String, String> {
-        val mapType = genericType<HashMap<String, String>>()
-        return Gson().fromJson(value, mapType)
-    }
-
-    @TypeConverter
-    fun fromMapToString(map: Map<String, String>): String {
-        val gson = Gson()
-        return gson.toJson(map)
-    }
-
     @TypeConverter
     fun fromListOfCourseDateBlockDb(value: List<CourseDateBlockDb>): String {
         val json = Gson().toJson(value)
@@ -70,16 +43,4 @@ class CourseConverter {
         val type = genericType<List<CourseDateBlockDb>>()
         return Gson().fromJson(value, type)
     }
-
-    @TypeConverter
-    fun fromListOfCourseDateDB(value: List<CourseDateDB>): String {
-        val json = Gson().toJson(value)
-        return json.toString()
-    }
-
-    @TypeConverter
-    fun toListOfCourseDateDB(value: String): List<CourseDateDB> {
-        val type = genericType<List<CourseDateDB>>()
-        return Gson().fromJson(value, type)
-    }
 }

course/src/main/java/org/openedx/course/data/storage/CourseConverter.kt

@@ -1,21 +1,7 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
+# Prevent shrinking, optimization, and obfuscation of the library when consumed by other modules.
+# This ensures that all classes and methods remain available for use by the consumer of the library.
+# Disabling these steps at the library level is important because the main app module will handle
+# shrinking, optimization, and obfuscation for the entire application, including this library.
+-dontshrink
+-dontoptimize
+-dontobfuscate

dates/proguard-rules.pro

@@ -1,7 +1,7 @@
 package org.openedx.dates.data.repository
 
 import org.openedx.core.data.api.CourseApi
-import org.openedx.core.data.model.room.CourseDatesResponseEntity
+import org.openedx.core.data.model.room.CourseDateEntity
 import org.openedx.core.data.storage.CorePreferences
 import org.openedx.core.domain.model.CourseDate
 import org.openedx.core.domain.model.CourseDatesResponse
@@ -18,23 +18,21 @@ class DatesRepository(
         if (page == 1) {
             dao.clearCachedData()
         }
-        dao.insertCourseDateResponses(CourseDatesResponseEntity.createFrom(response))
+        dao.insertCourseDates(response.results.map { CourseDateEntity.createFrom(it) })
         return response.mapToDomain()
     }
 
     suspend fun getUserDatesFromCache(): List<CourseDate> {
-        return dao.getCourseDateResponses()
-            .map { it.mapToDomain() }
-            .map { it.results }
-            .flatten()
-            .sortedBy { it.dueDate }
+        return dao.getCourseDates().mapNotNull { it.mapToDomain() }
     }
 
-    suspend fun preloadFirstPageCachedDates(): CourseDatesResponse? {
-        return dao.getCourseDateResponses()
-            .find { it.previous == null }
-            ?.mapToDomain()
+    suspend fun preloadFirstPageCachedDates(): List<CourseDate> {
+        return dao.getCourseDates(PAGE_SIZE).mapNotNull { it.mapToDomain() }
     }
 
-    suspend fun shiftDueDate() = api.shiftDueDate()
+    suspend fun shiftAllDueDates() = api.shiftAllDueDates()
+
+    companion object {
+        private const val PAGE_SIZE = 20
+    }
 }