fix: allow professor reserve room 8L (#366)

Author: ChungPlusPlus

src/main/kotlin/com/wafflestudio/csereal/common/utils/Utils.kt

@@ -50,6 +50,11 @@ fun isCurrentUserStaff(): Boolean {
     return "ROLE_STAFF" in getCurrentUserRoles()
 }
 
+fun isCurrentUserStaffOrProfessor(): Boolean {
+    val roles = getCurrentUserRoles()
+    return "ROLE_STAFF" in roles || "ROLE_PROFESSOR" in roles
+}
+
 fun getCurrentUserRoles(): List<String> {
     val authentication = SecurityContextHolder.getContext().authentication ?: /* for test */ return listOf("ROLE_STAFF")
     return authentication.authorities.map { it.authority }

src/main/kotlin/com/wafflestudio/csereal/core/reservation/service/ReservationService.kt

@@ -2,6 +2,7 @@ package com.wafflestudio.csereal.core.reservation.service
 
 import com.wafflestudio.csereal.common.CserealException
 import com.wafflestudio.csereal.common.utils.isCurrentUserStaff
+import com.wafflestudio.csereal.common.utils.isCurrentUserStaffOrProfessor
 import com.wafflestudio.csereal.core.reservation.database.*
 import com.wafflestudio.csereal.core.reservation.dto.ReservationDto
 import com.wafflestudio.csereal.core.reservation.dto.ReserveRequest
@@ -40,7 +41,12 @@ class ReservationServiceImpl(
             roomRepository.findRoomById(reserveRequest.roomId) ?: throw CserealException.Csereal404("Room Not Found")
 
         // 현재 일반 예약 권한으로 교수회의실 제외한 세미나실만 예약 가능 (행정실 요청)
-        if (!isCurrentUserStaff() && (reserveRequest.roomId == 8L || room.type != RoomType.SEMINAR)) {
+        if (!isCurrentUserStaff() && room.type != RoomType.SEMINAR) {
+            throw CserealException.Csereal403("예약 불가. 행정실 문의 바람")
+        }
+
+        // 세미나실 중 교수회의실은 스태프 또는 교수만 예약 가능
+        if (!isCurrentUserStaffOrProfessor() && reserveRequest.roomId == 8L) {
             throw CserealException.Csereal403("예약 불가. 행정실 문의 바람")
         }
 

src/main/kotlin/com/wafflestudio/csereal/core/user/service/CustomOidcUserService.kt

@@ -51,6 +51,9 @@ class CustomOidcUserService(
         if ("professor" in groups || "graduate" in groups) {
             authorities.add(SimpleGrantedAuthority("ROLE_RESERVATION"))
         }
+        if ("professor" in groups) {
+            authorities.add(SimpleGrantedAuthority("ROLE_PROFESSOR"))
+        }
         if ("student-council" in groups) {
             authorities.add(SimpleGrantedAuthority("ROLE_COUNCIL"))
         }