Test the instance of object instead of null

Author: alirezaeiii

app/src/main/java/com/android/sample/app/database/Room.kt

@@ -4,12 +4,12 @@ import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import com.android.sample.app.database.dashboard.DashboardDao
-import com.android.sample.app.database.dashboard.DbDashboard
+import com.android.sample.app.database.dashboard.DashboardEntity
 import com.android.sample.app.database.dashboard.DbLinkConverter
-import com.android.sample.app.database.section.DbSection
+import com.android.sample.app.database.section.SectionEntity
 import com.android.sample.app.database.section.SectionDao
 
-@Database(entities = [DbDashboard::class, DbSection::class], version = 1, exportSchema = false)
+@Database(entities = [DashboardEntity::class, SectionEntity::class], version = 1, exportSchema = false)
 @TypeConverters(DbLinkConverter::class)
 abstract class AppDatabase : RoomDatabase() {
  abstract fun dashboardDao(): DashboardDao

app/src/main/java/com/android/sample/app/database/dashboard/DashboardDao.kt

@@ -9,8 +9,8 @@ import androidx.room.Query
 interface DashboardDao {
 
  @Insert(onConflict = OnConflictStrategy.REPLACE)
- suspend fun insert(dashboard: DbDashboard)
+ suspend fun insert(dashboard: DashboardEntity)
 
  @Query("SELECT * FROM dashboard")
- suspend fun getDashboard(): DbDashboard?
+ suspend fun getDashboard(): DashboardEntity?
 }

app/src/main/java/com/android/sample/app/database/dashboard/DbDashboard.kt renamed to app/src/main/java/com/android/sample/app/database/dashboard/DashboardEntity.kt

@@ -8,12 +8,12 @@ import com.android.sample.app.domain.Links
 
 
 @Entity(tableName = "dashboard")
-class DbDashboard(
+class DashboardEntity(
  @PrimaryKey val primaryKey: String = "dashboard",
- val sections: List<DbLink>
+ val sections: List<LinkEntity>
 )
 
-fun DbDashboard.asDomainModel(): Dashboard {
+fun DashboardEntity.asDomainModel(): Dashboard {
  return Dashboard(
  links = Links(sections = this.sections.map {
  Link(id = it.id, title = it.title, href = it.href)

app/src/main/java/com/android/sample/app/database/dashboard/DbLinkConverter.kt

@@ -6,9 +6,9 @@ import com.google.gson.Gson
 class DbLinkConverter {
 
  @TypeConverter
- fun jsonToList(value: String): List<DbLink> =
- Gson().fromJson(value, Array<DbLink>::class.java).toList()
+ fun jsonToList(value: String): List<LinkEntity> =
+ Gson().fromJson(value, Array<LinkEntity>::class.java).toList()
 
  @TypeConverter
- fun listToJson(value: List<DbLink?>) = Gson().toJson(value.filterNotNull())
+ fun listToJson(value: List<LinkEntity?>) = Gson().toJson(value.filterNotNull())
 }

app/src/main/java/com/android/sample/app/database/dashboard/DbLink.kt renamed to app/src/main/java/com/android/sample/app/database/dashboard/LinkEntity.kt

@@ -1,6 +1,6 @@
 package com.android.sample.app.database.dashboard
 
-class DbLink(
+class LinkEntity(
  val id: String,
  val title: String,
  val href: String

app/src/main/java/com/android/sample/app/database/section/SectionDao.kt

@@ -8,8 +8,8 @@ import androidx.room.Query
 @Dao
 interface SectionDao {
  @Insert(onConflict = OnConflictStrategy.REPLACE)
- suspend fun insert(data: DbSection)
+ suspend fun insert(data: SectionEntity)
 
  @Query("SELECT * FROM sections WHERE id=:id")
- suspend fun getSection(id: String): DbSection?
+ suspend fun getSection(id: String): SectionEntity?
 }

app/src/main/java/com/android/sample/app/database/section/DbSection.kt renamed to app/src/main/java/com/android/sample/app/database/section/SectionEntity.kt

@@ -5,12 +5,12 @@ import androidx.room.PrimaryKey
 import com.android.sample.app.domain.Section
 
 @Entity(tableName = "sections")
-class DbSection(
+class SectionEntity(
  @PrimaryKey val id: String,
  val title: String,
  val description: String
 )
 
 
-fun DbSection.asDomainModel(): Section =
+fun SectionEntity.asDomainModel(): Section =
  Section(sectionId = this.id, title = this.title, description = this.description)

app/src/main/java/com/android/sample/app/domain/Dashboard.kt

@@ -1,17 +1,27 @@
 package com.android.sample.app.domain
 
-import com.android.sample.app.database.dashboard.DbDashboard
-import com.android.sample.app.database.dashboard.DbLink
+import com.android.sample.app.database.dashboard.DashboardEntity
+import com.android.sample.app.database.dashboard.LinkEntity
 import com.google.gson.annotations.SerializedName
 
 class Dashboard(
  @SerializedName("_links") val links: Links
-)
+) {
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (other == null || javaClass != other.javaClass) return false
+ return links == (other as Dashboard).links
+ }
 
-fun Dashboard.asDatabaseModel(): DbDashboard {
- return DbDashboard(
+ override fun hashCode(): Int {
+ return links.hashCode()
+ }
+}
+
+fun Dashboard.asDatabaseModel(): DashboardEntity {
+ return DashboardEntity(
  sections = this.links.sections.map {
- DbLink(id = it.id, title = it.title, href = it.href)
+ LinkEntity(id = it.id, title = it.title, href = it.href)
  }
  )
 }

app/src/main/java/com/android/sample/app/domain/Links.kt

@@ -4,4 +4,14 @@ import com.google.gson.annotations.SerializedName
 
 class Links(
  @SerializedName("viaplay:sections") val sections: List<Link>
-)
+) {
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (other == null || javaClass != other.javaClass) return false
+ return sections == (other as Links).sections
+ }
+
+ override fun hashCode(): Int {
+ return sections.hashCode()
+ }
+}

app/src/main/java/com/android/sample/app/domain/Section.kt

@@ -1,12 +1,22 @@
 package com.android.sample.app.domain
 
-import com.android.sample.app.database.section.DbSection
+import com.android.sample.app.database.section.SectionEntity
 
 class Section(
  val sectionId: String,
  val title: String,
  val description: String
-)
+) {
+ override fun equals(other: Any?): Boolean {
+ if (this === other) return true
+ if (other == null || javaClass != other.javaClass) return false
+ return sectionId == (other as Section).sectionId
+ }
 
-fun Section.asDatabaseModel(): DbSection =
- DbSection(id = this.sectionId, title = this.title, description = this.description)
+ override fun hashCode(): Int {
+ return sectionId.hashCode()
+ }
+}
+
+fun Section.asDatabaseModel(): SectionEntity =
+ SectionEntity(id = this.sectionId, title = this.title, description = this.description)