Skip to content

Commit d985123

Browse files
authored
Merge pull request #4274 from Growstuff/CloCkWeRX-patch-3
API > Render activities links under member
1 parent f82eabe commit d985123

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

app/resources/api/v1/member_resource.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ class MemberResource < BaseResource
99
has_many :plantings, foreign_key: 'owner_id'
1010
has_many :harvests, foreign_key: 'owner_id'
1111
has_many :seeds, foreign_key: 'owner_id'
12+
has_many :activities, foreign_key: 'owner_id'
1213

1314
has_many :photos
1415

spec/requests/api/v1/members_request_spec.rb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"harvests" => harvests_as_json_api,
1818
"photos" => photos_as_json_api,
1919
"plantings" => plantings_as_json_api,
20-
"seeds" => seeds_as_json_api
20+
"seeds" => seeds_as_json_api,
21+
"activities" => activities_as_json_api
2122
} }
2223
end
2324

@@ -41,6 +42,12 @@
4142
"related" => "#{resource_url}/seeds" } }
4243
end
4344

45+
let(:activities_as_json_api) do
46+
{ "links" =>
47+
{ "self" => "#{resource_url}/relationships/activities",
48+
"related" => "#{resource_url}/activities" } }
49+
end
50+
4451
let(:plantings_as_json_api) do
4552
{ "links" =>
4653
{ "self" =>
@@ -74,6 +81,7 @@
7481
it { expect(subject['data']['relationships']).to include("seeds" => seeds_as_json_api) }
7582
it { expect(subject['data']['relationships']).to include("harvests" => harvests_as_json_api) }
7683
it { expect(subject['data']['relationships']).to include("photos" => photos_as_json_api) }
84+
it { expect(subject['data']['relationships']).to include("activities" => activities_as_json_api) }
7785
it { expect(subject['data']).to eq(member_encoded_as_json_api) }
7886
end
7987

0 commit comments

Comments
 (0)