Feat staging: Adjust unit test & gradle to prevent read google-service.json when not exist

Author: HellBus1

app/build.gradle

@@ -8,10 +8,15 @@ plugins {
     id 'kotlin-parcelize'
     id 'org.jetbrains.kotlin.plugin.serialization' version '2.2.10'
     id 'org.jetbrains.kotlin.plugin.compose' version '2.2.10'
+}
 
-    // Google Services & Firebase
-    id 'com.google.gms.google-services'
-    id 'com.google.firebase.crashlytics'
+// Apply Google Services and Crashlytics only if google-services.json exists
+if (file('google-services.json').exists()) {
+    apply plugin: 'com.google.gms.google-services'
+    apply plugin: 'com.google.firebase.crashlytics'
+    println 'Google Services and Crashlytics plugins applied'
+} else {
+    println 'google-services.json not found. Skipping Google Services and Crashlytics plugins'
 }
 
 android {

app/src/main/java/com/digiventure/ventnote/data/google_drive/GoogleDriveService.kt

@@ -2,7 +2,7 @@ package com.digiventure.ventnote.data.google_drive
 
 import android.app.Application
 import com.digiventure.ventnote.data.persistence.NoteModel
-import com.digiventure.ventnote.feature.widget.NoteWidgetProvider
+import com.digiventure.ventnote.feature.widget.WidgetRefresher
 import com.digiventure.ventnote.module.proxy.DatabaseProxy
 import com.google.api.client.http.ByteArrayContent
 import com.google.api.services.drive.Drive
@@ -16,6 +16,7 @@ import javax.inject.Inject
 class GoogleDriveService @Inject constructor(
     private val app: Application,
     private val proxy: DatabaseProxy,
+    private val refresher: WidgetRefresher
 ) {
     companion object {
         private const val FILE_MIME_TYPE = "application/json"
@@ -70,7 +71,7 @@ class GoogleDriveService @Inject constructor(
             proxy.dao().upsertNotes(notes)
 
             // Refresh widget after restore
-            NoteWidgetProvider.refreshWidgets(app)
+            refresher.refresh(app)
 
             Result.success(Unit)
         } catch (e: Exception) {

app/src/main/java/com/digiventure/ventnote/data/persistence/NoteLocalService.kt

@@ -2,7 +2,7 @@ package com.digiventure.ventnote.data.persistence
 
 import android.app.Application
 import com.digiventure.ventnote.commons.ErrorMessage
-import com.digiventure.ventnote.feature.widget.NoteWidgetProvider
+import com.digiventure.ventnote.feature.widget.WidgetRefresher
 import com.digiventure.ventnote.module.proxy.DatabaseProxy
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.catch
@@ -13,7 +13,8 @@ import javax.inject.Inject
 
 class NoteLocalService @Inject constructor(
     private val app: Application,
-    private val proxy: DatabaseProxy
+    private val proxy: DatabaseProxy,
+    private val refresher: WidgetRefresher
 ) {
     fun getNoteList(sortBy: String, order: String): Flow<Result<List<NoteModel>>> {
         return proxy.dao().getNotes(sortBy, order).map {
@@ -28,7 +29,7 @@ class NoteLocalService @Inject constructor(
             val result = (proxy.dao().deleteNotes(*notes) == notes.size)
             emit(Result.success(result))
         }.onEach {
-            if (it.isSuccess) NoteWidgetProvider.refreshWidgets(app)
+            if (it.isSuccess) refresher.refresh(app)
         }.catch {
             emit(Result.failure(RuntimeException(ErrorMessage.FAILED_DELETE_ROOM)))
         }
@@ -46,7 +47,7 @@ class NoteLocalService @Inject constructor(
             val result = proxy.dao().updateWithTimestamp(note) >= 1
             emit(Result.success(result))
         }.onEach {
-            if (it.isSuccess) NoteWidgetProvider.refreshWidgets(app)
+            if (it.isSuccess) refresher.refresh(app)
         }.catch {
             emit(Result.failure(RuntimeException(ErrorMessage.FAILED_UPDATE_NOTE_ROOM)))
         }
@@ -56,7 +57,7 @@ class NoteLocalService @Inject constructor(
             val result = proxy.dao().insertWithTimestamp(note) != -1L
             emit(Result.success(result))
         }.onEach {
-            if (it.isSuccess) NoteWidgetProvider.refreshWidgets(app)
+            if (it.isSuccess) refresher.refresh(app)
         }.catch {
             emit(Result.failure(RuntimeException(ErrorMessage.FAILED_INSERT_NOTE_ROOM)))
         }

app/src/main/java/com/digiventure/ventnote/feature/widget/NoteWidgetFactory.kt

@@ -5,17 +5,20 @@ import android.content.Intent
 import android.widget.RemoteViews
 import android.widget.RemoteViewsService
 import com.digiventure.ventnote.R
-import com.digiventure.ventnote.config.NoteDatabase
+import com.digiventure.ventnote.module.proxy.DatabaseProxy
 import com.digiventure.ventnote.data.persistence.NoteModel
 
-class NoteWidgetFactory(private val context: Context) : RemoteViewsService.RemoteViewsFactory {
+class NoteWidgetFactory(
+    private val context: Context,
+    private val proxy: DatabaseProxy
+) : RemoteViewsService.RemoteViewsFactory {
     private var notes: List<NoteModel> = emptyList()
 
     override fun onCreate() {}
 
     override fun onDataSetChanged() {
         // Fetch notes from database
-        notes = NoteDatabase.getInstance(context).dao().getSyncNotes()
+        notes = proxy.dao().getSyncNotes()
     }
 
     override fun onDestroy() {

app/src/main/java/com/digiventure/ventnote/feature/widget/NoteWidgetService.kt

@@ -2,9 +2,16 @@ package com.digiventure.ventnote.feature.widget
 
 import android.content.Intent
 import android.widget.RemoteViewsService
+import com.digiventure.ventnote.module.proxy.DatabaseProxy
+import dagger.hilt.android.AndroidEntryPoint
+import javax.inject.Inject
 
+@AndroidEntryPoint
 class NoteWidgetService : RemoteViewsService() {
+    @Inject
+    lateinit var proxy: DatabaseProxy
+
     override fun onGetViewFactory(intent: Intent): RemoteViewsFactory {
-        return NoteWidgetFactory(this.applicationContext)
+        return NoteWidgetFactory(this.applicationContext, proxy)
     }
 }

app/src/main/java/com/digiventure/ventnote/feature/widget/WidgetRefresher.kt

@@ -0,0 +1,14 @@
+package com.digiventure.ventnote.feature.widget
+
+import android.content.Context
+import javax.inject.Inject
+
+interface WidgetRefresher {
+    fun refresh(context: Context)
+}
+
+class NoteWidgetRefresher @Inject constructor() : WidgetRefresher {
+    override fun refresh(context: Context) {
+        NoteWidgetProvider.refreshWidgets(context)
+    }
+}

app/src/main/java/com/digiventure/ventnote/module/ApplicationModule.kt

@@ -2,6 +2,9 @@ package com.digiventure.ventnote.module
 
 import android.content.Context
 import com.digiventure.ventnote.data.local.NoteDataStore
+import com.digiventure.ventnote.feature.widget.NoteWidgetRefresher
+import com.digiventure.ventnote.feature.widget.WidgetRefresher
+import dagger.Binds
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -16,18 +19,24 @@ import javax.inject.Singleton
 
 @Module
 @InstallIn(SingletonComponent::class)
-class ApplicationModule {
-    @Provides
+abstract class ApplicationModule {
+    @Binds
     @Singleton
-    fun provideCoroutineScope(): CoroutineScope = CoroutineScope(SupervisorJob())
+    abstract fun bindWidgetRefresher(refresher: NoteWidgetRefresher): WidgetRefresher
 
-    @Provides
-    @Singleton
-    fun provideExecutorCoroutineDispatcher(): ExecutorCoroutineDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
+    companion object {
+        @Provides
+        @Singleton
+        fun provideCoroutineScope(): CoroutineScope = CoroutineScope(SupervisorJob())
 
-    @Provides
-    @Singleton
-    fun provideNoteDataStore(@ApplicationContext context: Context): NoteDataStore {
-        return NoteDataStore(context)
+        @Provides
+        @Singleton
+        fun provideExecutorCoroutineDispatcher(): ExecutorCoroutineDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher()
+
+        @Provides
+        @Singleton
+        fun provideNoteDataStore(@ApplicationContext context: Context): NoteDataStore {
+            return NoteDataStore(context)
+        }
     }
 }

app/src/test/java/com/digiventure/utils/BaseUnitTest.kt

@@ -8,7 +8,7 @@ import org.mockito.junit.MockitoJUnitRunner
 @RunWith(MockitoJUnitRunner::class)
 abstract class BaseUnitTest {
     @get:Rule
-    var coroutinesTestRule = MainDispatcherRule()
+    val mainDispatcherRule = MainDispatcherRule()
 
     @get:Rule
     var instantTaskExecutor = InstantTaskExecutorRule()

app/src/test/java/com/digiventure/ventnote/commons/DateUtilsTest.kt

@@ -2,26 +2,43 @@ package com.digiventure.ventnote.commons
 
 import com.digiventure.utils.BaseUnitTest
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
 import org.junit.Test
+import java.util.Calendar
+import java.util.Date
+import java.util.TimeZone
 
 class DateUtilsTest: BaseUnitTest() {
+    @Test
+    fun formatNoteDateShouldReturnFormattedString() {
+        // Set a fixed date: 2023-10-27 10:30 AM
+        val calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"))
+        calendar.set(2023, Calendar.OCTOBER, 27, 10, 30, 0)
+        val date = calendar.time
+
+        // The default formatter uses EEEE, MMMM d h:mm a
+        val result = DateUtil.formatNoteDate(date)
+        
+        // Assert that it contains basic info
+        assertTrue(result.contains("October"))
+        assertTrue(result.contains("27"))
+    }
+
     @Test
     fun convertDateStringShouldReturnValidFormattedString() {
         val expectedDateString = "Thu, Jan 1"
 
         assertEquals(expectedDateString, DateUtil.convertDateString(
             "EEE, MMM d",
-            "Thu Jan 01 07:00:00 GMT+07:00 1970"
+            "Thu Jan 01 00:00:00 UTC 1970"
         ))
     }
 
     @Test
     fun convertDateStringShouldReturnEmptyStringWhenError() {
-        val expectedDateString = ""
-
-        assertEquals(expectedDateString, DateUtil.convertDateString(
+        assertEquals("", DateUtil.convertDateString(
             "EEE, MMM d",
-            "Thu Jn 01 07:00:00 GMT+07:00 1970"
+            "Invalid Date String"
         ))
     }
 }

app/src/test/java/com/digiventure/ventnote/data/google_drive/GoogleDriveServiceShould.kt

@@ -1,8 +1,10 @@
 package com.digiventure.ventnote.data.google_drive
 
+import android.app.Application
 import com.digiventure.utils.BaseUnitTest
 import com.digiventure.ventnote.data.persistence.NoteDAO
 import com.digiventure.ventnote.data.persistence.NoteModel
+import com.digiventure.ventnote.feature.widget.WidgetRefresher
 import com.digiventure.ventnote.module.proxy.DatabaseProxy
 import com.google.api.services.drive.Drive
 import com.google.api.services.drive.model.File
@@ -20,8 +22,10 @@ import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 
 class GoogleDriveServiceShould: BaseUnitTest() {
+    private val app: Application = mock()
     private val proxy: DatabaseProxy = mock()
     private val dao: NoteDAO = mock()
+    private val refresher: WidgetRefresher = mock()
     private val noteList: List<NoteModel> = listOf()
     private val fileName: String = "backup.json"
     private val fileId: String = "1"
@@ -31,7 +35,7 @@ class GoogleDriveServiceShould: BaseUnitTest() {
 
     @Before
     fun setup() {
-        service = GoogleDriveService(proxy)
+        service = GoogleDriveService(app, proxy, refresher)
     }
 
     @Test
@@ -72,13 +76,14 @@ class GoogleDriveServiceShould: BaseUnitTest() {
         whenever(drive.files()).thenReturn(filesMock)
         whenever(filesMock.get(fileId)).thenReturn(getMock)
         whenever(getMock.executeMediaAsInputStream()).thenReturn(inputStream)
-        whenever(dao.upsertNotesWithTimestamp(any())).thenAnswer { }
+        whenever(dao.upsertNotes(any())).thenAnswer { }
         whenever(proxy.dao()).thenReturn(dao)
 
         val result = service.readFile(fileId, drive)
 
         assertTrue(result.isSuccess)
-        verify(proxy.dao(), times(1)).upsertNotesWithTimestamp(any())
+        verify(proxy.dao(), times(1)).upsertNotes(any())
+        verify(refresher, times(1)).refresh(app)
     }
 
     @Test
@@ -103,7 +108,7 @@ class GoogleDriveServiceShould: BaseUnitTest() {
         whenever(drive.files()).thenReturn(filesMock)
         whenever(filesMock.get(fileId)).thenReturn(getMock)
         whenever(getMock.executeMediaAsInputStream()).thenReturn(inputStream)
-        whenever(dao.upsertNotesWithTimestamp(any())).thenAnswer {
+        whenever(dao.upsertNotes(any())).thenAnswer {
             throw exception
         }
         whenever(proxy.dao()).thenReturn(dao)