Merge branch 'refactor' into main

mahdi-hosseinnion · Mar 27, 2022 · 8a19bf8 · 8a19bf8
2 parents 9753d61 + 29c5130
commit 8a19bf8
Show file tree

Hide file tree

Showing 28 changed files with 512 additions and 494 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/androidTest/java/com/ssmmhh/jibam/endToEndTests/CategorySettingTest.kt b/app/src/androidTest/java/com/ssmmhh/jibam/endToEndTests/CategorySettingTest.kt
@@ -11,12 +11,10 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.ssmmhh.jibam.R
-import com.ssmmhh.jibam.models.Category
 import com.ssmmhh.jibam.persistence.entities.CategoryEntity
-import com.ssmmhh.jibam.persistence.CategoriesDao
+import com.ssmmhh.jibam.persistence.daos.CategoriesDao
 import com.ssmmhh.jibam.persistence.dtos.CategoryDto
 import com.ssmmhh.jibam.ui.main.MainActivity
-import com.ssmmhh.jibam.util.Constants
 import com.ssmmhh.jibam.util.EspressoIdlingResources
 import com.ssmmhh.jibam.util.PreferenceKeys
 import com.ssmmhh.jibam.utils.*

diff --git a/app/src/androidTest/java/com/ssmmhh/jibam/endToEndTests/ChartTest.kt b/app/src/androidTest/java/com/ssmmhh/jibam/endToEndTests/ChartTest.kt
@@ -12,8 +12,8 @@ import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import androidx.test.platform.app.InstrumentationRegistry
 import com.ssmmhh.jibam.R
-import com.ssmmhh.jibam.persistence.CategoriesDao
-import com.ssmmhh.jibam.persistence.TransactionsDao
+import com.ssmmhh.jibam.persistence.daos.CategoriesDao
+import com.ssmmhh.jibam.persistence.daos.TransactionDao
 import com.ssmmhh.jibam.ui.main.MainActivity
 import com.ssmmhh.jibam.ui.main.transaction.chart.ChartListAdapter
 import com.ssmmhh.jibam.ui.main.transaction.chart.DetailChartListAdapter
@@ -33,7 +33,6 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import java.util.*
 import javax.inject.Inject
