Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ interface PersonRepository {
*/
fun getPersonById(personId: Long): Flow<PersonModel?>

/**
* 시스템 식별자로 인물 이름 조회
*/
suspend fun getInputNameBySystemName(systemName: String): String?

/**
* @return 분석 완료 후 저장된 인물 수
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ class PersonRepositoryImpl @Inject constructor(
.map { it?.toModel(emptyMap()) }
.flowOn(Dispatchers.IO)

override suspend fun getInputNameBySystemName(systemName: String): String? = withContext(ioDispatcher) {
personDao.getInputNameByImageName(systemName)
}

override suspend fun getPersonCount(): Int = personDao.getPersonCount()

override suspend fun getPersonIdByImageName(imageName: String): Long? =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import com.metasearch.android.core.common.constants.PromptConstants
import com.metasearch.android.core.common.utils.runSuspendCatching
import com.metasearch.android.core.data.api.repository.DatabaseNameRepository
import com.metasearch.android.core.data.api.repository.GalleryRepository
import com.metasearch.android.core.data.api.repository.PersonRepository
import com.metasearch.android.core.data.api.repository.SearchRepository
import com.metasearch.android.core.data.impl.mapper.toModel
import com.metasearch.android.core.data.impl.util.CypherQueryGenerator
Expand Down Expand Up @@ -36,6 +37,7 @@ internal class SearchRepositoryImpl @Inject constructor(
private val webService: WebService,
private val openAIService: OpenAIService,
private val galleryRepository: GalleryRepository,
private val personRepository: PersonRepository,
private val databaseNameRepository: DatabaseNameRepository,
) : SearchRepository {

Expand Down Expand Up @@ -66,10 +68,18 @@ internal class SearchRepositoryImpl @Inject constructor(
request = FocusingSearchRequest(requestCircles),
)

val mappedProperties = detectionResponse.detectedObjects.map { systemName ->
val inputName = personRepository.getInputNameBySystemName(systemName)

if (!inputName.isNullOrBlank()) inputName else systemName
}.filter { it.isNotBlank() }.distinct()

if (mappedProperties.isEmpty()) return@coroutineScope SearchResult(groups = emptyList())

val finalResult = webService.sendDetectedObjects(
request = DetectedObjectsRequest(
dbName = dbName,
properties = detectionResponse.detectedObjects,
properties = mappedProperties,
),
)

Expand Down