Skip to content

Commit ee4cb3d

Browse files
authored
Merge pull request #333 from GSM-MSG/feature/332-fix-graduate-user-login
졸업생 로그인 안되는 오류 해결
2 parents 5849c91 + d76b50c commit ee4cb3d

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

sms-core/src/main/kotlin/team/msg/sms/domain/auth/usecase/WithdrawalUseCase.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package team.msg.sms.domain.auth.usecase
22

33
import team.msg.sms.common.annotation.UseCase
4+
import team.msg.sms.domain.auth.model.Role
45
import team.msg.sms.domain.certificate.service.CertificateService
56
import team.msg.sms.domain.file.service.ImageService
67
import team.msg.sms.domain.languagecertificate.service.LanguageCertificateService
@@ -29,7 +30,7 @@ class WithdrawalUseCase(
2930
) {
3031
fun execute() {
3132
val user = userService.getCurrentUser()
32-
if (user.roles[0].name == "ROLE_STUDENT") {
33+
if (user.roles[0] == Role.ROLE_STUDENT) {
3334
val student = studentService.getStudentByUser(user)
3435
val project = projectService.getAllProjectByStudentId(student.id)
3536

sms-core/src/main/kotlin/team/msg/sms/domain/user/service/impl/GetUserServiceImpl.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class GetUserServiceImpl(
1818
) : GetUserService {
1919
override fun getRoleByGAuthInfo(email: String, role: String): Role {
2020
val user = queryUserPort.queryUserByEmail(email) ?: return when (role) {
21-
"ROLE_STUDENT" -> Role.ROLE_STUDENT
21+
"ROLE_STUDENT", "ROLE_GRADUATE" -> Role.ROLE_STUDENT
2222
"ROLE_TEACHER" -> Role.ROLE_TEACHER
2323
else -> throw RoleNotExistsException
2424
}

0 commit comments

Comments
 (0)