Skip to content

Commit

Permalink
#1. Remove all the unnecessary parameters for api call.
Browse files Browse the repository at this point in the history
#2. Change date from static to dynamic format in test cases.
#3. Update Readme.
  • Loading branch information
zhanganderson committed Mar 27, 2024
1 parent e824f39 commit 6bad202
Show file tree
Hide file tree
Showing 14 changed files with 559 additions and 1,061 deletions.
927 changes: 146 additions & 781 deletions README.md

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions api_authentication.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ func (r ApiAuthTokenRequest) Scope(scope string) ApiAuthTokenRequest {
}

func (r ApiAuthTokenRequest) Execute() (*OAuth, *http.Response, error) {
r.grantType = new(string)
*r.grantType = setRequestParams().GrantType
r.scope = new(string)
*r.scope = setRequestParams().Scope

return r.ApiService.AuthTokenExecute(r)
}

Expand All @@ -71,6 +76,10 @@ func (a *AuthenticationAPIService) AuthToken(ctx context.Context) ApiAuthTokenRe
}
}

func (r ApiAuthTokenRequest) AuthToken() (*OAuth, *http.Response, error) {
return r.Execute()
}

// Execute executes the request
//
// @return OAuth
Expand Down
15 changes: 6 additions & 9 deletions api_authentication_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,12 @@ func Test_TelstraMessaging_AuthenticationAPIService(t *testing.T) {
t.Skip("skip test") // remove to run test
clientId := "YOUR CLIENT ID"
clientSecret := "YOUR CLIENT SECRET"
grantType := "client_credentials"
scope := "free-trial-numbers:read free-trial-numbers:write messages:read messages:write virtual-numbers:read virtual-numbers:write reports:read reports:write"

oauthResult, resp, err := apiClient.AuthenticationAPI.AuthToken(context.Background()).
ClientId(clientId).
ClientSecret(clientSecret).
GrantType(grantType).
Scope(scope).
Execute()

authApi := apiClient.AuthenticationAPI.AuthToken(context.Background())
authApi.clientId = &clientId
authApi.clientSecret = &clientSecret

oauthResult, resp, err := authApi.AuthToken()

if err != nil {
fmt.Println("Error:", err)
Expand Down
30 changes: 30 additions & 0 deletions api_free_trial_numbers.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,28 @@ func (r ApiCreateTrialNumbersRequest) CreateTrialNumbersRequest(createTrialNumbe
return r
}

func (r ApiCreateTrialNumbersRequest) CreateTrialNumbers(createTrialNumbersRequest CreateTrialNumbersRequest) (*FreeTrialNumbers, *http.Response, error) {
r.createTrialNumbersRequest = &createTrialNumbersRequest
return r.Execute()
}

func (r ApiCreateTrialNumbersRequest) TelstraApiVersion(telstraApiVersion string) ApiCreateTrialNumbersRequest {
r.telstraApiVersion = &telstraApiVersion
return r
}

func (r ApiCreateTrialNumbersRequest) Execute() (*FreeTrialNumbers, *http.Response, error) {
r.contentType = new(string)
*r.contentType = setRequestParams().ContentType
r.accept = new(string)
*r.accept = setRequestParams().Accept
r.acceptCharset = new(string)
*r.acceptCharset = setRequestParams().AcceptCharset
r.contentLanguage = new(string)
*r.contentLanguage = setRequestParams().ContentLanguage
r.telstraApiVersion = new(string)
*r.telstraApiVersion = setRequestParams().TelstraApiVersion

return r.ApiService.CreateTrialNumbersExecute(r)
}

Expand Down Expand Up @@ -343,6 +359,16 @@ func (r ApiGetTrialNumbersRequest) TelstraApiVersion(telstraApiVersion string) A
}

func (r ApiGetTrialNumbersRequest) Execute() (*FreeTrialNumbers, *http.Response, error) {
r.contentType = new(string)
*r.contentType = setRequestParams().ContentType
r.accept = new(string)
*r.accept = setRequestParams().Accept
r.acceptCharset = new(string)
*r.acceptCharset = setRequestParams().AcceptCharset
r.contentLanguage = new(string)
*r.contentLanguage = setRequestParams().ContentLanguage
r.telstraApiVersion = new(string)
*r.telstraApiVersion = setRequestParams().TelstraApiVersion
return r.ApiService.GetTrialNumbersExecute(r)
}

Expand All @@ -363,6 +389,10 @@ func (a *FreeTrialNumbersAPIService) GetTrialNumbers(ctx context.Context) ApiGet
}
}

func (r ApiGetTrialNumbersRequest) GetTrialNumbers() (*FreeTrialNumbers, *http.Response, error) {
return r.Execute()
}

