fix: 이미 추가한 그룹 편집이 안되는 문제 수정

Author: Iwillbeagood

core/model/src/main/java/com/yapp/breake/core/model/app/App.kt

@@ -2,7 +2,7 @@ package com.yapp.breake.core.model.app
 
 data class App(
 	val packageName: String,
-	val id: Long,
+	val id: Long?,
 	val name: String,
 	val icon: ByteArray?,
 	val category: String,

data/src/main/java/com/yapp/breake/data/mapper/AppGroupMapper.kt

@@ -53,7 +53,7 @@ internal fun AppEntity.toApp(appScanner: InstalledAppScanner): App {
 internal fun App.toAppEntity(parentGroupId: Long): AppEntity {
 	return AppEntity(
 		packageName = packageName,
-		id = id,
+		id = id ?: 0L,
 		name = name,
 		category = category,
 		parentGroupId = parentGroupId,
@@ -73,6 +73,7 @@ internal fun AppGroup.toAppGroupRequest(): AppGroupRequest {
 			AppRequest(
 				name = app.name,
 				packageName = app.packageName,
+				groupAppId = app.id,
 			)
 		},
 	)

data/src/main/java/com/yapp/breake/data/remote/model/AppRequest.kt

@@ -6,4 +6,5 @@ import kotlinx.serialization.Serializable
 internal data class AppRequest(
 	val name: String,
 	val packageName: String,
+	val groupAppId: Long? = null,
 )

data/src/main/java/com/yapp/breake/data/repository/AppGroupRepositoryImpl.kt

@@ -26,15 +26,15 @@ internal class AppGroupRepositoryImpl @Inject constructor(
 			).map { updatedGroup ->
 				appGroupLocalDataSource.insertAppGroup(updatedGroup)
 				updatedGroup
-			}.first()
+			}
 		} else {
 			appGroupRemoteDataSource.createAppGroup(
 				appGroup = appGroup,
 			).map { newGroup ->
 				appGroupLocalDataSource.insertAppGroup(newGroup)
 				newGroup
-			}.first()
-		}
+			}
+		}.first()
 	}
 
 	override suspend fun getAvailableMinGroupId(): Long =

presentation/home/src/main/java/com/yapp/breake/presentation/registry/RegistryViewModel.kt

@@ -68,6 +68,7 @@ class RegistryViewModel @Inject constructor(
 						group.apps.forEachIndexed { index, appModel ->
 							add(
 								SelectedAppModel(
+									id = appModel.id,
 									index = index,
 									name = appModel.name,
 									packageName = appModel.packageName,
@@ -128,7 +129,9 @@ class RegistryViewModel @Inject constructor(
 							.takeIf { it >= 0 }?.let { index ->
 								set(
 									index = index,
-									element = cachedApps[index].copy(isSelected = true),
+									element = cachedApps[index].copy(
+										isSelected = true,
+									),
 								)
 							}
 					}
@@ -143,6 +146,7 @@ class RegistryViewModel @Inject constructor(
 										name = selectedApp.name,
 										packageName = selectedApp.packageName,
 										icon = selectedApp.icon,
+										id = selectedApp.id,
 									),
 								)
 							}
@@ -199,10 +203,9 @@ class RegistryViewModel @Inject constructor(
 						apps = it.selectedApps.map { selectedApp ->
 							App(
 								packageName = selectedApp.packageName,
-								id = 0L,
+								id = selectedApp.id,
 								name = selectedApp.name,
 								icon = selectedApp.icon.toByteArray(),
-								// TODO: 카테고리 추후 추가 필요
 								category = "기타",
 							)
 						},
@@ -292,11 +295,16 @@ class RegistryViewModel @Inject constructor(
 				apps = it.apps,
 				selectedApps = it.apps.mapIndexedNotNull { index, appModel ->
 					if (appModel.isSelected) {
+						val existingApp = it.selectedApps.find { selectedApp ->
+							selectedApp.packageName == appModel.packageName
+						}
+
 						SelectedAppModel(
 							index = index,
 							name = appModel.name,
 							packageName = appModel.packageName,
 							icon = appModel.icon,
+							id = existingApp?.id,
 						)
 					} else {
 						null

presentation/home/src/main/java/com/yapp/breake/presentation/registry/model/SelectedAppModel.kt

@@ -9,4 +9,5 @@ data class SelectedAppModel(
 	val name: String,
 	val packageName: String,
 	val icon: Drawable?,
+	val id: Long?,
 )

presentation/home/src/main/java/com/yapp/breake/presentation/registry/screen/GroupRegistryScreen.kt

@@ -386,9 +386,9 @@ private fun GroupRegistryScreenPreview() {
 				groupId = 1L,
 				groupName = "그룹 이름",
 				selectedApps = persistentListOf(
-					SelectedAppModel(index = 0, name = "앱1", packageName = "", icon = null),
-					SelectedAppModel(index = 1, name = "앱2", packageName = "", icon = null),
-					SelectedAppModel(index = 2, name = "앱3", packageName = "", icon = null),
+					SelectedAppModel(index = 0, name = "앱1", packageName = "", icon = null, id = 1L),
+					SelectedAppModel(index = 1, name = "앱2", packageName = "", icon = null, id = 2L),
+					SelectedAppModel(index = 2, name = "앱3", packageName = "", icon = null, id = 3L),
 				),
 				apps = persistentListOf(
 					AppModel(