Skip to content

Commit 3641d84

Browse files
committed
feat(admin): batch convert controllers to params.expect
Converted controllers: - workshops_controller: array params, host_id helper method - events_controller: multiple nested arrays for sponsor tiers - sponsors_controller: nested attributes (address, contacts) - announcements_controller: group_ids array - chapters_controller: basic fields - groups_controller: basic fields - meetings_controller: multiple fields - bans_controller: ban params - member_notes_controller: note params All controllers now use params.expect syntax instead of require().permit(). All existing tests pass with no regressions.
1 parent 4e2c0b0 commit 3641d84

9 files changed

Lines changed: 28 additions & 22 deletions

app/controllers/admin/announcements_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ def set_announcement
3636
end
3737

3838
def announcement_params
39-
params.require(:announcement).permit(:all_groups, :message, :expires_at, group_ids: [])
39+
params.expect(announcement: [:all_groups, :message, :expires_at, { group_ids: [] }])
4040
end
4141
end

app/controllers/admin/bans_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ def create
2020
private
2121

2222
def ban_params
23-
params.require(:ban).permit(:note, :reason, :permanent, :expires_at, :explanation)
23+
params.expect(ban: [:note, :reason, :permanent, :expires_at, :explanation])
2424
end
2525

2626
def set_member

app/controllers/admin/chapters_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def members
5858
private
5959

6060
def chapter_params
61-
params.require(:chapter).permit(:name, :email, :city, :time_zone, :description, :image)
61+
params.expect(chapter: [:name, :email, :city, :time_zone, :description, :image])
6262
end
6363

6464
def set_chapter

app/controllers/admin/events_controller.rb

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,17 @@ def set_event
7272
end
7373

7474
def event_params
75-
params.require(:event).permit(
75+
params.expect(event: [
7676
:virtual, :name, :slug, :date_and_time, :local_date, :local_time, :local_end_time, :description,
7777
:info, :schedule, :venue_id, :external_url, :coach_spaces, :student_spaces, :email, :announce_only,
7878
:tito_url, :invitable, :time_zone, :student_questionnaire, :confirmation_required, :surveys_required,
7979
:audience, :coach_questionnaire, :show_faq, :display_coaches, :display_students,
80-
bronze_sponsor_ids: [], silver_sponsor_ids: [], gold_sponsor_ids: [], sponsor_ids: [],
81-
chapter_ids: []
82-
)
80+
{ bronze_sponsor_ids: [] },
81+
{ silver_sponsor_ids: [] },
82+
{ gold_sponsor_ids: [] },
83+
{ sponsor_ids: [] },
84+
{ chapter_ids: [] }
85+
])
8386
end
8487

8588
def organiser_ids

app/controllers/admin/groups_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ def show
2727
private
2828

2929
def group_params
30-
params.require(:group).permit(:name, :description, :chapter_id)
30+
params.expect(group: [:name, :description, :chapter_id])
3131
end
3232
end

app/controllers/admin/meetings_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ def slug
6262
end
6363

6464
def meeting_params
65-
params.require(:meeting).permit(
65+
params.expect(meeting: [
6666
:name, :description, :slug, :date_and_time, :local_date, :local_time, :local_end_time,
6767
:invitable, :spaces, :venue_id, :sponsor_id, :chapters
68-
)
68+
])
6969
end
7070

7171
def organiser_ids

app/controllers/admin/member_notes_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ def create
99
end
1010

1111
def member_note_params
12-
params.require(:member_note).permit(:note, :member_id)
12+
params.expect(member_note: [:note, :member_id])
1313
end
1414
end

app/controllers/admin/sponsors_controller.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,12 @@ def update
6363
private
6464

6565
def sponsor_params
66-
params.require(:sponsor).permit(:name, :avatar, :website, :seats, :accessibility_info,
67-
:number_of_coaches, :level, :description,
68-
address_attributes: %i[id flat street postal_code city
69-
latitude longitude directions],
70-
contacts_attributes: %i[id name surname email mailing_list_consent
71-
_destroy])
66+
params.require(:sponsor).permit(
67+
:name, :avatar, :website, :seats, :accessibility_info,
68+
:number_of_coaches, :level, :description,
69+
address_attributes: [:id, :flat, :street, :postal_code, :city, :latitude, :longitude, :directions],
70+
contacts_attributes: [:id, :name, :surname, :email, :mailing_list_consent, :_destroy]
71+
)
7272
end
7373

7474
def set_sponsor

app/controllers/admin/workshops_controller.rb

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -117,10 +117,13 @@ def changes
117117
private
118118

119119
def workshop_params
120-
params.require(:workshop).permit(:local_date, :local_time, :local_end_time, :chapter_id,
121-
:invitable, :seats, :virtual, :slack_channel, :slack_channel_link,
122-
:rsvp_open_local_date, :rsvp_open_local_time, :description,
123-
:coach_spaces, :student_spaces, sponsor_ids: [])
120+
params.expect(workshop: [
121+
:local_date, :local_time, :local_end_time, :chapter_id,
122+
:invitable, :seats, :virtual, :slack_channel, :slack_channel_link,
123+
:rsvp_open_local_date, :rsvp_open_local_time, :description,
124+
:coach_spaces, :student_spaces,
125+
{ sponsor_ids: [] }
126+
])
124127
end
125128

126129
def chapter_id
@@ -157,7 +160,7 @@ def set_organisers(organiser_ids)
157160
end
158161

159162
def host_id
160-
params.require(:workshop).permit(:host)[:host]
163+
params.expect(workshop: [:host])[:host]
161164
end
162165

163166
def organiser_ids

0 commit comments

Comments
 (0)