[incubator-devlake] branch main updated: fix: search jira account by key instead of username

[abeizn]

This is an automated email from the ASF dual-hosted git repository.

abeizn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git


The following commit(s) were added to refs/heads/main by this push:
     new 2844622e fix: search jira account by key instead of username
2844622e is described below

commit 2844622e079f9328aa57074ddc8bf98d6a4eff9d
Author: zhangliang <liang.zh...@merico.dev>
AuthorDate: Tue Sep 27 18:37:49 2022 +0800

    fix: search jira account by key instead of username
---
 plugins/jira/tasks/account_collector.go | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/plugins/jira/tasks/account_collector.go 
b/plugins/jira/tasks/account_collector.go
index d8a2cbae..bdbc11fa 100644
--- a/plugins/jira/tasks/account_collector.go
+++ b/plugins/jira/tasks/account_collector.go
@@ -60,8 +60,7 @@ func CollectAccounts(taskCtx core.SubTaskContext) 
errors.Error {
        queryKey := "accountId"
        urlTemplate := "api/2/user"
        if data.JiraServerInfo.DeploymentType == models.DeploymentServer {
-               queryKey = "username"
-               urlTemplate = "api/2/user/search"
+               queryKey = "key"
        }
 
        collector, err := helper.NewApiCollector(helper.ApiCollectorArgs{
@@ -83,23 +82,14 @@ func CollectAccounts(taskCtx core.SubTaskContext) 
errors.Error {
                        return query, nil
                },
                ResponseParser: func(res *http.Response) ([]json.RawMessage, 
errors.Error) {
-                       if data.JiraServerInfo.DeploymentType == 
models.DeploymentServer {
-                               var results []json.RawMessage
-                               err := helper.UnmarshalResponse(res, &results)
-                               if err != nil {
-                                       return nil, err
-                               }
-
-                               return results, nil
-                       } else {
-                               var result json.RawMessage
-                               err := helper.UnmarshalResponse(res, &result)
-                               if err != nil {
-                                       return nil, err
-                               }
-                               return []json.RawMessage{result}, nil
+                       var result json.RawMessage
+                       err := helper.UnmarshalResponse(res, &result)
+                       if err != nil {
+                               return nil, err
                        }
+                       return []json.RawMessage{result}, nil
                },
+               AfterResponse: ignoreHTTPStatus404,
        })
        if err != nil {
                logger.Error(err, "collect account error")