diff --git a/src/main/kotlin/dsm/pick2024/domain/application/service/QueryMyApplicationService.kt b/src/main/kotlin/dsm/pick2024/domain/application/service/QueryMyApplicationService.kt index 7625dfd80..47d0c24e8 100644 --- a/src/main/kotlin/dsm/pick2024/domain/application/service/QueryMyApplicationService.kt +++ b/src/main/kotlin/dsm/pick2024/domain/application/service/QueryMyApplicationService.kt @@ -37,7 +37,7 @@ class QueryMyApplicationService( start = application.start.take(5), end = application.end!!.take(5), reason = application.reason, - profile = profileUrl?.substringBefore("?"), + profile = profileUrl, grade = user.grade, classNum = user.classNum, num = user.num, diff --git a/src/main/kotlin/dsm/pick2024/domain/timetable/presentation/dto/response/TimetableResponse.kt b/src/main/kotlin/dsm/pick2024/domain/timetable/presentation/dto/response/TimetableResponse.kt index 9dede9a76..55f28d1a9 100644 --- a/src/main/kotlin/dsm/pick2024/domain/timetable/presentation/dto/response/TimetableResponse.kt +++ b/src/main/kotlin/dsm/pick2024/domain/timetable/presentation/dto/response/TimetableResponse.kt @@ -24,8 +24,9 @@ data class DayTimetableResponse( break } - val imageUrl = - fileUtil.generateObjectUrl("$subjectName.png", PathList.TIMETABLE) + val imageUrl = subjectName?.let { + fileUtil.generateObjectUrl("$it.png", PathList.TIMETABLE) + } dayTimetableResponses.add(PeriodTimetableResponse(id, period, subjectName, imageUrl)) } diff --git a/src/main/kotlin/dsm/pick2024/domain/timetable/service/QueryTeacherTimetableService.kt b/src/main/kotlin/dsm/pick2024/domain/timetable/service/QueryTeacherTimetableService.kt index d16619c4c..528b32064 100644 --- a/src/main/kotlin/dsm/pick2024/domain/timetable/service/QueryTeacherTimetableService.kt +++ b/src/main/kotlin/dsm/pick2024/domain/timetable/service/QueryTeacherTimetableService.kt @@ -32,7 +32,10 @@ class QueryTeacherTimetableService( val timetables = (1..7).mapNotNull { period -> tables.find { it.period == period }?.let { timetable -> - val imageUrl = fileUtil.generateObjectUrl("${timetable.subjectName}.png", PathList.TIMETABLE) + val imageUrl = fileUtil.generateObjectUrl( + "${timetable.subjectName}.png", + PathList.TIMETABLE + ) PeriodTimetableResponse(timetable.id!!, period, timetable.subjectName, imageUrl) } } diff --git a/src/main/kotlin/dsm/pick2024/domain/user/service/QueryUserDetaileInfoService.kt b/src/main/kotlin/dsm/pick2024/domain/user/service/QueryUserDetaileInfoService.kt index 0c6a1d0e3..19d953cf1 100644 --- a/src/main/kotlin/dsm/pick2024/domain/user/service/QueryUserDetaileInfoService.kt +++ b/src/main/kotlin/dsm/pick2024/domain/user/service/QueryUserDetaileInfoService.kt @@ -21,7 +21,7 @@ class QueryUserDetaileInfoService( val profileUrl = user.profile?.let { fileUtil.generateObjectUrl(it, PathList.PROFILE) } return QueryUserDetailsInfoResponse( - profile = profileUrl?.substringBefore("?"), + profile = profileUrl, userName = user.name, grade = user.grade, classNum = user.classNum, diff --git a/src/main/kotlin/dsm/pick2024/domain/user/service/QueryUserSimpleInfoService.kt b/src/main/kotlin/dsm/pick2024/domain/user/service/QueryUserSimpleInfoService.kt index a3df96ee4..21464a930 100644 --- a/src/main/kotlin/dsm/pick2024/domain/user/service/QueryUserSimpleInfoService.kt +++ b/src/main/kotlin/dsm/pick2024/domain/user/service/QueryUserSimpleInfoService.kt @@ -24,7 +24,7 @@ class QueryUserSimpleInfoService( user.grade, user.classNum, user.num, - profileUrl?.substringBefore("?") + profileUrl ) } } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index e1140c46c..1ca8bde26 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -106,7 +106,6 @@ firebase: url: host: ${FIREBASE_HOST} path: ${FIREBASE_PATH} - key: ${FIREBASE_KEY_JSON} credentials: ${FIREBASE_CREDENTIALS_URL} google: