fix(PnX-SI/gn_mobile_occtax#269): keep only additional fields with va…

…lid datasets...
PnX-SI · Nov 14, 2024 · 0ffa6c6 · 0ffa6c6
1 parent 637f7ff
commit 0ffa6c6
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 10 deletions.
diff --git a/commons/build.gradle b/commons/build.gradle
@@ -6,7 +6,7 @@ plugins {
     alias(libs.plugins.kotlin.android)
 }
 
-version = "1.4.6"
+version = "1.4.7"
 
 android {
     namespace 'fr.geonature.commons'

diff --git a/...ns/src/main/java/fr/geonature/commons/features/dataset/data/DatasetLocalDataSourceImpl.kt b/...ns/src/main/java/fr/geonature/commons/features/dataset/data/DatasetLocalDataSourceImpl.kt
@@ -10,6 +10,11 @@ import fr.geonature.commons.features.dataset.error.DatasetException
  * @author S. Grimault
  */
 class DatasetLocalDataSourceImpl(private val datasetDao: DatasetDao) : IDatasetLocalDataSource {
+
+    override suspend fun getAllDatasets(): List<Dataset> {
+        return datasetDao.findAll()
+    }
+
     override suspend fun findDatasetById(datasetId: Long): Dataset {
         return datasetDao.findById(datasetId)
             ?: throw DatasetException.NoDatasetFoundException(datasetId)

diff --git a/commons/src/main/java/fr/geonature/commons/features/dataset/data/IDatasetLocalDataSource.kt b/commons/src/main/java/fr/geonature/commons/features/dataset/data/IDatasetLocalDataSource.kt
@@ -10,6 +10,13 @@ import fr.geonature.commons.features.dataset.error.DatasetException
  */
 interface IDatasetLocalDataSource {
 
+    /**
+     * Gets all [Dataset].
+     *
+     * @return a list of [Dataset]
+     */
+    suspend fun getAllDatasets(): List<Dataset>
+
     /**
      * Finds [Dataset] matching given taxon ID.
      *

diff --git a/...s/src/main/java/fr/geonature/commons/features/nomenclature/error/NomenclatureException.kt b/...s/src/main/java/fr/geonature/commons/features/nomenclature/error/NomenclatureException.kt
@@ -18,7 +18,7 @@ sealed class NomenclatureException(
     /**
      * Failure about no [NomenclatureType] found locally.
      */
-    object NoNomenclatureTypeFoundException : NomenclatureException()
+     object NoNomenclatureTypeFoundException : NomenclatureException()
 
     /**
      * Failure about no [Nomenclature] found from given mnemonic.

diff --git a/...ns/src/test/java/fr/geonature/commons/features/dataset/data/DatasetLocalDataSourceTest.kt b/...ns/src/test/java/fr/geonature/commons/features/dataset/data/DatasetLocalDataSourceTest.kt
@@ -63,6 +63,19 @@ class DatasetLocalDataSourceTest {
         db.close()
     }
 
+    @Test
+    fun `should find all dataset`() =
+        runTest {
+            val expectedDataset = initializeDataset()
+
+            val datasets = datasetLocalDataSource.getAllDatasets()
+
+            assertEquals(
+                expectedDataset,
+                datasets
+            )
+        }
+
     @Test
     fun `should find dataset matching given ID`() =
         runTest {

diff --git a/commons/version.properties b/commons/version.properties
@@ -1,2 +1,2 @@
-#Sat Sep 07 15:08:49 CEST 2024
-VERSION_CODE=5130
+#Thu Nov 14 21:36:07 CET 2024
+VERSION_CODE=5187
diff --git a/datasync/build.gradle b/datasync/build.gradle
@@ -5,7 +5,7 @@ plugins {
     alias(libs.plugins.kotlin.android)
 }
 
-version = "0.6.2"
+version = "0.6.3"
 
 android {
     namespace 'fr.geonature.datasync'

diff --git a/datasync/src/main/java/fr/geonature/datasync/sync/DataSyncModule.kt b/datasync/src/main/java/fr/geonature/datasync/sync/DataSyncModule.kt
@@ -9,6 +9,7 @@ import dagger.hilt.components.SingletonComponent
 import fr.geonature.commons.data.GeoNatureModuleName
 import fr.geonature.commons.data.LocalDatabase
 import fr.geonature.commons.data.dao.AppSyncDao
+import fr.geonature.commons.features.dataset.data.IDatasetLocalDataSource
 import fr.geonature.commons.features.nomenclature.data.IAdditionalFieldLocalDataSource
 import fr.geonature.datasync.api.IGeoNatureAPIClient
 import fr.geonature.datasync.sync.repository.ISynchronizeAdditionalFieldsRepository
@@ -45,12 +46,14 @@ object DataSyncModule {
     fun provideSynchronizeAdditionalFieldsRepository(
         @ApplicationContext appContext: Context,
         @GeoNatureModuleName moduleName: String,
+        datasetLocalDataSource: IDatasetLocalDataSource,
         additionalFieldLocalDataSource: IAdditionalFieldLocalDataSource,
         geoNatureAPIClient: IGeoNatureAPIClient,
     ): ISynchronizeAdditionalFieldsRepository {
         return SynchronizeAdditionalFieldsRepositoryImpl(
             appContext,
             moduleName,
+            datasetLocalDataSource,
             additionalFieldLocalDataSource,
             geoNatureAPIClient
         )

diff --git a/...n/java/fr/geonature/datasync/sync/repository/SynchronizeAdditionalFieldsRepositoryImpl.kt b/...n/java/fr/geonature/datasync/sync/repository/SynchronizeAdditionalFieldsRepositoryImpl.kt
@@ -2,6 +2,7 @@ package fr.geonature.datasync.sync.repository
 
 import android.content.Context
 import androidx.work.WorkInfo
+import fr.geonature.commons.features.dataset.data.IDatasetLocalDataSource
 import fr.geonature.commons.features.nomenclature.data.IAdditionalFieldLocalDataSource
 import fr.geonature.datasync.R
 import fr.geonature.datasync.api.IGeoNatureAPIClient
@@ -26,6 +27,7 @@ interface ISynchronizeAdditionalFieldsRepository : ISynchronizeLocalDataReposito
 class SynchronizeAdditionalFieldsRepositoryImpl(
     private val context: Context,
     private val moduleName: String,
+    private val datasetLocalDataSource: IDatasetLocalDataSource,
     private val additionalFieldLocalDataSource: IAdditionalFieldLocalDataSource,
     private val geoNatureAPIClient: IGeoNatureAPIClient
 ) : ISynchronizeAdditionalFieldsRepository {
@@ -58,10 +60,24 @@ class SynchronizeAdditionalFieldsRepositoryImpl(
                 return@flow
             }
 
-            Logger.info { "${additionalFields.size} additional field(s) found" }
+            Logger.info { "${additionalFields.size} additional field(s) found from API" }
+
+            // keep only additional fields with valid datasets
+            val datasetIds = datasetLocalDataSource
+                .getAllDatasets()
+                .map { it.id }
+            val validAdditionalFields = additionalFields.mapNotNull {
+                if (it.datasetIds.isEmpty() || datasetIds.isEmpty()) it
+                else it.datasetIds
+                    .filter { id -> datasetIds.contains(id) }
+                    .takeIf { ids -> ids.isNotEmpty() }
+                    ?.let { ids -> it.copy(datasetIds = ids) }
+            }
+
+            Logger.info { "updating ${validAdditionalFields.size} valid additional field(s)..." }
 
             runCatching {
-                additionalFieldLocalDataSource.updateAdditionalFields(*additionalFields.toTypedArray())
+                additionalFieldLocalDataSource.updateAdditionalFields(*validAdditionalFields.toTypedArray())
             }.onFailure {
                 emit(
                     DataSyncStatus(
@@ -76,7 +92,7 @@ class SynchronizeAdditionalFieldsRepositoryImpl(
                     state = WorkInfo.State.SUCCEEDED,
                     syncMessage = context.getString(
                         R.string.sync_data_additional_fields,
-                        additionalFields.size
+                        validAdditionalFields.size
                     )
                 )
             )

diff --git a/datasync/version.properties b/datasync/version.properties
@@ -1,2 +1,2 @@
-#Sun Sep 01 15:08:46 CEST 2024
-VERSION_CODE=1230
+#Thu Nov 14 21:36:07 CET 2024
+VERSION_CODE=1287