Merge pull request 'Running migrations.' (#118) from fix-migration into master

Reviewed-on: https://gitea.amine-louveau.fr/Louvorg/ReaderForSelfoss-multiplatform/pulls/118

.drone.yml

@@ -35,7 +35,6 @@ steps:
 trigger:
   event:
     - push
-    - pull_request
 
 ---
 kind: pipeline
@@ -77,10 +76,7 @@ steps:
         from_secret: privateKey
       command_timeout: 2m
       script:
-        - cd /home/ubuntu
-        - sudo rm -rf /var/www/amine/version.txt
-        - sudo chown www-data:www-data ./version.txt
-        - sudo mv version.txt /var/www/amine/
+        - cd /home/ubuntu && sudo rm -rf /var/www/amine/version.txt && sudo chown www-data:www-data ./version.txt && sudo mv version.txt /var/www/amine/
 
 trigger:
   event:

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/MyApp.kt

@@ -3,10 +3,7 @@ package bou.amine.apps.readerforselfossv2.android
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.content.Context
-import android.graphics.drawable.Drawable
-import android.net.Uri
 import android.os.Build
-import android.widget.ImageView
 import android.widget.Toast
 import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.LifecycleOwner
@@ -18,8 +15,6 @@ import bou.amine.apps.readerforselfossv2.dao.DriverFactory
 import bou.amine.apps.readerforselfossv2.dao.ReaderForSelfossDB
 import bou.amine.apps.readerforselfossv2.repository.Repository
 import bou.amine.apps.readerforselfossv2.service.AppSettingsService
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestOptions
 import com.github.ln_12.library.ConnectivityStatus
 import io.github.aakira.napier.DebugAntilog
 import io.github.aakira.napier.Napier
@@ -83,6 +78,8 @@ class MyApp : MultiDexApplication(), DIAware {
                 }
             }
         }
+
+        repository.migrate(driverFactory)
     }
 
     override fun attachBaseContext(base: Context?) {

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/adapters/SourcesListAdapter.kt

@@ -78,9 +78,9 @@ class SourcesListAdapter(
             val deleteBtn: Button = mView.findViewById(R.id.deleteBtn)
 
             deleteBtn.setOnClickListener {
-                val (id) = items[bindingAdapterPosition]
+                val (id, title) = items[bindingAdapterPosition]
                 CoroutineScope(Dispatchers.IO).launch {
-                    val successfullyDeletedSource = repository.deleteSource(id)
+                    val successfullyDeletedSource = repository.deleteSource(id, title)
                     if (successfullyDeletedSource) {
                         items.removeAt(bindingAdapterPosition)
                         notifyItemRemoved(bindingAdapterPosition)

androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/model/ParecelableItem.kt

@@ -46,7 +46,7 @@ data class ParecelableItem(
     val link: String,
     val sourcetitle: String,
     val tags: String,
-    val author: String
+    val author: String?
 ) : Parcelable {
 
     companion object {

androidApp/src/test/kotlin/RepositoryTest.kt

@@ -58,6 +58,7 @@ class RepositoryTest {
             data = SelfossModel.Stats(NUMBER_ARTICLES, NUMBER_UNREAD, NUMBER_STARRED)
         )
 
+        every { db.itemsQueries.deleteItemsWhereSource(any()) } returns Unit
         every { db.itemsQueries.items().executeAsList() } returns generateTestDBItems()
         every { db.tagsQueries.deleteAllTags() } returns Unit
         every { db.tagsQueries.transaction(any(), any()) } returns Unit
@@ -798,10 +799,11 @@ class RepositoryTest {
         initializeRepository()
         var response: Boolean
         runBlocking {
-            response = repository.deleteSource(5)
+            response = repository.deleteSource(5, "src")
         }
 
         coVerify(exactly = 1) { api.deleteSource(5) }
+        coVerify(exactly = 1) { db.itemsQueries.deleteItemsWhereSource("src") }
         assertSame(true, response)
     }
 
@@ -812,10 +814,11 @@ class RepositoryTest {
         initializeRepository()
         var response: Boolean
         runBlocking {
-            response = repository.deleteSource(5)
+            response = repository.deleteSource(5, "src")
         }
 
         coVerify(exactly = 1) { api.deleteSource(5) }
+        coVerify(exactly = 0) { db.itemsQueries.deleteItemsWhereSource("src") }
         assertSame(false, response)
     }
 
@@ -826,10 +829,11 @@ class RepositoryTest {
         initializeRepository(MutableStateFlow(false))
         var response: Boolean
         runBlocking {
-            response = repository.deleteSource(5)
+            response = repository.deleteSource(5, "src")
         }
 
         coVerify(exactly = 0) { api.deleteSource(5) }
+        coVerify(exactly = 1) { db.itemsQueries.deleteItemsWhereSource("src") }
         assertSame(false, response)
     }
 

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/model/SelfossModel.kt

@@ -73,7 +73,7 @@ class SelfossModel {
         val sourcetitle: String,
         @Serializable(with = TagsListSerializer::class)
         val tags: List<String>,
-        val author: String
+        val author: String?
     ) {
         // TODO: maybe find a better way to handle these kind of urls
         fun getLinkDecoded(): String {
@@ -104,7 +104,7 @@ class SelfossModel {
 
         fun sourceAuthorAndDate(): String {
             var txt = this.sourcetitle.getHtmlDecoded()
-            if (this.author.isNotEmpty()) {
+            if (!this.author.isNullOrBlank()) {
                 txt += " (by ${this.author}) "
             }
             txt += DateUtils.parseRelativeDate(this.datetime)

shared/src/commonMain/kotlin/bou/amine/apps/readerforselfossv2/repository/RepositoryImpl.kt

@@ -359,13 +359,20 @@ class Repository(
         return response
     }
 
-    suspend fun deleteSource(id: Int): Boolean {
+    suspend fun deleteSource(id: Int, title: String): Boolean {
         var success = false
         if (isNetworkAvailable()) {
             val response = api.deleteSource(id)
             success = response.isSuccess
         }
 
+        // We filter on success or if the network isn't available
+        if (success || !isNetworkAvailable()) {
+            items = ArrayList(items.filter { it.sourcetitle != title })
+            setReaderItems(items)
+            db.itemsQueries.deleteItemsWhereSource(title)
+        }
+
         return success
     }
 
@@ -504,6 +511,7 @@ class Repository(
             item.link,
             item.sourcetitle,
             item.tags.joinToString(","),
+            item.author,
             item.id.toString()
         )
 
@@ -568,4 +576,8 @@ class Repository(
     fun getReaderItems(): ArrayList<SelfossModel.Item> {
         return _readerItems
     }
+
+    fun migrate(driverFactory: DriverFactory) {
+        ReaderForSelfossDB.Schema.migrate(driverFactory.createDriver(), 0, 1)
+    }
 }

shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/1.sqm

@@ -1 +1,6 @@
-ALTER TABLE ITEM ADD COLUMN `author` TEXT NOT NULL;
+CREATE TABLE ITEM_BACKUP AS SELECT `id`, `datetime`, `title`, `content`,
+ `unread`, `starred`, `thumbnail`, `icon`, `link`, `sourcetitle`,
+ `tags` FROM ITEM;
+ALTER TABLE ITEM_BACKUP ADD COLUMN `author` TEXT;
+DROP TABLE ITEM;
+ALTER TABLE ITEM_BACKUP RENAME TO ITEM;

shared/src/commonMain/sqldelight/bou/amine/apps/readerforselfossv2/dao/Items.sq

@@ -10,7 +10,7 @@ CREATE TABLE ITEM (
     `link` TEXT NOT NULL,
     `sourcetitle` TEXT NOT NULL,
     `tags` TEXT NOT NULL,
-    `author` TEXT NOT NULL,
+    `author` TEXT,
     PRIMARY KEY(`id`)
 );
 
@@ -27,5 +27,8 @@ INSERT OR REPLACE INTO ITEM VALUES ?;
 deleteItem:
 DELETE FROM ITEM WHERE `id` = ?;
 
+deleteItemsWhereSource:
+DELETE FROM ITEM WHERE `sourcetitle` = ?;
+
 updateItem:
-UPDATE ITEM SET `datetime` = ?, `title` = ?, `content` = ?, `unread` = ?, `starred` = ?, `thumbnail` = ?, `icon` = ?, `link` = ?, `sourcetitle` = ?, `tags` = ? WHERE `id` = ?;
+UPDATE ITEM SET `datetime` = ?, `title` = ?, `content` = ?, `unread` = ?, `starred` = ?, `thumbnail` = ?, `icon` = ?, `link` = ?, `sourcetitle` = ?, `tags` = ?, `author` = ? WHERE `id` = ?;