Add README to Jira API version

berlam · Oct 4, 2019 · ffe64fe · ffe64fe
1 parent afef57f
commit ffe64fe
Show file tree

Hide file tree

Showing 11 changed files with 372 additions and 419 deletions.
diff --git a/pkg/jira/jira.go b/pkg/jira/jira.go
@@ -48,15 +48,17 @@ func getApiVersion(client *http.Client, server *url.URL, userinfo *url.Userinfo)
 	}
 	// There are "Cloud" and "Server" deployment types.
 	if strings.ToLower(result.DeploymentType) == "cloud" {
+		path, _ := server.Parse(v3.BasePath)
 		return &v3.Api{
 			Client:   client,
-			Server:   server,
+			Server:   path,
 			Userinfo: userinfo,
 		}, nil
 	}
+	path, _ := server.Parse(v2.BasePath)
 	return &v2.Api{
 		Client:   client,
-		Server:   server,
+		Server:   path,
 		Userinfo: userinfo,
 	}, nil
 }
@@ -121,7 +123,7 @@ func GetBulkTimesheet(client *http.Client, server *url.URL, userinfo *url.Userin
 	}
 
 	if users != nil && len(users) > 0 {
-		accounts, err := api.Accounts(projects, users)
+		accounts, err := accounts(api, projects, users)
 		if err != nil {
 			log.Println("Could not get user.", err)
 			return pkg.Timesheet{}
@@ -170,6 +172,32 @@ func GetBulkTimesheet(client *http.Client, server *url.URL, userinfo *url.Userin
 	return timesheet
 }
 
+func accounts(api model.Api, projects []pkg.Project, users []pkg.User) (map[pkg.User]model.Account, error) {
+	result := make(map[pkg.User]model.Account, len(users))
+	c := make(chan error)
+	var wg sync.WaitGroup
+	wg.Add(len(users))
+	for _, user := range users {
+		go func(user pkg.User) {
+			defer wg.Done()
+			account, err := api.User(user, projects)
+			if err != nil {
+				c <- err
+				return
+			}
+			result[user] = account
+		}(user)
+	}
+	go func() {
+		defer close(c)
+		wg.Wait()
+	}()
+	for err := range c {
+		return nil, err
+	}
+	return result, nil
+}
+
 type serverInfo struct {
 	VersionNumbers []int  `json:"versionNumbers"`
 	DeploymentType string `json:"deploymentType"`

diff --git a/pkg/jira/model/api.go b/pkg/jira/model/api.go
@@ -15,7 +15,6 @@ type IssueKey string
 
 type Api interface {
 	ProjectAccessor
-	AccountAccessor
 	UserAccessor
 	IssueAccessor
 	WorklogAccessor
@@ -25,10 +24,6 @@ type ProjectAccessor interface {
 	Projects(startAt int) ([]pkg.Project, error)
 }
 
-type AccountAccessor interface {
-	Accounts(projects []pkg.Project, users []pkg.User) (map[pkg.User]Account, error)
-}
-
 type UserAccessor interface {
 	User(user pkg.User, projects []pkg.Project) (Account, error)
 }

diff --git a/pkg/jira/test-fixtures/v2_post_worklog_list_request_test.json b/pkg/jira/test-fixtures/v2_post_worklog_list_request_test.json
diff --git a/pkg/jira/test-fixtures/v2_post_worklog_list_response_test.json b/pkg/jira/test-fixtures/v2_post_worklog_list_response_test.json
diff --git a/pkg/jira/test-fixtures/v2_search_request.schema.json b/pkg/jira/test-fixtures/v2_search_request.schema.json
diff --git a/pkg/jira/v2/README.md b/pkg/jira/v2/README.md
@@ -0,0 +1,4 @@
+https://docs.atlassian.com/software/jira/docs/api/REST/7.12.0/#api/2/user-findBulkAssignableUsers
+https://docs.atlassian.com/software/jira/docs/api/REST/7.12.0/#api/2/project-getAllProjects
+https://docs.atlassian.com/software/jira/docs/api/REST/7.12.0/#api/2/search-searchUsingSearchRequest
+https://docs.atlassian.com/software/jira/docs/api/REST/7.12.0/#api/2/issue-getWorklog