Skip to content
This repository was archived by the owner on Jun 29, 2024. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions lib/calendly/models/event.rb
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,14 @@ def invitees!(options: nil)

def after_set_attributes(attrs)
super attrs
if event_memberships.is_a? Array # rubocop:disable Style/GuardClause
@event_memberships = event_memberships.map do |params|
uri = params[:user]
User.new({uri: uri}, @client)
end

return unless event_memberships.is_a? Array

@event_memberships = event_memberships.map do |params|
uri = params[:user]
email = params[:user_email]

User.new({uri: uri, email: email}, @client)
end
end
end
Expand Down
8 changes: 8 additions & 0 deletions test/assert_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ def assert_event001(ev)
assert user.is_a? Calendly::User
assert_equal 'U001', user.id
assert_equal 'https://api.calendly.com/users/U001', user.uri
assert_equal 'user_U001@email.com', user.email

assert_equal 1, ev.event_guests.length
guest = ev.event_guests[0]
Expand Down Expand Up @@ -398,6 +399,7 @@ def assert_event002(ev)
assert user.is_a? Calendly::User
assert_equal 'U001', user.id
assert_equal 'https://api.calendly.com/users/U001', user.uri
assert_equal 'user_U001@email.com', user.email

assert_equal 2, ev.event_guests.length
guest = ev.event_guests[0]
Expand Down Expand Up @@ -440,10 +442,12 @@ def assert_event011(ev)
assert user.is_a? Calendly::User
assert_equal 'U001', user.id
assert_equal 'https://api.calendly.com/users/U001', user.uri
assert_equal 'user_U001@email.com', user.email
user = ev.event_memberships[1]
assert user.is_a? Calendly::User
assert_equal 'U101', user.id
assert_equal 'https://api.calendly.com/users/U101', user.uri
assert_equal 'user_U101@email.com', user.email

assert_equal [], ev.event_guests
end
Expand Down Expand Up @@ -473,10 +477,12 @@ def assert_event012(ev)
assert user.is_a? Calendly::User
assert_equal 'U001', user.id
assert_equal 'https://api.calendly.com/users/U001', user.uri
assert_equal 'user_U001@email.com', user.email
user = ev.event_memberships[1]
assert user.is_a? Calendly::User
assert_equal 'U102', user.id
assert_equal 'https://api.calendly.com/users/U102', user.uri
assert_equal 'user_U102@email.com', user.email

assert_equal [], ev.event_guests
end
Expand Down Expand Up @@ -506,10 +512,12 @@ def assert_event013(ev)
assert user.is_a? Calendly::User
assert_equal 'U001', user.id
assert_equal 'https://api.calendly.com/users/U001', user.uri
assert_equal 'user_U001@email.com', user.email
user = ev.event_memberships[1]
assert user.is_a? Calendly::User
assert_equal 'U103', user.id
assert_equal 'https://api.calendly.com/users/U103', user.uri
assert_equal 'user_U103@email.com', user.email

assert_equal [], ev.event_guests
end
Expand Down
3 changes: 2 additions & 1 deletion test/testdata/scheduled_event_001.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
],
"event_memberships": [
{
"user": "https://api.calendly.com/users/U001"
"user": "https://api.calendly.com/users/U001",
"user_email": "user_U001@email.com"
}
],
"event_type": "https://api.calendly.com/event_types/ET001",
Expand Down
6 changes: 4 additions & 2 deletions test/testdata/scheduled_events_001.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
],
"event_memberships": [
{
"user": "https://api.calendly.com/users/U001"
"user": "https://api.calendly.com/users/U001",
"user_email": "user_U001@email.com"
}
],
"event_type": "https://api.calendly.com/event_types/ET001",
Expand Down Expand Up @@ -50,7 +51,8 @@
],
"event_memberships": [
{
"user": "https://api.calendly.com/users/U001"
"user": "https://api.calendly.com/users/U001",
"user_email": "user_U001@email.com"
}
],
"event_type": "https://api.calendly.com/event_types/ET002",
Expand Down
12 changes: 8 additions & 4 deletions test/testdata/scheduled_events_002_page1.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
"event_guests": [],
"event_memberships": [
{
"user": "https://api.calendly.com/users/U001"
"user": "https://api.calendly.com/users/U001",
"user_email": "user_U001@email.com"
},
{
"user": "https://api.calendly.com/users/U103"
"user": "https://api.calendly.com/users/U103",
"user_email": "user_U103@email.com"
}
],
"event_type": "https://api.calendly.com/event_types/ET003",
Expand All @@ -35,10 +37,12 @@
"event_guests": [],
"event_memberships": [
{
"user": "https://api.calendly.com/users/U001"
"user": "https://api.calendly.com/users/U001",
"user_email": "user_U001@email.com"
},
{
"user": "https://api.calendly.com/users/U102"
"user": "https://api.calendly.com/users/U102",
"user_email": "user_U102@email.com"
}
],
"event_type": "https://api.calendly.com/event_types/ET002",
Expand Down
12 changes: 8 additions & 4 deletions test/testdata/scheduled_events_002_page1_user.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
"event_guests": [],
"event_memberships": [
{
"user": "https://api.calendly.com/users/U001"
"user": "https://api.calendly.com/users/U001",
"user_email": "user_U001@email.com"
},
{
"user": "https://api.calendly.com/users/U103"
"user": "https://api.calendly.com/users/U103",
"user_email": "user_U103@email.com"
}
],
"event_type": "https://api.calendly.com/event_types/ET003",
Expand All @@ -35,10 +37,12 @@
"event_guests": [],
"event_memberships": [
{
"user": "https://api.calendly.com/users/U001"
"user": "https://api.calendly.com/users/U001",
"user_email": "user_U001@email.com"
},
{
"user": "https://api.calendly.com/users/U102"
"user": "https://api.calendly.com/users/U102",
"user_email": "user_U102@email.com"
}
],
"event_type": "https://api.calendly.com/event_types/ET002",
Expand Down
6 changes: 4 additions & 2 deletions test/testdata/scheduled_events_002_page2.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@
"event_guests": [],
"event_memberships": [
{
"user": "https://api.calendly.com/users/U001"
"user": "https://api.calendly.com/users/U001",
"user_email": "user_U001@email.com"
},
{
"user": "https://api.calendly.com/users/U101"
"user": "https://api.calendly.com/users/U101",
"user_email": "user_U101@email.com"
}
],
"event_type": "https://api.calendly.com/event_types/ET001",
Expand Down