Skip to content

Unmarshal downstream results into a struct #4

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

Merged
merged 3 commits into from
Apr 7, 2017
Merged

Unmarshal downstream results into a struct #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fbafb9a
Use structured responses for easier parsing
themartorana Feb 22, 2017
baf66ca
Add in comments for field values for Result struct, taken from FCM do…
themartorana Feb 22, 2017
cdae2c1
Merge branch 'master' into downstream_result
themartorana Mar 22, 2017
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
8 changes: 3 additions & 5 deletions fcm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,9 @@ func (f *FCM) Send(message Message) (Response, error) {
// Failed method indicates if the server couldn't process
// the request in time.
func (f *FCM) Failed(response *Response) error {
for _, val := range response.Results {
for k, v := range val {
if k == ErrorKey && retryableErrors[v] {
return fmt.Errorf("Failed %s", k)
}
for _, response := range response.Results {
if retryableErrors[response.Error] {
return fmt.Errorf("Failed %s", response.Error)
}
}

Expand Down
19 changes: 18 additions & 1 deletion models.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,23 @@ type (
Condition string `json:"condition,omitempty"`
}

// Downstream result from FCM, sent in the "results" field of the Response packet
Result struct {
// String specifying a unique ID for each successfully processed message.
MessageID string `json:"message_id"`

// Optional string specifying the canonical registration token for the
// client app that the message was processed and sent to. Sender should
// use this value as the registration token for future requests.
// Otherwise, the messages might be rejected.
RegistrationID string `json:"registration_id"`

// String specifying the error that occurred when processing the message
// for the recipient. The possible values can be found in table 9 here:
// https://firebase.google.com/docs/cloud-messaging/http-server-ref#table9
Error string `json:"error"`
}

// Response represents fcm response message - (tokens and topics)
Response struct {
Ok bool
Expand All @@ -118,7 +135,7 @@ type (
// message_id: String specifying a unique ID for each successfully processed message.
// registration_id: Optional string specifying the canonical registration token for the client app that the message was processed and sent to. Sender should use this value as the registration token for future requests. Otherwise, the messages might be rejected.
// error: String specifying the error that occurred when processing the message for the recipient. The possible values can be found in table 9.
Results []map[string]string `json:"results,omitempty"`
Results []Result `json:"results,omitempty"`

// The topic message ID when FCM has successfully received the request and will attempt to deliver to all subscribed devices.
MsgID int `json:"message_id,omitempty"`
Expand Down