Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add cookie_suffix and additional_routes fields to Waiting Room object #1311

Merged
merged 3 commits into from
Jun 16, 2023
Merged

Add cookie_suffix and additional_routes fields to Waiting Room object #1311

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a394db
Add cookie_suffix and additional_routes to WR object
yj7o5 Apr 24, 2023
9b624a0
add changelog message
Jun 15, 2023
74e0b34
update changelog
jacobbednarz Jun 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/1311.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
waiting_room: add support for two new fields, namely, `additional_routes` and `cookie_suffix`
jacobbednarz marked this conversation as resolved.
Show resolved Hide resolved
```
46 changes: 27 additions & 19 deletions waiting_room.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,27 @@ var (

// WaitingRoom describes a WaitingRoom object.
type WaitingRoom struct {
CreatedOn time.Time `json:"created_on,omitempty"`
ModifiedOn time.Time `json:"modified_on,omitempty"`
Path string `json:"path"`
Name string `json:"name"`
Description string `json:"description,omitempty"`
QueueingMethod string `json:"queueing_method,omitempty"`
CustomPageHTML string `json:"custom_page_html,omitempty"`
DefaultTemplateLanguage string `json:"default_template_language,omitempty"`
Host string `json:"host"`
ID string `json:"id,omitempty"`
NewUsersPerMinute int `json:"new_users_per_minute"`
TotalActiveUsers int `json:"total_active_users"`
SessionDuration int `json:"session_duration"`
QueueAll bool `json:"queue_all"`
DisableSessionRenewal bool `json:"disable_session_renewal"`
Suspended bool `json:"suspended"`
JsonResponseEnabled bool `json:"json_response_enabled"`
NextEventPrequeueStartTime *time.Time `json:"next_event_prequeue_start_time,omitempty"`
NextEventStartTime *time.Time `json:"next_event_start_time,omitempty"`
CreatedOn time.Time `json:"created_on,omitempty"`
ModifiedOn time.Time `json:"modified_on,omitempty"`
Path string `json:"path"`
Name string `json:"name"`
Description string `json:"description,omitempty"`
QueueingMethod string `json:"queueing_method,omitempty"`
CustomPageHTML string `json:"custom_page_html,omitempty"`
DefaultTemplateLanguage string `json:"default_template_language,omitempty"`
Host string `json:"host"`
ID string `json:"id,omitempty"`
NewUsersPerMinute int `json:"new_users_per_minute"`
TotalActiveUsers int `json:"total_active_users"`
SessionDuration int `json:"session_duration"`
QueueAll bool `json:"queue_all"`
DisableSessionRenewal bool `json:"disable_session_renewal"`
Suspended bool `json:"suspended"`
JsonResponseEnabled bool `json:"json_response_enabled"`
NextEventPrequeueStartTime *time.Time `json:"next_event_prequeue_start_time,omitempty"`
NextEventStartTime *time.Time `json:"next_event_start_time,omitempty"`
CookieSuffix string `json:"cookie_suffix"`
AdditionalRoutes []*WaitingRoomRoute `json:"additional_routes,omitempty"`
}

// WaitingRoomStatus describes the status of a waiting room.
Expand Down Expand Up @@ -92,6 +94,12 @@ type WaitingRoomPagePreviewCustomHTML struct {
CustomHTML string `json:"custom_html"`
}

// WaitingRoomRoute describes a WaitingRoomRoute object.
type WaitingRoomRoute struct {
Host string `json:"host"`
Path string `json:"path"`
}

// WaitingRoomDetailResponse is the API response, containing a single WaitingRoom.
type WaitingRoomDetailResponse struct {
Response
Expand Down
6 changes: 5 additions & 1 deletion waiting_room_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@ var waitingRoomJSON = fmt.Sprintf(`
"custom_page_html": "{{#waitTimeKnown}} {{waitTime}} mins {{/waitTimeKnown}} {{^waitTimeKnown}} Queue all enabled {{/waitTimeKnown}}",
"default_template_language": "en-US",
"next_event_prequeue_start_time": null,
"next_event_start_time": "%s"
"next_event_start_time": "%s",
"cookie_suffix": "example_shop",
"additional_routes": [{"host": "shop2.example.com", "path": "/shop/checkout"}]
}
`, waitingRoomID, testTimestampWaitingRoom.Format(time.RFC3339Nano), testTimestampWaitingRoom.Format(time.RFC3339Nano),
testTimestampWaitingRoomEventStart.Format(time.RFC3339Nano))
Expand Down Expand Up @@ -123,6 +125,8 @@ var waitingRoom = WaitingRoom{
DefaultTemplateLanguage: "en-US",
NextEventStartTime: &testTimestampWaitingRoomEventStart,
NextEventPrequeueStartTime: nil,
CookieSuffix: "example_shop",
AdditionalRoutes: []*WaitingRoomRoute{{Host: "shop2.example.com", Path: "/shop/checkout"}},
}

var waitingRoomEvent = WaitingRoomEvent{
Expand Down