From 37103f2553a417e07c3416e18389e6fc26a31bc6 Mon Sep 17 00:00:00 2001 From: Jonas Kwiedor Date: Sun, 17 Oct 2021 15:36:29 +0200 Subject: [PATCH 1/2] Remove pointer --- config.go | 2 +- sms.go | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config.go b/config.go index 6ec952c..b595752 100644 --- a/config.go +++ b/config.go @@ -27,7 +27,7 @@ type Request struct { } // Send is to send a new request -func (r *Request) Send() (*http.Response, error) { +func (r Request) Send() (*http.Response, error) { // Set url url := resourceUrl + r.Path diff --git a/sms.go b/sms.go index 3d85965..daf3a0c 100644 --- a/sms.go +++ b/sms.go @@ -27,12 +27,12 @@ type SendSmsReturn struct { } // SendSms is to send a sms via the placetel api -func SendSms(body *SendSmsBody, token string) (*SendSmsReturn, error) { +func SendSms(body SendSmsBody, token string) (SendSmsReturn, error) { // Convert body convert, err := json.Marshal(body) if err != nil { - return nil, err + return SendSmsReturn{}, err } // Set config for new request @@ -41,7 +41,7 @@ func SendSms(body *SendSmsBody, token string) (*SendSmsReturn, error) { // Send new request response, err := r.Send() if err != nil { - return nil, err + return SendSmsReturn{}, err } // Close response body after function ends @@ -52,10 +52,10 @@ func SendSms(body *SendSmsBody, token string) (*SendSmsReturn, error) { err = json.NewDecoder(response.Body).Decode(&decode) if err != nil { - return nil, err + return SendSmsReturn{}, err } // Return data - return &decode, nil + return decode, nil } From 71d81bc938e0613c7fed4a1c7657d206ca5a1d72 Mon Sep 17 00:00:00 2001 From: Jonas Kwiedor Date: Sun, 17 Oct 2021 15:36:38 +0200 Subject: [PATCH 2/2] Fix pages bug --- contacts.go | 49 ++++++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 23 deletions(-) diff --git a/contacts.go b/contacts.go index 90754de..e881a90 100644 --- a/contacts.go +++ b/contacts.go @@ -14,6 +14,7 @@ package goplacetel import ( "encoding/json" "fmt" + "time" ) // ContactBody is to build a new contact @@ -43,7 +44,7 @@ type ContactBody struct { type ContactReturn struct { Id int `json:"id"` UserId int `json:"user_id"` - Speeddail interface{} `json:"speeddail"` + Speeddial interface{} `json:"speeddial"` FirstName string `json:"first_name"` LastName string `json:"last_name"` Email string `json:"email"` @@ -62,8 +63,8 @@ type ContactReturn struct { XingUrl string `json:"xing_url"` TwitterAccount string `json:"twitter_account"` Blocked bool `json:"blocked"` - UpdatedAt string `json:"updated_at"` - CreatedAt string `json:"created_at"` + UpdatedAt time.Time `json:"updated_at"` + CreatedAt time.Time `json:"created_at"` } // DeleteContactReturn is to decode the json data @@ -103,7 +104,7 @@ type DeleteContactReturn struct { } // Contacts is to get all contacts from the api -func Contacts(token string) (*[]ContactReturn, error) { +func Contacts(token string) ([]ContactReturn, error) { // To decode the json data var contacts []ContactReturn @@ -142,17 +143,19 @@ func Contacts(token string) (*[]ContactReturn, error) { // Check length & break the loop if len(decode) < 25 { break + } else { + page++ } } // Return data - return &contacts, nil + return contacts, nil } // Contact is to get a contact by id -func Contact(id string, token string) (*ContactReturn, error) { +func Contact(id string, token string) (ContactReturn, error) { // Set config for new request r := Request{"/contacts/" + id, "GET", token, nil} @@ -160,7 +163,7 @@ func Contact(id string, token string) (*ContactReturn, error) { // Send new request response, err := r.Send() if err != nil { - return nil, err + return ContactReturn{}, err } // Close response body after function ends @@ -171,21 +174,21 @@ func Contact(id string, token string) (*ContactReturn, error) { err = json.NewDecoder(response.Body).Decode(&decode) if err != nil { - return nil, err + return ContactReturn{}, err } // Return data - return &decode, nil + return decode, nil } // AddContact is to add a new contact -func AddContact(body *ContactBody, token string) (*ContactReturn, error) { +func AddContact(body *ContactBody, token string) (ContactReturn, error) { // Convert data convert, err := json.Marshal(body) if err != nil { - return nil, err + return ContactReturn{}, err } // Set config for new request @@ -194,7 +197,7 @@ func AddContact(body *ContactBody, token string) (*ContactReturn, error) { // Send new request response, err := r.Send() if err != nil { - return nil, err + return ContactReturn{}, err } // Close response body after function ends @@ -205,21 +208,21 @@ func AddContact(body *ContactBody, token string) (*ContactReturn, error) { err = json.NewDecoder(response.Body).Decode(&decode) if err != nil { - return nil, err + return ContactReturn{}, err } // Return data - return &decode, nil + return decode, nil } // UpdateContact is to add a new contact -func UpdateContact(body *ContactBody, token string) (*ContactReturn, error) { +func UpdateContact(body ContactBody, token string) (ContactReturn, error) { // Convert data convert, err := json.Marshal(body) if err != nil { - return nil, err + return ContactReturn{}, err } // Set config for new request @@ -228,7 +231,7 @@ func UpdateContact(body *ContactBody, token string) (*ContactReturn, error) { // Send new request response, err := r.Send() if err != nil { - return nil, err + return ContactReturn{}, err } // Close response body after function ends @@ -239,16 +242,16 @@ func UpdateContact(body *ContactBody, token string) (*ContactReturn, error) { err = json.NewDecoder(response.Body).Decode(&decode) if err != nil { - return nil, err + return ContactReturn{}, err } // Return data - return &decode, nil + return decode, nil } // DeleteContact is to add a new contact -func DeleteContact(id string, token string) (*DeleteContactReturn, error) { +func DeleteContact(id string, token string) (DeleteContactReturn, error) { // Set config for new request r := Request{"/contacts/" + id, "DELETE", token, nil} @@ -256,7 +259,7 @@ func DeleteContact(id string, token string) (*DeleteContactReturn, error) { // Send new request response, err := r.Send() if err != nil { - return nil, err + return DeleteContactReturn{}, err } // Close response body after function ends @@ -267,10 +270,10 @@ func DeleteContact(id string, token string) (*DeleteContactReturn, error) { err = json.NewDecoder(response.Body).Decode(&decode) if err != nil { - return nil, err + return DeleteContactReturn{}, err } // Return data - return &decode, nil + return decode, nil }