Skip to content

Commit 28d7808

Browse files
committed
HOTFIX: 근무자, 총무부도 관리자 알림 수신받도록 수정
1 parent 9044089 commit 28d7808

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/main/kotlin/site/billilge/api/backend/domain/member/repository/MemberRepository.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,6 @@ interface MemberRepository: JpaRepository<Member, Long> {
3535
fun findAllByRole(role: Role): List<Member>
3636

3737
fun findByStudentIdAndName(studentId: String, name: String): Member?
38+
39+
fun findAllByRoleIn(roles: Set<Role>): List<Member>
3840
}

src/main/kotlin/site/billilge/api/backend/domain/member/service/MemberService.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ class MemberService(
123123
?: throw ApiException(MemberErrorCode.MEMBER_NOT_FOUND)
124124
}
125125

126-
fun findAllByRole(role: Role): List<Member> {
127-
return memberRepository.findAllByRole(role)
126+
fun findAllWorkers(): List<Member> {
127+
return memberRepository.findAllByRoleIn(setOf(Role.WORKER, Role.ADMIN, Role.GA))
128128
}
129129

130130
fun loginAdmin(studentId: String, password: String): String {

src/main/kotlin/site/billilge/api/backend/domain/notification/service/NotificationService.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ class NotificationService(
9191
formatValues: List<String>,
9292
needPush: Boolean = false
9393
) {
94-
val admins = memberService.findAllByRole(Role.ADMIN)
94+
val admins = memberService.findAllWorkers()
9595

9696
val notification = Notification(
9797
status = type,

0 commit comments

Comments
 (0)