Skip to content

Commit 551a3f1

Browse files
committed
Simplify safeguarding role lookup after changes
1 parent 4feccd1 commit 551a3f1

2 files changed

Lines changed: 3 additions & 7 deletions

File tree

app/services/safeguarding_flag_service.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,7 @@ class << self
55
def create_for_school_roles(user:, school:)
66
return if user.blank? || school.blank?
77

8-
roles = []
9-
roles << :teacher if user.school_teacher?(school)
10-
roles << :owner if user.school_owner?(school)
11-
12-
create_for_roles(token: user.token, email: user.email, school:, roles:)
8+
create_for_roles(token: user.token, email: user.email, school:, roles: user.school_roles(school))
139
end
1410

1511
def create_for_token(token:, school:)

lib/concepts/school_member/list.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ def call(school:, token:)
4242
private
4343

4444
def fetch_students(school:, token:)
45-
student_roles = Role.student.where(school:)
45+
return OperationResponse[school_students: []] unless Role.student.exists?(school:)
4646

47-
student_roles.any? ? SchoolStudent::List.call(school:, token:) : OperationResponse[school_students: []]
47+
SchoolStudent::List.call(school:, token:)
4848
end
4949

5050
def build_student_members(students)

0 commit comments

Comments
 (0)