Skip to content

Commit b1ce00d

Browse files
authored
Revert "Revert "Fixes the HealthInsurence#index to return true and false cust…" (#240)
This reverts commit cb4b157.
1 parent cb4b157 commit b1ce00d

File tree

3 files changed

+30
-3
lines changed

3 files changed

+30
-3
lines changed

app/operations/health_insurances/list.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def apply_custom_filter(query)
2323
if %w[true false].include?(params[:custom])
2424
query.by_custom(custom: params[:custom], user: user)
2525
else
26-
query.where(custom: false)
26+
query.where(user: user)
2727
end
2828
end
2929
end

spec/operations/health_insurances/list_spec.rb

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,32 @@
2626
)
2727
end
2828

29+
context "when filtering by user" do
30+
it "returns only health insurances for the specified user" do
31+
user1 = create(:user)
32+
user2 = create(:user)
33+
health_insurance_user1 = create(:health_insurance, custom: true, user: user1)
34+
create(:health_insurance, custom: true, user: user2)
35+
36+
result_user1 = described_class.call(user: user1)
37+
expect(result_user1.health_insurances).to all(have_attributes(user: user1))
38+
expect(result_user1.health_insurances[0].id).to eq(health_insurance_user1.id)
39+
40+
result_user2 = described_class.call(user: user2)
41+
expect(result_user2.health_insurances).to all(have_attributes(user: user2))
42+
end
43+
44+
it "returns no health insurances for user without any" do
45+
user1 = create(:user)
46+
create(:health_insurance, custom: true, user: user1)
47+
user2 = create(:user)
48+
49+
result = described_class.call(user: user2)
50+
51+
expect(result.health_insurances).to be_empty
52+
end
53+
end
54+
2955
context "when custom is true" do
3056
it "returns only the custom health_insurances for the given user" do
3157
user = create(:user)

spec/requests/api/v1/health_insurances_request_spec.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818

1919
before do
2020
headers = auth_token_for(create(:user))
21-
get "/api/v1/health_insurances", headers: headers
21+
params = { custom: false }
22+
get "/api/v1/health_insurances", headers: headers, params: params
2223
end
2324

2425
it "returns ok" do
@@ -62,7 +63,7 @@
6263
before do
6364
create_list(:health_insurance, 8)
6465
headers = auth_token_for(create(:user))
65-
get "/api/v1/health_insurances", params: { page: 2, per_page: 5 }, headers: headers
66+
get "/api/v1/health_insurances", params: { page: 2, per_page: 5, custom: false }, headers: headers
6667
end
6768

6869
it "returns only 3 health_insurances" do

0 commit comments

Comments
 (0)