2주차 과제

.gitignore

@@ -192,4 +192,5 @@ fabric.properties
 
 !/gradle/wrapper/gradle-wrapper.jar
 
-# End of https://www.toptal.com/developers/gitignore/api/androidstudio,macos,windows
+# End of https://www.toptal.com/developers/gitignore/api/androidstudio,macos,windows
+.idea/deploymentTargetDropDown.xml

app/build.gradle

@@ -44,17 +44,30 @@ android {
 dependencies {
     implementation 'androidx.core:core-ktx:1.8.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'com.google.code.gson:gson:2.10.1'
-    testImplementation 'junit:junit:4.13.2'
+    implementation 'androidx.activity:activity-ktx:1.2.2'
+    implementation 'androidx.fragment:fragment-ktx:1.5.4'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+
+    testImplementation 'junit:junit:4.13.2'
+
     implementation "com.google.dagger:hilt-android:2.44"
     kapt "com.google.dagger:hilt-compiler:2.44"
-    implementation 'androidx.activity:activity-ktx:1.2.2'
-    implementation 'androidx.fragment:fragment-ktx:1.3.3'
+
+    implementation 'com.google.android.material:material:1.5.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
+
     implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1'
+
+    //room
+    implementation 'androidx.room:room-runtime:2.4.3'
+    annotationProcessor 'androidx.room:room-compiler:2.4.3'
+    kapt 'androidx.room:room-compiler:2.4.3'
+    implementation 'androidx.room:room-ktx:2.4.3'
+
+    //coil
+    implementation 'io.coil-kt:coil:2.4.0'
 }
 
 kapt {

app/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:name=".DoSoptApplication"
         android:allowBackup="true"

app/src/main/java/org/sopt/dosopttemplate/data/database/FriendDataBase.kt

@@ -0,0 +1,14 @@
+package org.sopt.dosopttemplate.data.database
+
+import androidx.room.Database
+import androidx.room.RoomDatabase
+import org.sopt.dosopttemplate.data.model.local.FriendInfoEntity
+
+@Database(
+    entities = [
+        FriendInfoEntity::class
+    ], version = 1
+)
+abstract class FriendDataBase : RoomDatabase() {
+    abstract fun friendInfoDao(): FriendInfoDao
+}

app/src/main/java/org/sopt/dosopttemplate/data/database/FriendInfoDao.kt

@@ -0,0 +1,25 @@
+package org.sopt.dosopttemplate.data.database
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.Query
+import org.sopt.dosopttemplate.data.model.local.FriendInfoEntity
+
+@Dao
+interface FriendInfoDao {
+    @Query("SELECT * FROM table_friend_info")
+    suspend fun getAll(): List<FriendInfoEntity>
+
+    @Insert
+    suspend fun addFriend(friendInfoEntity: FriendInfoEntity)
+
+    @Insert
+    suspend fun addFriends(friendList: List<FriendInfoEntity>)
+
+    @Delete
+    suspend fun deleteFriend(friendInfoEntity: FriendInfoEntity)
+
+    @Query("DELETE FROM table_friend_info WHERE id = :id")
+    suspend fun deleteFriendById(id: Int)
+}

app/src/main/java/org/sopt/dosopttemplate/data/datasource/FriendLocalDataSourceImpl.kt

@@ -0,0 +1,32 @@
+package org.sopt.dosopttemplate.data.datasource
+
+import org.sopt.dosopttemplate.data.database.FriendDataBase
+import org.sopt.dosopttemplate.data.local.FriendLocalDataSource
+import org.sopt.dosopttemplate.data.model.local.FriendInfoEntity
+import javax.inject.Inject
+
+class FriendLocalDataSourceImpl @Inject constructor(
+    private val friendDataBase: FriendDataBase
+) : FriendLocalDataSource {
+    override suspend fun getAll(): List<FriendInfoEntity> {
+        return friendDataBase.friendInfoDao().getAll()
+    }
+
+    override suspend fun addFriend(friendInfoEntity: FriendInfoEntity) {
+        friendDataBase.friendInfoDao().addFriend(friendInfoEntity)
+    }
+
+    override suspend fun addFriends(friendList: List<FriendInfoEntity>) {
+        friendDataBase.friendInfoDao().addFriends(friendList)
+    }
+
+    override suspend fun deleteFriend(friendInfoEntity: FriendInfoEntity) {
+        friendDataBase.friendInfoDao().deleteFriend(friendInfoEntity)
+    }
+
+    override suspend fun deleteFriendById(id: Int) {
+        friendDataBase.friendInfoDao().deleteFriendById(id)
+    }
+
+
+}

app/src/main/java/org/sopt/dosopttemplate/data/datasource/SharedPrefDataSourceImpl.kt

@@ -3,8 +3,8 @@ package org.sopt.dosopttemplate.data.datasource
 import android.content.SharedPreferences
 import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
-import org.sopt.dosopttemplate.data.model.UserDto
 import org.sopt.dosopttemplate.data.local.SharedPrefDataSource
+import org.sopt.dosopttemplate.data.model.local.UserDto
 import javax.inject.Inject
 
 class SharedPrefDataSourceImpl @Inject constructor(

app/src/main/java/org/sopt/dosopttemplate/data/local/FriendLocalDataSource.kt

@@ -0,0 +1,11 @@
+package org.sopt.dosopttemplate.data.local
+
+import org.sopt.dosopttemplate.data.model.local.FriendInfoEntity
+
+interface FriendLocalDataSource {
+    suspend fun getAll(): List<FriendInfoEntity>
+    suspend fun addFriend(friendInfoEntity: FriendInfoEntity)
+    suspend fun addFriends(friendList: List<FriendInfoEntity>)
+    suspend fun deleteFriend(friendInfoEntity: FriendInfoEntity)
+    suspend fun deleteFriendById(id: Int)
+}

app/src/main/java/org/sopt/dosopttemplate/data/local/SharedPrefDataSource.kt

@@ -1,6 +1,6 @@
 package org.sopt.dosopttemplate.data.local
 
-import org.sopt.dosopttemplate.data.model.UserDto
+import org.sopt.dosopttemplate.data.model.local.UserDto
 
 interface SharedPrefDataSource {
     fun saveUserInfo(userDto: UserDto?)

app/src/main/java/org/sopt/dosopttemplate/data/model/local/FriendInfoEntity.kt

@@ -0,0 +1,40 @@
+package org.sopt.dosopttemplate.data.model.local
+
+import androidx.room.ColumnInfo
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+import org.sopt.dosopttemplate.domain.entity.Friend
+import java.time.LocalDate
+
+@Entity(tableName = "table_friend_info")
+data class FriendInfoEntity(
+    @PrimaryKey(autoGenerate = true)
+    val id: Int?,
+    val name: String,
+    val birthday: String,
+    val music: String?,
+    @ColumnInfo(name = "image_uri")
+    val imageUri: String?,
+) {
+    companion object {
+        fun toFriend(friendInfoList: List<FriendInfoEntity>) = friendInfoList.map { data ->
+            Friend(
+                id = data.id,
+                name = data.name,
+                birthday = LocalDate.parse(data.birthday),
+                music = data.music,
+                imageUri = data.imageUri
+            )
+        }
+
+        fun toFriendInfoEntity(friendList: List<Friend>) = friendList.map { data ->
+            FriendInfoEntity(
+                id = data.id,
+                name = data.name,
+                birthday = data.birthday.toString(),
+                music = data.music,
+                imageUri = data.imageUri
+            )
+        }
+    }
+}

app/src/main/java/org/sopt/dosopttemplate/data/model/UserDto.kt → app/src/main/java/org/sopt/dosopttemplate/data/model/local/UserDto.kt

@@ -1,4 +1,4 @@
-package org.sopt.dosopttemplate.data.model
+package org.sopt.dosopttemplate.data.model.local
 
 import kotlinx.serialization.Serializable
 import org.sopt.dosopttemplate.domain.entity.User
@@ -8,13 +8,13 @@ data class UserDto(
     val id: String? = "",
     val pw: String? = "",
     val nickname: String? = "",
-    val hobby: String? = ""
+    val discription: String? = ""
 ) {
     fun toUser(): User? {
-        return User(id, pw, nickname, hobby)
+        return User(id, pw, nickname, discription)
     }
 
     fun toUserDto(user: User?): UserDto {
-        return UserDto(user?.id, user?.pw, user?.nickname, user?.hobby)
+        return UserDto(user?.id, user?.pw, user?.nickname, user?.discription)
     }
 }

app/src/main/java/org/sopt/dosopttemplate/data/repository/FriendLocalRepositoryImpl.kt

@@ -0,0 +1,33 @@
+package org.sopt.dosopttemplate.data.repository
+
+import org.sopt.dosopttemplate.data.local.FriendLocalDataSource
+import org.sopt.dosopttemplate.data.model.local.FriendInfoEntity.Companion.toFriend
+import org.sopt.dosopttemplate.data.model.local.FriendInfoEntity.Companion.toFriendInfoEntity
+import org.sopt.dosopttemplate.domain.entity.Friend
+import org.sopt.dosopttemplate.domain.repository.FriendLocalRepository
+import javax.inject.Inject
+
+class FriendLocalRepositoryImpl @Inject constructor(
+    private val friendLocalDataSource: FriendLocalDataSource
+) : FriendLocalRepository {
+    override suspend fun getAll(): Result<List<Friend>> =
+        runCatching {
+            toFriend(friendLocalDataSource.getAll())
+        }
+
+    override suspend fun addFriend(friend: Friend) {
+        friendLocalDataSource.addFriend(toFriendInfoEntity(listOf(friend)).first())
+    }
+
+    override suspend fun addFriends(friendList: List<Friend>) {
+        friendLocalDataSource.addFriends(toFriendInfoEntity(friendList))
+    }
+
+    override suspend fun deleteFriend(friend: Friend) {
+        friendLocalDataSource.deleteFriend(toFriendInfoEntity(listOf(friend)).first())
+    }
+
+    override suspend fun deleteFriendById(id: Int) {
+        friendLocalDataSource.deleteFriendById(id)
+    }
+}

app/src/main/java/org/sopt/dosopttemplate/data/repository/SharedPrefRepositoryImpl.kt

@@ -1,7 +1,7 @@
 package org.sopt.dosopttemplate.data.repository
 
-import org.sopt.dosopttemplate.data.model.UserDto
 import org.sopt.dosopttemplate.data.local.SharedPrefDataSource
+import org.sopt.dosopttemplate.data.model.local.UserDto
 import org.sopt.dosopttemplate.domain.entity.User
 import org.sopt.dosopttemplate.domain.repository.SharedPrefRepository
 import javax.inject.Inject

app/src/main/java/org/sopt/dosopttemplate/di/DataBaseModule.kt

@@ -0,0 +1,27 @@
+package org.sopt.dosopttemplate.di
+
+import android.content.Context
+import androidx.room.Room
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dagger.hilt.components.SingletonComponent
+import org.sopt.dosopttemplate.data.database.FriendDataBase
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+object DataBaseModule {
+    @Singleton
+    @Provides
+    fun provideDataBase(
+        @ApplicationContext context: Context
+    ): FriendDataBase =
+        Room.databaseBuilder(context, FriendDataBase::class.java, "sopt_friend.db")
+            .createFromAsset("databases/sopt_friend.db").build()
+
+    @Singleton
+    @Provides
+    fun provideFriendDao(friendDataBase: FriendDataBase) = friendDataBase.friendInfoDao()
+}

app/src/main/java/org/sopt/dosopttemplate/di/DataSourceModule.kt

@@ -4,7 +4,9 @@ import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import org.sopt.dosopttemplate.data.datasource.FriendLocalDataSourceImpl
 import org.sopt.dosopttemplate.data.datasource.SharedPrefDataSourceImpl
+import org.sopt.dosopttemplate.data.local.FriendLocalDataSource
 import org.sopt.dosopttemplate.data.local.SharedPrefDataSource
 import javax.inject.Singleton
 
@@ -14,4 +16,8 @@ abstract class DataSourceModule {
     @Singleton
     @Binds
     abstract fun bindsSharedPrefDataSource(sharedPrefDataSource: SharedPrefDataSourceImpl): SharedPrefDataSource
+
+    @Singleton
+    @Binds
+    abstract fun bindsFriendLocalDataSource(friendLocalDataSource: FriendLocalDataSourceImpl): FriendLocalDataSource
 }

app/src/main/java/org/sopt/dosopttemplate/di/RepositoryModule.kt

@@ -4,7 +4,9 @@ import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
+import org.sopt.dosopttemplate.data.repository.FriendLocalRepositoryImpl
 import org.sopt.dosopttemplate.data.repository.SharedPrefRepositoryImpl
+import org.sopt.dosopttemplate.domain.repository.FriendLocalRepository
 import org.sopt.dosopttemplate.domain.repository.SharedPrefRepository
 import javax.inject.Singleton
 
@@ -16,4 +18,10 @@ abstract class RepositoryModule {
     abstract fun bindsSharedPrefRepository(
         sharedPrefRepository: SharedPrefRepositoryImpl
     ): SharedPrefRepository
+
+    @Singleton
+    @Binds
+    abstract fun bindsFriendLocalRepository(
+        friendLocalRepository: FriendLocalRepositoryImpl
+    ): FriendLocalRepository
 }

app/src/main/java/org/sopt/dosopttemplate/domain/entity/Friend.kt

@@ -0,0 +1,11 @@
+package org.sopt.dosopttemplate.domain.entity
+
+import java.time.LocalDate
+
+data class Friend(
+    val id: Int?,
+    val name: String,
+    val birthday: LocalDate?,
+    val music: String?,
+    val imageUri: String?,
+)

app/src/main/java/org/sopt/dosopttemplate/domain/entity/User.kt

@@ -4,5 +4,5 @@ data class User(
     val id: String? = "",
     val pw: String? = "",
     val nickname: String? = "",
-    val hobby: String? = ""
+    val discription: String? = ""
 )

app/src/main/java/org/sopt/dosopttemplate/domain/repository/FriendLocalRepository.kt

@@ -0,0 +1,11 @@
+package org.sopt.dosopttemplate.domain.repository
+
+import org.sopt.dosopttemplate.domain.entity.Friend
+
+interface FriendLocalRepository {
+    suspend fun getAll(): Result<List<Friend>>
+    suspend fun addFriend(friend: Friend)
+    suspend fun addFriends(friendList: List<Friend>)
+    suspend fun deleteFriend(friend: Friend)
+    suspend fun deleteFriendById(id: Int)
+}