Skip to content

Commit a622b15

Browse files
committed
Update family and individual request validation to match create [#4579]
1 parent 9c7bf05 commit a622b15

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

app/controllers/partners/family_requests_controller.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,13 @@ def create
3434
def validate
3535
family_requests_attributes = build_family_requests_attributes(params)
3636

37-
@partner_request = Partners::FamilyRequestCreateService.new(
37+
create_service = Partners::FamilyRequestCreateService.new(
3838
partner_user_id: current_user.id,
3939
family_requests_attributes: family_requests_attributes,
4040
request_type: "child"
4141
).initialize_only
42-
if @partner_request.valid?
42+
if create_service.errors.none?
43+
@partner_request = create_service.partner_request
4344
@total_items = @partner_request.total_items
4445
@quota_exceeded = current_partner.quota_exceeded?(@total_items)
4546
body = render_to_string(template: 'partners/requests/validate', formats: [:html], layout: false)

app/controllers/partners/individuals_requests_controller.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@ def create
3434
end
3535

3636
def validate
37-
@partner_request = Partners::FamilyRequestCreateService.new(
37+
create_service = Partners::FamilyRequestCreateService.new(
3838
partner_user_id: current_user.id,
3939
comments: individuals_request_params[:comments],
4040
family_requests_attributes: individuals_request_params[:items_attributes]&.values,
4141
request_type: "individual"
4242
).initialize_only
43-
if @partner_request.valid?
43+
if create_service.errors.none?
44+
@partner_request = create_service.partner_request
4445
@total_items = @partner_request.total_items
4546
@quota_exceeded = current_partner.quota_exceeded?(@total_items)
4647
body = render_to_string(template: 'partners/requests/validate', formats: [:html], layout: false)

0 commit comments

Comments
 (0)