-import kotlin.math.absoluteValue
 import kotlin.random.Random
 
 /**
@@ -57,7 +56,7 @@ class ChartTest {
  lateinit var categoriesDao: CategoriesDao
 
  @Inject
- lateinit var transactionsDao: TransactionsDao
+ lateinit var transactionsDao: TransactionDao
 
  init {
  //inject this class using dagger
@@ -159,7 +158,7 @@ class ChartTest {
  packageName = packageName
  )
  for (item in transactionsToInsert) {
- transactionsDao.insertOrReplace(item)
+ transactionsDao.insertTransaction(item)
  }
 
  //Act
@@ -249,7 +248,13 @@ class ChartTest {
  )
  //check money amount in detail
  onView(withId(R.id.edt_money))
- .check(matches(withText(transactionsThatHaveSameCategoryAsLargestOne[0].money.abs().toString())))
+ .check(
+ matches(
+ withText(
+ transactionsThatHaveSameCategoryAsLargestOne[0].money.abs().toString()
+ )
+ )
+ )
  //check memo
  onView(withId(R.id.edt_memo))
  .check(matches(withText(transactionsThatHaveSameCategoryAsLargestOne[0].memo ?: "")))
@@ -274,7 +279,7 @@ class ChartTest {
  packageName = packageName
  )
  for (item in transactionsToInsert) {
- transactionsDao.insertOrReplace(item)
+ transactionsDao.insertTransaction(item)
  }
 
  //Act

diff --git a/app/src/androidTest/java/com/ssmmhh/jibam/endToEndTests/TransactionsTest.kt b/app/src/androidTest/java/com/ssmmhh/jibam/endToEndTests/TransactionsTest.kt
@@ -12,7 +12,7 @@ import androidx.test.espresso.matcher.ViewMatchers.*
 import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import com.ssmmhh.jibam.R
 import com.ssmmhh.jibam.persistence.dtos.TransactionDto
-import com.ssmmhh.jibam.persistence.TransactionsDao
+import com.ssmmhh.jibam.persistence.daos.TransactionDao
 import com.ssmmhh.jibam.ui.main.MainActivity
 import com.ssmmhh.jibam.ui.main.transaction.common.MonthManger
 import com.ssmmhh.jibam.util.DateUtils
@@ -49,7 +49,7 @@ class TransactionsTest {
  lateinit var sharedPrefEditor: SharedPreferences.Editor
 
  @Inject
- lateinit var transactionsDao: TransactionsDao
+ lateinit var transactionsDao: TransactionDao
 
  @Inject
  lateinit var monthManger: MonthManger
@@ -133,7 +133,8 @@ class TransactionsTest {
 
  //check summery money section text values
  //confirm incomes has right value
- val sumOfIncomes = insertedTransactions.filter { it.money > BigDecimal.ZERO }.sumOf { it.money }
+ val sumOfIncomes =
+ insertedTransactions.filter { it.money > BigDecimal.ZERO }.sumOf { it.money }
  onView(withId(R.id.txt_income)).check(
  matches(
  withText(
@@ -145,7 +146,8 @@ class TransactionsTest {
  )
  )
  //confirm expenses has right value
- val sumOfExpenses = insertedTransactions.filter { it.money < BigDecimal.ZERO }.sumOf { it.money }
+ val sumOfExpenses =
+ insertedTransactions.filter { it.money < BigDecimal.ZERO }.sumOf { it.money }
  onView(withId(R.id.txt_expenses)).check(
  matches(
  withText(
@@ -171,8 +173,8 @@ class TransactionsTest {
  monthManger.getEndOfCurrentMonth(DateUtils.getCurrentUnixTimeInMilliSeconds()),
  )
  val transaction = createRandomTransaction(date = date.div(1_000))
- transactionsDao.insertOrReplace(transaction)
+ transactionsDao.insertTransaction(transaction)
  }
- return transactionsDao.getAllRecords("").first()
+ return transactionsDao.observeAllOfTransactionsBetweenDates(0, Long.MAX_VALUE, "").first()
  }
 }
diff --git a/app/src/androidTest/java/com/ssmmhh/jibam/endToEndTests/ViewDetailTransactionTest.kt b/app/src/androidTest/java/com/ssmmhh/jibam/endToEndTests/ViewDetailTransactionTest.kt
@@ -14,8 +14,8 @@ import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
 import androidx.test.platform.app.InstrumentationRegistry
 import com.ssmmhh.jibam.R
 import com.ssmmhh.jibam.persistence.entities.TransactionEntity
-import com.ssmmhh.jibam.persistence.CategoriesDao
-import com.ssmmhh.jibam.persistence.TransactionsDao
+import com.ssmmhh.jibam.persistence.daos.CategoriesDao
+import com.ssmmhh.jibam.persistence.daos.TransactionDao
 import com.ssmmhh.jibam.ui.main.MainActivity
 import com.ssmmhh.jibam.util.DateUtils
 import com.ssmmhh.jibam.util.EspressoIdlingResources
@@ -49,7 +49,7 @@ class ViewDetailTransactionTest {
  lateinit var sharedPrefEditor: SharedPreferences.Editor
 
  @Inject
- lateinit var transactionsDao: TransactionsDao
+ lateinit var transactionsDao: TransactionDao
 
  private val appContext = InstrumentationRegistry.getInstrumentation().targetContext
 
@@ -97,7 +97,7 @@ class ViewDetailTransactionTest {
  date = DateUtils.getCurrentTime()
 
  )
- transactionsDao.insertOrReplace(tempTransaction)
+ transactionsDao.insertTransaction(tempTransaction)
  //click on item with transactionMemo in recyclerView
  onView(
  withText(
@@ -161,7 +161,7 @@ class ViewDetailTransactionTest {
  date = DateUtils.getCurrentTime()
 
  )
- transactionsDao.insertOrReplace(tempTransaction)
+ transactionsDao.insertTransaction(tempTransaction)
  //click on item with transactionMemo in recyclerView
  onView(
  withText(transactionMemo)
@@ -221,7 +221,7 @@ class ViewDetailTransactionTest {
  date = DateUtils.getCurrentTime()
 
  )
- transactionsDao.insertOrReplace(tempTransaction)
+ transactionsDao.insertTransaction(tempTransaction)
  //check if transaction is actully inserted into database
  assert(transactionsDao.getTransactionById(transactionId) != null)
  //click on item with transactionMemo in recyclerView

diff --git a/app/src/androidTest/java/com/ssmmhh/jibam/utils/TestData.kt b/app/src/androidTest/java/com/ssmmhh/jibam/utils/TestData.kt
@@ -2,7 +2,7 @@ package com.ssmmhh.jibam.utils
 
 import android.content.res.Resources
 import com.ssmmhh.jibam.persistence.entities.TransactionEntity
-import com.ssmmhh.jibam.persistence.CategoriesDao
+import com.ssmmhh.jibam.persistence.daos.CategoriesDao
 import com.ssmmhh.jibam.util.NUMBER_SEPARATOR
 import java.math.BigDecimal
 

diff --git a/app/src/main/java/com/ssmmhh/jibam/di/AppModule.kt b/app/src/main/java/com/ssmmhh/jibam/di/AppModule.kt
@@ -9,8 +9,8 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.RequestManager
 import com.bumptech.glide.request.RequestOptions
 import com.ssmmhh.jibam.persistence.AppDatabase
-import com.ssmmhh.jibam.persistence.CategoriesDao
-import com.ssmmhh.jibam.persistence.TransactionsDao
+import com.ssmmhh.jibam.persistence.daos.CategoriesDao
+import com.ssmmhh.jibam.persistence.daos.TransactionDao
 import com.ssmmhh.jibam.repository.cateogry.CategoryRepository
 import com.ssmmhh.jibam.repository.cateogry.CategoryRepositoryImpl
 import com.ssmmhh.jibam.repository.tranasction.TransactionRepository
@@ -57,7 +57,7 @@ object AppModule {
  @JvmStatic
  @Singleton
  @Provides
- fun provideRecordsDao(db: AppDatabase): TransactionsDao {
+ fun provideRecordsDao(db: AppDatabase): TransactionDao {
  return db.getRecordsDao()
  }
 

diff --git a/app/src/main/java/com/ssmmhh/jibam/models/Month.kt b/app/src/main/java/com/ssmmhh/jibam/models/Month.kt
@@ -1,7 +1,7 @@
 package com.ssmmhh.jibam.models
 
 data class Month(
- val startOfMonth: Int,
- val endOfMonth: Int,
+ val startOfMonth: Long,
+ val endOfMonth: Long,
  val nameOfMonth: String
 )
diff --git a/app/src/main/java/com/ssmmhh/jibam/models/SummaryMoney.kt b/app/src/main/java/com/ssmmhh/jibam/models/SummaryMoney.kt
@@ -3,8 +3,8 @@ package com.ssmmhh.jibam.models
 import java.math.BigDecimal
 
 data class SummaryMoney(
- val income: BigDecimal = BigDecimal.ZERO,
- val expenses: BigDecimal = BigDecimal.ZERO,
+ val income: BigDecimal,
+ val expenses: BigDecimal,
 ) {
  val balance get() = this.expenses + this.income
 

diff --git a/app/src/main/java/com/ssmmhh/jibam/persistence/AppDatabase.kt b/app/src/main/java/com/ssmmhh/jibam/persistence/AppDatabase.kt
@@ -4,6 +4,8 @@ import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
+import com.ssmmhh.jibam.persistence.daos.CategoriesDao
+import com.ssmmhh.jibam.persistence.daos.TransactionDao
 import com.ssmmhh.jibam.persistence.entities.CategoryEntity
 import com.ssmmhh.jibam.persistence.entities.CategoryImageEntity
 import com.ssmmhh.jibam.persistence.entities.TransactionEntity
@@ -20,10 +22,10 @@ abstract class AppDatabase : RoomDatabase() {
 
  abstract fun getCategoriesDao(): CategoriesDao
 
- abstract fun getRecordsDao(): TransactionsDao
+ abstract fun getRecordsDao(): TransactionDao
 
  companion object {
- val DATABASE_NAME: String = "app_db"
+ const val DATABASE_NAME: String = "app_db"
  val MIGRATION_4_5 = object : Migration(4, 5) {
  override fun migrate(database: SupportSQLiteDatabase) {
  // Create a new records table

diff --git a/app/src/main/java/com/ssmmhh/jibam/persistence/CategoriesDao.kt b/app/src/main/java/com/ssmmhh/jibam/persistence/CategoriesDao.kt