From 3170eaa7fb6d66d12a3f39027b04ef2b7486afc8 Mon Sep 17 00:00:00 2001 From: ganeshkumarsv <53483484+ganeshkumarsv@users.noreply.github.com> Date: Wed, 4 Sep 2024 19:44:10 -0400 Subject: [PATCH 1/4] Update active committers struct --- github/billing.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/github/billing.go b/github/billing.go index 6d7579b884d..6814ac60a6f 100644 --- a/github/billing.go +++ b/github/billing.go @@ -43,8 +43,11 @@ type StorageBilling struct { // ActiveCommitters represents the total active committers across all repositories in an Organization. type ActiveCommitters struct { - TotalAdvancedSecurityCommitters int `json:"total_advanced_security_committers"` - Repositories []*RepositoryActiveCommitters `json:"repositories,omitempty"` + TotalAdvancedSecurityCommitters int `json:"total_advanced_security_committers"` + TotalCount int `json:"total_count"` + MaximumAdvancedSecurityCommitters int `json:"maximum_advanced_security_committers"` + PurchasedAdvancedSecurityCommitters int `json:"purchased_advanced_security_committers"` + Repositories []*RepositoryActiveCommitters `json:"repositories,omitempty"` } // RepositoryActiveCommitters represents active committers on each repository. From 671b1fd6b951303aa1b2cf81482081945ba0faa6 Mon Sep 17 00:00:00 2001 From: ganeshkumarsv Date: Wed, 4 Sep 2024 19:49:10 -0400 Subject: [PATCH 2/4] go fmt --- github/billing.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/github/billing.go b/github/billing.go index 6814ac60a6f..09b1a5d017a 100644 --- a/github/billing.go +++ b/github/billing.go @@ -43,11 +43,11 @@ type StorageBilling struct { // ActiveCommitters represents the total active committers across all repositories in an Organization. type ActiveCommitters struct { - TotalAdvancedSecurityCommitters int `json:"total_advanced_security_committers"` - TotalCount int `json:"total_count"` - MaximumAdvancedSecurityCommitters int `json:"maximum_advanced_security_committers"` - PurchasedAdvancedSecurityCommitters int `json:"purchased_advanced_security_committers"` - Repositories []*RepositoryActiveCommitters `json:"repositories,omitempty"` + TotalAdvancedSecurityCommitters int `json:"total_advanced_security_committers"` + TotalCount int `json:"total_count"` + MaximumAdvancedSecurityCommitters int `json:"maximum_advanced_security_committers"` + PurchasedAdvancedSecurityCommitters int `json:"purchased_advanced_security_committers"` + Repositories []*RepositoryActiveCommitters `json:"repositories,omitempty"` } // RepositoryActiveCommitters represents active committers on each repository. From 5712de9f3c8ec52afbd4b76f4b1afa4acc2fac82 Mon Sep 17 00:00:00 2001 From: ganeshkumarsv <53483484+ganeshkumarsv@users.noreply.github.com> Date: Wed, 4 Sep 2024 19:52:28 -0400 Subject: [PATCH 3/4] Update test cases for active committers --- github/billing_test.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/github/billing_test.go b/github/billing_test.go index d7adcb09f72..020d7a7fdf5 100644 --- a/github/billing_test.go +++ b/github/billing_test.go @@ -436,10 +436,14 @@ func TestBillingService_GetAdvancedSecurityActiveCommittersOrg(t *testing.T) { testMethod(t, r, "GET") fmt.Fprint(w, `{ "total_advanced_security_committers": 2, + "total_count": 2, + "maximum_advanced_security_committers": 3, + "purchased_advanced_security_committers": 4, "repositories": [ { "name": "octocat-org/Hello-World", "advanced_security_committers": 2, + "advanced_security_committers_breakdown": [ { "user_login": "octokitten", @@ -460,6 +464,9 @@ func TestBillingService_GetAdvancedSecurityActiveCommittersOrg(t *testing.T) { want := &ActiveCommitters{ TotalAdvancedSecurityCommitters: 2, + TotalCount: 2, + MaximumAdvancedSecurityCommitters: 3, + PurchasedAdvancedSecurityCommitters: 4, Repositories: []*RepositoryActiveCommitters{ { Name: String("octocat-org/Hello-World"), From 66567f8a9dac5fafe4428d211b1be2731d7c7cd6 Mon Sep 17 00:00:00 2001 From: ganeshkumarsv Date: Wed, 4 Sep 2024 19:54:41 -0400 Subject: [PATCH 4/4] go fmt --- github/billing_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/github/billing_test.go b/github/billing_test.go index 020d7a7fdf5..5c929d5f095 100644 --- a/github/billing_test.go +++ b/github/billing_test.go @@ -463,9 +463,9 @@ func TestBillingService_GetAdvancedSecurityActiveCommittersOrg(t *testing.T) { } want := &ActiveCommitters{ - TotalAdvancedSecurityCommitters: 2, - TotalCount: 2, - MaximumAdvancedSecurityCommitters: 3, + TotalAdvancedSecurityCommitters: 2, + TotalCount: 2, + MaximumAdvancedSecurityCommitters: 3, PurchasedAdvancedSecurityCommitters: 4, Repositories: []*RepositoryActiveCommitters{ {