Fix doubled announcements (#1897)

app/src/main/java/io/github/wulkanowy/data/db/AppDatabase.kt

@@ -55,7 +55,7 @@ import javax.inject.Singleton
 abstract class AppDatabase : RoomDatabase() {
 
     companion object {
-        const val VERSION_SCHEMA = 48
+        const val VERSION_SCHEMA = 49
 
         fun getMigrations(sharedPrefProvider: SharedPrefProvider, appInfo: AppInfo) = arrayOf(
             Migration2(),
@@ -102,6 +102,7 @@ abstract class AppDatabase : RoomDatabase() {
             Migration43(),
             Migration44(),
             Migration46(),
+            Migration49()
         )
 
         fun newInstance(

app/src/main/java/io/github/wulkanowy/data/db/dao/SchoolAnnouncementDao.kt

@@ -10,6 +10,6 @@ import javax.inject.Singleton
 @Singleton
 interface SchoolAnnouncementDao : BaseDao<SchoolAnnouncement> {
 
-    @Query("SELECT * FROM SchoolAnnouncements WHERE student_id = :studentId ORDER BY date DESC")
+    @Query("SELECT * FROM SchoolAnnouncements WHERE user_login_id = :userLoginId ORDER BY date DESC")
-    fun loadAll(studentId: Int): Flow<List<SchoolAnnouncement>>
+    fun loadAll(userLoginId: Int): Flow<List<SchoolAnnouncement>>
 }

app/src/main/java/io/github/wulkanowy/data/db/entities/SchoolAnnouncement.kt

@@ -9,8 +9,8 @@ import java.time.LocalDate
 @Entity(tableName = "SchoolAnnouncements")
 data class SchoolAnnouncement(
 
-    @ColumnInfo(name = "student_id")
+    @ColumnInfo(name = "user_login_id")
-    val studentId: Int,
+    val userLoginId: Int,
 
     val date: LocalDate,
 

app/src/main/java/io/github/wulkanowy/data/db/migrations/Migration49.kt

@@ -0,0 +1,23 @@
+package io.github.wulkanowy.data.db.migrations
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+class Migration49 : Migration(48, 49) {
+
+    override fun migrate(database: SupportSQLiteDatabase) {
+        database.execSQL("DROP TABLE IF EXISTS SchoolAnnouncements")
+
+        database.execSQL(
+            """
+            CREATE TABLE IF NOT EXISTS `SchoolAnnouncements` (
+            `user_login_id` INTEGER NOT NULL, 
+            `date` INTEGER NOT NULL, 
+            `subject` TEXT NOT NULL, 
+            `content` TEXT NOT NULL, 
+            `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, 
+            `is_notified` INTEGER NOT NULL)
+        """.trimIndent()
+        )
+    }
+}

app/src/main/java/io/github/wulkanowy/data/mappers/DirectorInformationMapper.kt

@@ -6,7 +6,7 @@ import io.github.wulkanowy.sdk.pojo.DirectorInformation as SdkDirectorInformatio
 
 fun List<SdkDirectorInformation>.mapToEntities(student: Student) = map {
     SchoolAnnouncement(
-        studentId = student.userLoginId,
+        userLoginId = student.userLoginId,
         date = it.date,
         subject = it.subject,
         content = it.content,

app/src/main/java/io/github/wulkanowy/data/repositories/SchoolAnnouncementRepository.kt

@@ -28,7 +28,8 @@ class SchoolAnnouncementRepository @Inject constructor(
 
     fun getSchoolAnnouncements(
         student: Student,
-        forceRefresh: Boolean, notify: Boolean = false
+        forceRefresh: Boolean,
+        notify: Boolean = false
     ) = networkBoundResource(
         mutex = saveFetchResultMutex,
         isResultEmpty = { it.isEmpty() },
@@ -37,7 +38,7 @@ class SchoolAnnouncementRepository @Inject constructor(
             it.isEmpty() || forceRefresh || isExpired
         },
         query = {
-            schoolAnnouncementDb.loadAll(student.studentId)
+            schoolAnnouncementDb.loadAll(student.userLoginId)
         },
         fetch = {
             sdk.init(student)
@@ -56,7 +57,7 @@ class SchoolAnnouncementRepository @Inject constructor(
     )
 
     fun getSchoolAnnouncementFromDatabase(student: Student): Flow<List<SchoolAnnouncement>> {
-        return schoolAnnouncementDb.loadAll(student.studentId)
+        return schoolAnnouncementDb.loadAll(student.userLoginId)
     }
 
     suspend fun updateSchoolAnnouncement(schoolAnnouncement: List<SchoolAnnouncement>) =

app/src/main/java/io/github/wulkanowy/services/sync/works/SchoolAnnouncementWork.kt

@@ -6,6 +6,7 @@ import io.github.wulkanowy.data.repositories.SchoolAnnouncementRepository
 import io.github.wulkanowy.data.waitForResult
 import io.github.wulkanowy.services.sync.notifications.NewSchoolAnnouncementNotification
 import kotlinx.coroutines.flow.first
+import java.time.LocalDate
 import javax.inject.Inject
 
 class SchoolAnnouncementWork @Inject constructor(
@@ -20,10 +21,13 @@ class SchoolAnnouncementWork @Inject constructor(
             notify = notify,
         ).waitForResult()
 
-
+        schoolAnnouncementRepository.getSchoolAnnouncementFromDatabase(student)
-        schoolAnnouncementRepository.getSchoolAnnouncementFromDatabase(student).first()
+            .first()
-            .filter { !it.isNotified }.let {
+            .filter { !it.isNotified && it.date >= LocalDate.now() }
-                if (it.isNotEmpty()) newSchoolAnnouncementNotification.notify(it, student)
+            .let {
+                if (it.isNotEmpty()) {
+                    newSchoolAnnouncementNotification.notify(it, student)
+                }
 
                 schoolAnnouncementRepository.updateSchoolAnnouncement(it.onEach { schoolAnnouncement ->
                     schoolAnnouncement.isNotified = true

app/src/main/java/io/github/wulkanowy/ui/modules/debug/notification/mock/schoolAnnouncement.kt

@@ -19,6 +19,6 @@ val debugSchoolAnnouncementItems = listOf(
 private fun generateAnnouncement(subject: String, content: String) = SchoolAnnouncement(
     subject = subject,
     content = content,
-    studentId = 0,
+    userLoginId = 0,
     date = LocalDate.now()
 )