Merge pull request #414 from GSM-MSG/develop

🔁 master 브랜치에 머지
GSM-MSG · Sep 26, 2024 · 324b83f · 324b83f
2 parents f298b62 + 871482b
commit 324b83f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/.../main/kotlin/team/msg/sms/domain/authentication/usecase/QueryAuthenticationFormUseCase.kt b/.../main/kotlin/team/msg/sms/domain/authentication/usecase/QueryAuthenticationFormUseCase.kt
@@ -11,7 +11,6 @@ import team.msg.sms.domain.authentication.service.*
 import team.msg.sms.domain.file.dto.res.FileResponseData
 import team.msg.sms.domain.file.service.FileService
 import java.util.*
-import kotlin.math.max
 
 @UseCase
 class QueryAuthenticationFormUseCase(
@@ -25,7 +24,15 @@ class QueryAuthenticationFormUseCase(
 ) {
     @Transactional(readOnly = true)
     fun execute(): QueryAuthenticationFormResponseData {
-        val authenticationFormId = authenticationFormService.getActiveAuthenticationFormId()
+        val authenticationFormId = runCatching {
+            authenticationFormService.getActiveAuthenticationFormId()
+        }.getOrNull()
+
+        authenticationFormId ?: return QueryAuthenticationFormResponseData(
+            files = emptyList(),
+            content = emptyList()
+        )
+
         val files = fetchFiles(authenticationFormId)
         val groups = fetchAuthenticationGroups(authenticationFormId)
         val authenticationSections = fetchAuthenticationSections(groups)