Use types for Bitbucket JSON

Author: Crayon2000

cli/application/bitbucket.go

@@ -12,6 +12,40 @@ type BitbucketApp struct {
 	config AppConfig
 }
 
+// LinkPayload represents the JSON payload for a link on Bitbucket.
+type LinkPayload struct {
+	Href string `json:"href"`
+	Name string `json:"name"`
+}
+
+// RepositoryPayload represents the JSON payload for a repository on Bitbucket.
+type RepositoryPayload struct {
+	Scm         string `json:"scm"`
+	Name        string `json:"name"`
+	FullName    string `json:"full_name,omitempty"`
+	Description string `json:"description"`
+	IsPrivate   bool   `json:"is_private"`
+	HasWiki     bool   `json:"has_wiki"`
+	HasIssues   bool   `json:"has_issues"`
+	Owner       struct {
+		DisplayName string `json:"display_name"`
+		UUID        string `json:"uuid"`
+	} `json:"owner"`
+	Links struct {
+		Self  LinkPayload   `json:"self"`
+		Clone []LinkPayload `json:"clone"`
+	} `json:"links"`
+}
+
+// RepositoryListPayload represents the JSON payload for a repository list on Bitbucket.
+type RepositoryListPayload struct {
+	Page     int                 `json:"page"`
+	PageLen  int                 `json:"pagelen"`
+	Next     string              `json:"next"`
+	Previous string              `json:"previous"`
+	Values   []RepositoryPayload `json:"values"`
+}
+
 // Slugify a string.
 func slugify(s string) string {
 	s = strings.ToLower(s)
@@ -124,28 +158,13 @@ func (g *BitbucketApp) GetRepositories(endpoint ApiEndpoint, owner string, authU
 
 		body, _ := io.ReadAll(resp.Body)
 
-		// Bitbucket repositories response structure
-		var response struct {
-			Values []struct {
-				Name        string `json:"name"`
-				FullName    string `json:"full_name"`
-				Description string `json:"description"`
-				IsPrivate   bool   `json:"is_private"`
-				HasWiki     bool   `json:"has_wiki"`
-				HasIssues   bool   `json:"has_issues"`
-				Owner       struct {
-					Username string `json:"username"`
-				} `json:"owner"`
-				Links struct {
-					Clone []struct {
-						Name string `json:"name"`
-						Href string `json:"href"`
-					} `json:"clone"`
-				} `json:"links"`
-			} `json:"values"`
-			Next string `json:"next"`
+		if resp.StatusCode != http.StatusOK {
+			return nil, fmt.Errorf("failed to get repositories: %s", resp.Status)
 		}
 
+		// Bitbucket repositories response structure
+		var response RepositoryListPayload
+
 		if err := json.Unmarshal(body, &response); err != nil {
 			return nil, err
 		}
@@ -159,7 +178,7 @@ func (g *BitbucketApp) GetRepositories(endpoint ApiEndpoint, owner string, authU
 				HasWiki:     item.HasWiki,
 				HasIssues:   item.HasIssues,
 				Owner: User{
-					Login: item.Owner.Username,
+					Login: item.Owner.DisplayName,
 				},
 			}
 
@@ -227,13 +246,13 @@ func (g *BitbucketApp) GetIssues(repo Repository) ([]Issue, error) {
 func (g *BitbucketApp) CreateRepo(endpoint ApiEndpoint, owner string, source Repository) (Repository, error) {
 	url := g.config.ApiUrl + "/2.0/repositories/" + owner + "/" + slugify(source.Name)
 
-	payload := map[string]any{
-		"scm":         "git",
-		"name":        source.Name,
-		"description": source.Description,
-		"is_private":  source.Private,
-		"has_wiki":    source.HasWiki,
-		"has_issues":  source.HasIssues,
+	payload := RepositoryPayload{
+		Scm:         "git",
+		Name:        source.Name,
+		Description: source.Description,
+		IsPrivate:   source.Private,
+		HasWiki:     source.HasWiki,
+		HasIssues:   source.HasIssues,
 	}
 
 	jsonData, err := json.Marshal(payload)
@@ -258,23 +277,7 @@ func (g *BitbucketApp) CreateRepo(endpoint ApiEndpoint, owner string, source Rep
 	}
 
 	// Parse response
-	var response struct {
-		Name        string `json:"name"`
-		FullName    string `json:"full_name"`
-		Description string `json:"description"`
-		IsPrivate   bool   `json:"is_private"`
-		HasWiki     bool   `json:"has_wiki"`
-		HasIssues   bool   `json:"has_issues"`
-		Owner       struct {
-			Username string `json:"username"`
-		} `json:"owner"`
-		Links struct {
-			Clone []struct {
-				Name string `json:"name"`
-				Href string `json:"href"`
-			} `json:"clone"`
-		} `json:"links"`
-	}
+	var response RepositoryPayload
 
 	if err := json.Unmarshal(body, &response); err != nil {
 		return Repository{}, err
@@ -288,7 +291,7 @@ func (g *BitbucketApp) CreateRepo(endpoint ApiEndpoint, owner string, source Rep
 		HasWiki:     response.HasWiki,
 		HasIssues:   response.HasIssues,
 		Owner: User{
-			Login: response.Owner.Username,
+			Login: response.Owner.DisplayName,
 		},
 	}