diff --git a/data/src/main/java/com/nexters/boolti/data/network/response/PreQuestionAnswerResponse.kt b/data/src/main/java/com/nexters/boolti/data/network/response/PreQuestionAnswerResponse.kt index cc95b7f0..9681f7e9 100644 --- a/data/src/main/java/com/nexters/boolti/data/network/response/PreQuestionAnswerResponse.kt +++ b/data/src/main/java/com/nexters/boolti/data/network/response/PreQuestionAnswerResponse.kt @@ -14,9 +14,9 @@ internal data class PreQuestionAnswerDetailResponse( internal data class PreQuestionAnswerItemResponse( val preQuestionId: Long, val question: String, - val description: String?, + val description: String, val isRequired: Boolean, - val answer: String?, + val answer: String, val createdAt: String?, val modifiedAt: String?, ) @@ -24,9 +24,9 @@ internal data class PreQuestionAnswerItemResponse( internal fun PreQuestionAnswerItemResponse.toDomain() = PreQuestionAnswer( preQuestionId = preQuestionId, question = question, - description = description.orEmpty(), + description = description, isRequired = isRequired, - answer = answer.orEmpty(), + answer = answer, ) internal fun List.toDomains() = map { it.toDomain() } diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/screen/prequestionedit/PreQuestionEditViewModel.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/prequestionedit/PreQuestionEditViewModel.kt index 7d3f37a7..1d03d727 100644 --- a/presentation/src/main/java/com/nexters/boolti/presentation/screen/prequestionedit/PreQuestionEditViewModel.kt +++ b/presentation/src/main/java/com/nexters/boolti/presentation/screen/prequestionedit/PreQuestionEditViewModel.kt @@ -133,7 +133,6 @@ class PreQuestionEditViewModel @Inject constructor( private fun submitAnswers() { val state = uiState.value val answerRequests = state.answers - .filter { (_, answer) -> answer.isNotBlank() } .map { (questionId, answer) -> PreQuestionAnswerRequest( preQuestionId = questionId, diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/screen/ticketing/TicketingViewModel.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/ticketing/TicketingViewModel.kt index 369ad611..78f0958c 100644 --- a/presentation/src/main/java/com/nexters/boolti/presentation/screen/ticketing/TicketingViewModel.kt +++ b/presentation/src/main/java/com/nexters/boolti/presentation/screen/ticketing/TicketingViewModel.kt @@ -235,7 +235,6 @@ class TicketingViewModel @Inject constructor( if (state.preQuestions.isEmpty()) return val answers = state.preQuestionAnswers - .filter { (_, answer) -> answer.isNotBlank() } .map { (questionId, answer) -> PreQuestionAnswerRequest( preQuestionId = questionId, @@ -243,8 +242,6 @@ class TicketingViewModel @Inject constructor( ) } - if (answers.isEmpty()) return - val request = SubmitPreQuestionAnswersRequest( reservationId = reservationId, answers = answers,