-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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.
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
#720 Initial commit for listing Plans and Plan Accounts #732
Changes from 5 commits
9901531
9157290
2fb4833
6ac3c7e
6c4b54e
bb51e74
f9251be
354464d
46617e6
c4466d1
f2b216a
ecac90f
24610dd
b8f7249
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,182 @@ | ||
// Copyright 2013 The go-github AUTHORS. All rights reserved. | ||
// | ||
// Use of this source code is governed by a BSD-style | ||
// license that can be found in the LICENSE file. | ||
|
||
package github | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
) | ||
|
||
// MarketplaceService handles communication with the marketplace related | ||
// methods of the GitHub API. | ||
// | ||
// GitHub API docs: https://developer.github.com/v3/apps/marketplace/ | ||
type MarketplaceService struct { | ||
client *Client | ||
// Stubbed controls whether endpoints that return stubbed data are used | ||
// instead of production endpoints. Stubbed data is fake data that's useful | ||
// for testing your GitHub Apps. Stubbed data is hard-coded and will not | ||
// change based on actual subscriptions. | ||
// | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: lines 23-24 are unnecessary due to line 16 above. Please remove them. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @gmlewis See https://github.com/google/go-github/pull/732/files#r148168072 for why I think it's still helpful to include them. It just so happens the URL matches the one for the service, I wish we could link to a more specific section, but I don't see one... |
||
// GitHub API docs: https://developer.github.com/v3/apps/marketplace/ | ||
Stubbed bool | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This // Stubbed controls whether endpoints that return stubbed data are used
// instead of production endpoints. Stubbed data is fake data that's useful
// for testing your GitHub Apps. Stubbed data is hard-coded and will not
// change based on actual subscriptions.
+//
+// GitHub API docs: https://developer.github.com/v3/apps/marketplace/
Stubbed bool This is also a way of us hinting that it's not our own invention specific to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @gmlewis Does that sound good to you? If so, I can apply it and merge. Edit: @lackerman has already pushed ecac90f. |
||
|
||
ListOptions | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yurp, pushed a fix. |
||
} | ||
|
||
// MarketplacePlan represents a GitHub Apps Marketplace Listing Plan. | ||
type MarketplacePlan struct { | ||
URL *string `json:"url,omitempty"` | ||
AccountsURL *string `json:"accounts_url,omitempty"` | ||
ID *int `json:"id,omitempty"` | ||
Name *string `json:"name,omitempty"` | ||
Description *string `json:"description,omitempty"` | ||
MonthlyPriceInCents *int `json:"monthly_price_in_cents,omitempty"` | ||
YearlyPriceInCents *int `json:"yearly_price_in_cents,omitempty"` | ||
PriceModel *string `json:"price_model,omitempty"` | ||
UnitName *string `json:"unit_name,omitempty"` | ||
Bullets *[]string `json:"bullets,omitempty"` | ||
} | ||
|
||
// MarketplacePurchase represents a GitHub Apps Marketplace Purchase. | ||
type MarketplacePurchase struct { | ||
BillingCycle *string `json:"billing_cycle,omitempty"` | ||
NextBillingDate *string `json:"next_billing_date,omitempty"` | ||
UnitCount *int `json:"unit_count,omitempty"` | ||
Plan *MarketplacePlan `json:"plan,omitempty"` | ||
MarketplacePlanAccount *MarketplacePlanAccount `json:"account,omitempty"` | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. s/MarketPlanAccount/Account/ |
||
} | ||
|
||
// MarketplacePlanAccount represents a GitHub Account (user or organization) on a specific plan. | ||
type MarketplacePlanAccount struct { | ||
URL *string `json:"url,omitempty"` | ||
AccountType *string `json:"type,omitempty"` | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Any reason to not call this |
||
ID *int `json:"id,omitempty"` | ||
Login *string `json:"login,omitempty"` | ||
Email *string `json:"email,omitempty"` | ||
OrganizationBillingEmail *string `json:"organization_billing_email,omitempty"` | ||
MarketplacePurchase *MarketplacePurchase `json:"marketplace_purchase,omitempty"` | ||
} | ||
|
||
// ListPlans lists all plans for your Marketplace listing. | ||
// | ||
// GitHub API docs: https://developer.github.com/v3/apps/marketplace/#list-all-plans-for-your-marketplace-listing | ||
func (s *MarketplaceService) ListPlans(ctx context.Context, opt *ListOptions) ([]*MarketplacePlan, *Response, error) { | ||
uri := s.marketplaceURI("plans") | ||
u, err := addOptions(uri, opt) | ||
if err != nil { | ||
return nil, nil, err | ||
} | ||
|
||
req, err := s.client.NewRequest("GET", u, nil) | ||
if err != nil { | ||
return nil, nil, err | ||
} | ||
|
||
// TODO: remove custom Accept header when this API fully launches. | ||
req.Header.Set("Accept", mediaTypeMarketplacePreview) | ||
|
||
var i []*MarketplacePlan | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. s/i/plans/ |
||
resp, err := s.client.Do(ctx, req, &i) | ||
if err != nil { | ||
return nil, resp, err | ||
} | ||
|
||
return i, resp, nil | ||
} | ||
|
||
// ListPlanAccountsForPlan lists all GitHub accounts (user or organization) on a specific plan. | ||
// | ||
// GitHub API docs: https://developer.github.com/v3/apps/marketplace/#list-all-github-accounts-user-or-organization-on-a-specific-plan | ||
func (s *MarketplaceService) ListPlanAccountsForPlan(ctx context.Context, planID int, opt *ListOptions) ([]*MarketplacePlanAccount, *Response, error) { | ||
uri := s.marketplaceURI(fmt.Sprintf("plans/%v/accounts", planID)) | ||
u, err := addOptions(uri, opt) | ||
if err != nil { | ||
return nil, nil, err | ||
} | ||
|
||
req, err := s.client.NewRequest("GET", u, nil) | ||
if err != nil { | ||
return nil, nil, err | ||
} | ||
|
||
// TODO: remove custom Accept header when this API fully launches. | ||
req.Header.Set("Accept", mediaTypeMarketplacePreview) | ||
|
||
var i []*MarketplacePlanAccount | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. s/i/accounts/ |
||
resp, err := s.client.Do(ctx, req, &i) | ||
if err != nil { | ||
return nil, resp, err | ||
} | ||
|
||
return i, resp, nil | ||
} | ||
|
||
// ListPlanAccountsForAccount lists all GitHub accounts (user or organization) associated with an account. | ||
// | ||
// GitHub API docs: https://developer.github.com/v3/apps/marketplace/#check-if-a-github-account-is-associated-with-any-marketplace-listing | ||
func (s *MarketplaceService) ListPlanAccountsForAccount(ctx context.Context, accountID int, opt *ListOptions) ([]*MarketplacePlanAccount, *Response, error) { | ||
uri := s.marketplaceURI(fmt.Sprintf("accounts/%v", accountID)) | ||
u, err := addOptions(uri, opt) | ||
if err != nil { | ||
return nil, nil, err | ||
} | ||
|
||
req, err := s.client.NewRequest("GET", u, nil) | ||
if err != nil { | ||
return nil, nil, err | ||
} | ||
|
||
// TODO: remove custom Accept header when this API fully launches. | ||
req.Header.Set("Accept", mediaTypeMarketplacePreview) | ||
|
||
var i []*MarketplacePlanAccount | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. s/i/accounts/ |
||
resp, err := s.client.Do(ctx, req, &i) | ||
if err != nil { | ||
return nil, resp, err | ||
} | ||
|
||
return i, resp, nil | ||
} | ||
|
||
// ListMarketplacePurchasesForUser lists all GitHub marketplace purchases made by a user. | ||
// | ||
// GitHub API docs: https://developer.github.com/v3/apps/marketplace/#get-a-users-marketplace-purchases | ||
func (s *MarketplaceService) ListMarketplacePurchasesForUser(ctx context.Context, opt *ListOptions) ([]*MarketplacePurchase, *Response, error) { | ||
uri := "user/marketplace_purchases" | ||
if s.Stubbed { | ||
uri = "user/marketplace_purchases/stubbed" | ||
} | ||
|
||
u, err := addOptions(uri, opt) | ||
if err != nil { | ||
return nil, nil, err | ||
} | ||
|
||
req, err := s.client.NewRequest("GET", u, nil) | ||
if err != nil { | ||
return nil, nil, err | ||
} | ||
|
||
// TODO: remove custom Accept header when this API fully launches. | ||
req.Header.Set("Accept", mediaTypeMarketplacePreview) | ||
|
||
var i []*MarketplacePurchase | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. s/i/purchases/ |
||
resp, err := s.client.Do(ctx, req, &i) | ||
if err != nil { | ||
return nil, resp, err | ||
} | ||
|
||
return i, resp, nil | ||
} | ||
|
||
func (s *MarketplaceService) marketplaceURI(endpoint string) string { | ||
url := "marketplace_listing" | ||
if s.Stubbed { | ||
url = "marketplace_listing/stubbed" | ||
} | ||
return url + "/" + endpoint | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,202 @@ | ||
// Copyright 2013 The go-github AUTHORS. All rights reserved. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. s/2013/2017/ |
||
// | ||
// Use of this source code is governed by a BSD-style | ||
// license that can be found in the LICENSE file. | ||
|
||
package github | ||
|
||
import ( | ||
"context" | ||
"fmt" | ||
"net/http" | ||
"reflect" | ||
"testing" | ||
) | ||
|
||
func TestMarketplaceService_ListPlans(t *testing.T) { | ||
setup() | ||
defer teardown() | ||
|
||
mux.HandleFunc("/marketplace_listing/plans", func(w http.ResponseWriter, r *http.Request) { | ||
testMethod(t, r, "GET") | ||
testHeader(t, r, "Accept", mediaTypeMarketplacePreview) | ||
testFormValues(t, r, values{ | ||
"page": "1", | ||
"per_page": "2", | ||
}) | ||
fmt.Fprint(w, `[{"id":1}]`) | ||
}) | ||
|
||
opt := &ListOptions{Page: 1, PerPage: 2} | ||
client.Marketplace.Stubbed = false | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmmm... I wish we didn't use a package global Ideally, we would have something like: client, teardown := setup()
defer teardown() for each test. No action is needed in this PR, but I'll file a new issue and point here for motivation. |
||
plans, _, err := client.Marketplace.ListPlans(context.Background(), opt) | ||
if err != nil { | ||
t.Errorf("Marketplace.ListPlans returned error: %v", err) | ||
} | ||
|
||
want := []*MarketplacePlan{{ID: Int(1)}} | ||
if !reflect.DeepEqual(plans, want) { | ||
t.Errorf("Marketplace.ListPlans returned %+v, want %+v", plans, want) | ||
} | ||
} | ||
|
||
func TestMarketplaceService_Stubbed_ListPlans(t *testing.T) { | ||
setup() | ||
defer teardown() | ||
|
||
mux.HandleFunc("/marketplace_listing/stubbed/plans", func(w http.ResponseWriter, r *http.Request) { | ||
testMethod(t, r, "GET") | ||
testHeader(t, r, "Accept", mediaTypeMarketplacePreview) | ||
fmt.Fprint(w, `[{"id":1}]`) | ||
}) | ||
|
||
opt := &ListOptions{Page: 1, PerPage: 2} | ||
client.Marketplace.Stubbed = true | ||
plans, _, err := client.Marketplace.ListPlans(context.Background(), opt) | ||
if err != nil { | ||
t.Errorf("Marketplace.ListPlans (Stubbed) returned error: %v", err) | ||
} | ||
|
||
want := []*MarketplacePlan{{ID: Int(1)}} | ||
if !reflect.DeepEqual(plans, want) { | ||
t.Errorf("Marketplace.ListPlans (Stubbed) returned %+v, want %+v", plans, want) | ||
} | ||
} | ||
|
||
func TestMarketplaceService_ListPlanAccountsForPlan(t *testing.T) { | ||
setup() | ||
defer teardown() | ||
|
||
mux.HandleFunc("/marketplace_listing/plans/1/accounts", func(w http.ResponseWriter, r *http.Request) { | ||
testMethod(t, r, "GET") | ||
testHeader(t, r, "Accept", mediaTypeMarketplacePreview) | ||
fmt.Fprint(w, `[{"id":1}]`) | ||
}) | ||
|
||
opt := &ListOptions{Page: 1, PerPage: 2} | ||
client.Marketplace.Stubbed = false | ||
accounts, _, err := client.Marketplace.ListPlanAccountsForPlan(context.Background(), 1, opt) | ||
if err != nil { | ||
t.Errorf("Marketplace.ListPlanAccountsForPlan returned error: %v", err) | ||
} | ||
|
||
want := []*MarketplacePlanAccount{{ID: Int(1)}} | ||
if !reflect.DeepEqual(accounts, want) { | ||
t.Errorf("Marketplace.ListPlanAccountsForPlan returned %+v, want %+v", accounts, want) | ||
} | ||
} | ||
|
||
func TestMarketplaceService_Stubbed_ListPlanAccountsForPlan(t *testing.T) { | ||
setup() | ||
defer teardown() | ||
|
||
mux.HandleFunc("/marketplace_listing/stubbed/plans/1/accounts", func(w http.ResponseWriter, r *http.Request) { | ||
testMethod(t, r, "GET") | ||
testHeader(t, r, "Accept", mediaTypeMarketplacePreview) | ||
fmt.Fprint(w, `[{"id":1}]`) | ||
}) | ||
|
||
opt := &ListOptions{Page: 1, PerPage: 2} | ||
client.Marketplace.Stubbed = true | ||
accounts, _, err := client.Marketplace.ListPlanAccountsForPlan(context.Background(), 1, opt) | ||
if err != nil { | ||
t.Errorf("Marketplace.ListPlanAccountsForPlan (Stubbed) returned error: %v", err) | ||
} | ||
|
||
want := []*MarketplacePlanAccount{{ID: Int(1)}} | ||
if !reflect.DeepEqual(accounts, want) { | ||
t.Errorf("Marketplace.ListPlanAccountsForPlan (Stubbed) returned %+v, want %+v", accounts, want) | ||
} | ||
} | ||
|
||
func TestMarketplaceService_ListPlanAccountsForAccount(t *testing.T) { | ||
setup() | ||
defer teardown() | ||
|
||
mux.HandleFunc("/marketplace_listing/accounts/1", func(w http.ResponseWriter, r *http.Request) { | ||
testMethod(t, r, "GET") | ||
testHeader(t, r, "Accept", mediaTypeMarketplacePreview) | ||
fmt.Fprint(w, `[{"id":1}]`) | ||
}) | ||
|
||
opt := &ListOptions{Page: 1, PerPage: 2} | ||
client.Marketplace.Stubbed = false | ||
accounts, _, err := client.Marketplace.ListPlanAccountsForAccount(context.Background(), 1, opt) | ||
if err != nil { | ||
t.Errorf("Marketplace.ListPlanAccountsForAccount returned error: %v", err) | ||
} | ||
|
||
want := []*MarketplacePlanAccount{{ID: Int(1)}} | ||
if !reflect.DeepEqual(accounts, want) { | ||
t.Errorf("Marketplace.ListPlanAccountsForAccount returned %+v, want %+v", accounts, want) | ||
} | ||
} | ||
|
||
func TestMarketplaceService_Stubbed_ListPlanAccountsForAccount(t *testing.T) { | ||
setup() | ||
defer teardown() | ||
|
||
mux.HandleFunc("/marketplace_listing/stubbed/accounts/1", func(w http.ResponseWriter, r *http.Request) { | ||
testMethod(t, r, "GET") | ||
testHeader(t, r, "Accept", mediaTypeMarketplacePreview) | ||
fmt.Fprint(w, `[{"id":1}]`) | ||
}) | ||
|
||
opt := &ListOptions{Page: 1, PerPage: 2} | ||
client.Marketplace.Stubbed = true | ||
accounts, _, err := client.Marketplace.ListPlanAccountsForAccount(context.Background(), 1, opt) | ||
if err != nil { | ||
t.Errorf("Marketplace.ListPlanAccountsForAccount (Stubbed) returned error: %v", err) | ||
} | ||
|
||
want := []*MarketplacePlanAccount{{ID: Int(1)}} | ||
if !reflect.DeepEqual(accounts, want) { | ||
t.Errorf("Marketplace.ListPlanAccountsForAccount (Stubbed) returned %+v, want %+v", accounts, want) | ||
} | ||
} | ||
|
||
func TestMarketplaceService_ListMarketplacePurchasesForUser(t *testing.T) { | ||
setup() | ||
defer teardown() | ||
|
||
mux.HandleFunc("/user/marketplace_purchases", func(w http.ResponseWriter, r *http.Request) { | ||
testMethod(t, r, "GET") | ||
testHeader(t, r, "Accept", mediaTypeMarketplacePreview) | ||
fmt.Fprint(w, `[{"billing_cycle":"monthly"}]`) | ||
}) | ||
|
||
opt := &ListOptions{Page: 1, PerPage: 2} | ||
client.Marketplace.Stubbed = false | ||
purchases, _, err := client.Marketplace.ListMarketplacePurchasesForUser(context.Background(), opt) | ||
if err != nil { | ||
t.Errorf("Marketplace.ListMarketplacePurchasesForUser returned error: %v", err) | ||
} | ||
|
||
want := []*MarketplacePurchase{{BillingCycle: String("monthly")}} | ||
if !reflect.DeepEqual(purchases, want) { | ||
t.Errorf("Marketplace.ListMarketplacePurchasesForUser returned %+v, want %+v", purchases, want) | ||
} | ||
} | ||
|
||
func TestMarketplaceService_Stubbed_ListMarketplacePurchasesForUser(t *testing.T) { | ||
setup() | ||
defer teardown() | ||
|
||
mux.HandleFunc("/user/marketplace_purchases/stubbed", func(w http.ResponseWriter, r *http.Request) { | ||
testMethod(t, r, "GET") | ||
testHeader(t, r, "Accept", mediaTypeMarketplacePreview) | ||
fmt.Fprint(w, `[{"billing_cycle":"monthly"}]`) | ||
}) | ||
|
||
opt := &ListOptions{Page: 1, PerPage: 2} | ||
client.Marketplace.Stubbed = true | ||
purchases, _, err := client.Marketplace.ListMarketplacePurchasesForUser(context.Background(), opt) | ||
if err != nil { | ||
t.Errorf("Marketplace.ListMarketplacePurchasesForUser returned error: %v", err) | ||
} | ||
|
||
want := []*MarketplacePurchase{{BillingCycle: String("monthly")}} | ||
if !reflect.DeepEqual(purchases, want) { | ||
t.Errorf("Marketplace.ListMarketplacePurchasesForUser returned %+v, want %+v", purchases, want) | ||
} | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/2013/2017/