Messaging service code review update

Author: Yury Rashetska

http.go

@@ -150,9 +150,8 @@ type Client struct {
 	// NewInsightsClient initializes these services
 	VoiceInsights func(sid string) *VoiceInsightsService
 
-	MessagingService *ServiceResource
-
-	ServiceResourceService *ServiceResourceService
+	// NewServiceResourceClient initializes these services
+	ServiceResources *ServiceResourceService
 }
 
 const defaultTimeout = 30*time.Second + 500*time.Millisecond
@@ -359,16 +358,17 @@ func NewVideoClient(accountSid string, authToken string, httpClient *http.Client
 	return c
 }
 
-// NewServiceResource returns a new Client to use Service Resource API
-func NewServiceResource(accountSid string, authToken string, httpClient *http.Client) *Client {
+// NewServiceResourceClient returns a new Client to use the Service Resource API
+//
+//https://www.twilio.com/docs/sms/services/api#messaging-services-resource
+func NewServiceResourceClient(accountSid string, authToken string, httpClient *http.Client) *Client {
 	c := newNewClient(accountSid, authToken, ServiceResourceBaseUrl, httpClient)
 	c.APIVersion = ServiceResourceVersion
-	c.MessagingService = &ServiceResource{client: c}
-	c.ServiceResourceService = &ServiceResourceService{
+	c.ServiceResources = &ServiceResourceService{
 		MessagingService: &MessagingService{c},
-		PhoneNumber:      &PhoneNumberService{c},
-		AlphaSender:      &AlphaSenderService{c},
-		ShortCode:        &ShortCodeService{c},
+		PhoneNumbers:     &PhoneNumberService{c},
+		AlphaSenders:     &AlphaSenderService{c},
+		ShortCodes:       &ShortCodeService{c},
 	}
 	return c
 }
@@ -401,7 +401,7 @@ func NewClient(accountSid string, authToken string, httpClient *http.Client) *Cl
 	c.Video = NewVideoClient(accountSid, authToken, httpClient)
 	c.TaskRouter = NewTaskRouterClient(accountSid, authToken, httpClient)
 	c.Insights = NewInsightsClient(accountSid, authToken, httpClient)
-	c.Resource = NewServiceResource(accountSid, authToken, httpClient)
+	c.Resource = NewServiceResourceClient(accountSid, authToken, httpClient)
 
 	c.Accounts = &AccountService{client: c}
 	c.Applications = &ApplicationService{client: c}

service_resource.go

@@ -15,9 +15,9 @@ const (
 
 type ServiceResourceService struct {
 	*MessagingService
-	PhoneNumber *PhoneNumberService
-	ShortCode   *ShortCodeService
-	AlphaSender *AlphaSenderService
+	PhoneNumbers *PhoneNumberService
+	ShortCodes   *ShortCodeService
+	AlphaSenders *AlphaSenderService
 }
 
 type MessagingService struct {
@@ -81,10 +81,10 @@ func (s *MessagingService) Create(ctx context.Context, data url.Values) (*Messag
 	return mr, err
 }
 
-// Fetch a service resource
+// Get a service resource
 //
 // https://www.twilio.com/docs/sms/services/api#fetch-a-service-resource
-func (s *MessagingService) Fetch(ctx context.Context, sid string) (*MessagingResource, error) {
+func (s *MessagingService) Get(ctx context.Context, sid string) (*MessagingResource, error) {
 	mr := new(MessagingResource)
 	err := s.client.GetResource(ctx, messagingServicePathPart, sid, mr)
 	return mr, err
@@ -163,10 +163,10 @@ func (s *PhoneNumberService) Create(ctx context.Context, serviceSID string, data
 	return pnr, err
 }
 
-// Fetch a phone number resource for messaging service
+// Get a phone number resource for messaging service
 //
 // https://www.twilio.com/docs/sms/services/api/phonenumber-resource#fetch-a-phonenumber-resource
-func (s *PhoneNumberService) Fetch(ctx context.Context, serviceSID, sid string) (*PhoneNumberResource, error) {
+func (s *PhoneNumberService) Get(ctx context.Context, serviceSID, sid string) (*PhoneNumberResource, error) {
 	pnr := new(PhoneNumberResource)
 	pathPart := fmt.Sprintf(phoneNumberServicePathTemplate, serviceSID)
 	err := s.client.GetResource(ctx, pathPart, sid, pnr)
@@ -228,7 +228,7 @@ type AlphaSenderResourcePage struct {
 	AlphaSenders []*AlphaSenderResource `json:"alpha_senders"`
 }
 
-// Create a alpha sender resource for messaging service
+// Create an alpha sender resource for messaging service
 //
 // https://www.twilio.com/docs/sms/services/api/alphasender-resource#create-an-alphasender-resource
 func (s *AlphaSenderService) Create(ctx context.Context, serviceSID string, data url.Values) (*AlphaSenderResource, error) {
@@ -238,10 +238,10 @@ func (s *AlphaSenderService) Create(ctx context.Context, serviceSID string, data
 	return asr, err
 }
 
-// Fetch a alpha sender resource for messaging service
+// Get a alpha sender resource for messaging service
 //
 // https://www.twilio.com/docs/sms/services/api/alphasender-resource#fetch-an-alphasender-resource
-func (s *AlphaSenderService) Fetch(ctx context.Context, serviceSID, sid string) (*AlphaSenderResource, error) {
+func (s *AlphaSenderService) Get(ctx context.Context, serviceSID, sid string) (*AlphaSenderResource, error) {
 	asr := new(AlphaSenderResource)
 	pathPart := fmt.Sprintf(alphaSenderServicePathTemplate, serviceSID)
 	err := s.client.GetResource(ctx, pathPart, sid, asr)
@@ -314,10 +314,10 @@ func (s *ShortCodeService) Create(ctx context.Context, serviceSID string, data u
 	return scr, err
 }
 
-// Fetch a short code resource for messaging service
+// Get a short code resource for messaging service
 //
 // https://www.twilio.com/docs/sms/services/api/shortcode-resource#fetch-a-shortcode-resource
-func (s *ShortCodeService) Fetch(ctx context.Context, serviceSID, sid string) (*ShortCodeResource, error) {
+func (s *ShortCodeService) Get(ctx context.Context, serviceSID, sid string) (*ShortCodeResource, error) {
 	scr := new(ShortCodeResource)
 	pathPart := fmt.Sprintf(shortCodeServicePathTemplate, serviceSID)
 	err := s.client.GetResource(ctx, pathPart, sid, scr)

service_resource_test.go

@@ -9,7 +9,7 @@ func TestFetchMessagingResource(t *testing.T) {
 	t.Parallel()
 	client, server := getServer(messagingResourceResponse)
 	defer server.Close()
-	msr, err := client.Resource.ServiceResourceService.Fetch(context.Background(), "MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
+	msr, err := client.Resource.ServiceResources.Get(context.Background(), "MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -22,7 +22,7 @@ func TestFetchPhoneNumberResource(t *testing.T) {
 	t.Parallel()
 	client, server := getServer(phoneNumberResourceResponse)
 	defer server.Close()
-	pnr, err := client.Resource.ServiceResourceService.PhoneNumber.Fetch(context.Background(), "MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
+	pnr, err := client.Resource.ServiceResources.PhoneNumbers.Get(context.Background(), "MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "PNXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -38,7 +38,7 @@ func TestFetchAlphaSenderResource(t *testing.T) {
 	t.Parallel()
 	client, server := getServer(alphaSenderResourceResponse)
 	defer server.Close()
-	asr, err := client.Resource.ServiceResourceService.AlphaSender.Fetch(context.Background(), "MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "AIXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
+	asr, err := client.Resource.ServiceResources.AlphaSenders.Get(context.Background(), "MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "AIXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -54,7 +54,7 @@ func TestFetchShortCodeResource(t *testing.T) {
 	t.Parallel()
 	client, server := getServer(shortCodeResourceResponse)
 	defer server.Close()
-	asr, err := client.Resource.ServiceResourceService.ShortCode.Fetch(context.Background(), "MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
+	asr, err := client.Resource.ServiceResources.ShortCodes.Get(context.Background(), "MGXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "SCXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
 	if err != nil {
 		t.Fatal(err)
 	}