// Execute executes the request
//
// @return FreeTrialNumbers
Expand Down
49 changes: 9 additions & 40 deletions api_free_trial_numbers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,47 +22,20 @@ func Test_TelstraMessaging_FreeTrialNumbersAPIService(t *testing.T) {
configuration := NewConfiguration()
apiClient := NewAPIClient(configuration)

accept := "application/json"
acceptCharset := "utf-8"
contentType := "application/json"
contentLanguage := "en-au"
telstraApiVersion := "3.1.0"
grantType := "client_credentials"
scope := "free-trial-numbers:read free-trial-numbers:write messages:read messages:write virtual-numbers:read virtual-numbers:write reports:read reports:write"

clientId := "YOUR CLIENT ID"
clientSecret := "YOUR CLIENT SECRET"

oauthResult, _, err := apiClient.AuthenticationAPI.AuthToken(context.Background()).
ClientId(clientId).
ClientSecret(clientSecret).
GrantType(grantType).
Scope(scope).
Execute()

if err != nil {
fmt.Println("Error:", err)
return
}

accessToken := *oauthResult.AccessToken
authorization := "Bearer " + accessToken
authorization, _ := getAuthorization(apiClient, clientId, clientSecret)

t.Run("Test FreeTrialNumbersAPIService CreateTrialNumbers", func(t *testing.T) {

trialNumbers := []string{"0400000001", "0400000002"}
createTrialNumbersRequestFreeTrialNumbers := ArrayOfStringAsCreateTrialNumbersRequestFreeTrialNumbers(&trialNumbers)
createTrialNumbersRequest := NewCreateTrialNumbersRequest(createTrialNumbersRequestFreeTrialNumbers)

resp, httpRes, err := apiClient.FreeTrialNumbersAPI.CreateTrialNumbers(context.Background()).
ContentType(contentType).
Authorization(authorization).
Accept(accept).
AcceptCharset(acceptCharset).
ContentLanguage(contentLanguage).
TelstraApiVersion(telstraApiVersion).
CreateTrialNumbersRequest(*createTrialNumbersRequest).
Execute()
trialNumbersApi := apiClient.FreeTrialNumbersAPI.CreateTrialNumbers(context.Background())
trialNumbersApi.authorization = &authorization

resp, httpRes, err := trialNumbersApi.CreateTrialNumbers(*createTrialNumbersRequest)

if err != nil {
fmt.Println("Error:", err)
Expand All @@ -81,14 +54,10 @@ func Test_TelstraMessaging_FreeTrialNumbersAPIService(t *testing.T) {
t.Run("Test FreeTrialNumbersAPIService GetTrialNumbers", func(t *testing.T) {

//t.Skip("skip test")
resp, httpRes, err := apiClient.FreeTrialNumbersAPI.GetTrialNumbers(context.Background()).
Accept(accept).
AcceptCharset(acceptCharset).
Authorization(authorization).
ContentLanguage(contentLanguage).
ContentType(contentType).
TelstraApiVersion(telstraApiVersion).
Execute()
trialNumbersApi := apiClient.FreeTrialNumbersAPI.GetTrialNumbers(context.Background())
trialNumbersApi.authorization = &authorization

resp, httpRes, err := trialNumbersApi.GetTrialNumbers()

if err != nil {
fmt.Println("Error:", err)
Expand Down
6 changes: 6 additions & 0 deletions api_health_check.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ func (r ApiHealthCheckRequest) TelstraApiVersion(telstraApiVersion string) ApiHe
}

func (r ApiHealthCheckRequest) Execute() (*HealthCheck200Response, *http.Response, error) {
r.telstraApiVersion = new(string)
*r.telstraApiVersion = setRequestParams().TelstraApiVersion
return r.ApiService.HealthCheckExecute(r)
}

Expand All @@ -55,6 +57,10 @@ func (a *HealthCheckAPIService) HealthCheck(ctx context.Context) ApiHealthCheckR
}
}

func (r ApiHealthCheckRequest) HealthCheck() (*HealthCheck200Response, *http.Response, error) {
return r.Execute()
}

// Execute executes the request
//
// @return HealthCheck200Response
Expand Down
28 changes: 5 additions & 23 deletions api_health_check_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,39 +18,21 @@ import (
func Test_TelstraMessaging_HealthCheckAPIService(t *testing.T) {

t.Skip("skip test")

configuration := NewConfiguration()
apiClient := NewAPIClient(configuration)
telstraApiVersion := "3.1.0"
grantType := "client_credentials"
scope := "free-trial-numbers:read free-trial-numbers:write messages:read messages:write virtual-numbers:read virtual-numbers:write reports:read reports:write"

clientId := "YOUR CLIENT ID"
clientSecret := "YOUR CLIENT SECRET"

oauthResult, _, err := apiClient.AuthenticationAPI.AuthToken(context.Background()).
ClientId(clientId).
ClientSecret(clientSecret).
GrantType(grantType).
Scope(scope).
Execute()

if err != nil {
fmt.Println("Error:", err)
return
}

accessToken := *oauthResult.AccessToken
authorization := "Bearer " + accessToken
authorization, _ := getAuthorization(apiClient, clientId, clientSecret)

t.Run("Test HealthCheckAPIService HealthCheck", func(t *testing.T) {

//t.Skip("skip test") // remove to run test

resp, httpRes, err := apiClient.HealthCheckAPI.HealthCheck(context.Background()).
Authorization(authorization).
TelstraApiVersion(telstraApiVersion).
Execute()
healthCheckApi := apiClient.HealthCheckAPI.HealthCheck(context.Background())
healthCheckApi.authorization = &authorization

resp, httpRes, err := healthCheckApi.HealthCheck()

if err != nil {
fmt.Println("Error:", err)
Expand Down
Loading

0 comments on commit 6bad202

Please sign in to comment.