From c43ed200349290963399896c075ae7a1f2cbd16b Mon Sep 17 00:00:00 2001 From: KRAIEM Taha Yassine Date: Fri, 21 May 2021 17:42:18 +0200 Subject: [PATCH] Changes: - changed session-assignment-jira response --- api/.gitignore | 1 + api/chalicelib/core/integration_jira_cloud_issue.py | 2 +- api/chalicelib/core/sessions_assignments.py | 1 - api/chalicelib/utils/jira_client.py | 3 ++- ee/api/.gitignore | 3 ++- ee/api/chalicelib/core/integration_jira_cloud_issue.py | 2 +- ee/api/chalicelib/core/sessions_assignments.py | 1 - ee/api/chalicelib/utils/jira_client.py | 3 ++- 8 files changed, 9 insertions(+), 7 deletions(-) diff --git a/api/.gitignore b/api/.gitignore index 3c5f04f59..dd32b5d3f 100644 --- a/api/.gitignore +++ b/api/.gitignore @@ -173,3 +173,4 @@ logs*.txt SUBNETS.json ./chalicelib/.configs +README/* \ No newline at end of file diff --git a/api/chalicelib/core/integration_jira_cloud_issue.py b/api/chalicelib/core/integration_jira_cloud_issue.py index 00fac2fcb..bb847007a 100644 --- a/api/chalicelib/core/integration_jira_cloud_issue.py +++ b/api/chalicelib/core/integration_jira_cloud_issue.py @@ -34,7 +34,7 @@ class JIRACloudIntegrationIssue(BaseIntegrationIssue): if len(projects_map[integration_project_id]) > 0: jql += f" AND ID IN ({','.join(projects_map[integration_project_id])})" issues = self._client.get_issues(jql, offset=0) - results += [issues] + results += issues return {"issues": results} def get(self, integration_project_id, assignment_id): diff --git a/api/chalicelib/core/sessions_assignments.py b/api/chalicelib/core/sessions_assignments.py index 2b9c28d8f..3e0929dad 100644 --- a/api/chalicelib/core/sessions_assignments.py +++ b/api/chalicelib/core/sessions_assignments.py @@ -119,7 +119,6 @@ def get_by_session(tenant_id, user_id, project_id, session_id): continue r = integration.issue_handler.get_by_ids(saved_issues=issues[tool]) - print(r) for i in r["issues"]: i["provider"] = tool results += r["issues"] diff --git a/api/chalicelib/utils/jira_client.py b/api/chalicelib/utils/jira_client.py index 6da501bbe..a7ab92932 100644 --- a/api/chalicelib/utils/jira_client.py +++ b/api/chalicelib/utils/jira_client.py @@ -68,7 +68,8 @@ class JiraManager: # print(issue.raw) issue_dict_list.append(self.__parser_issue_info(issue, include_comments=False)) - return {"total": issues.total, "issues": issue_dict_list} + # return {"total": issues.total, "issues": issue_dict_list} + return issue_dict_list def get_issue(self, issue_id: str): try: diff --git a/ee/api/.gitignore b/ee/api/.gitignore index ab0ea34c1..7e2873ee0 100644 --- a/ee/api/.gitignore +++ b/ee/api/.gitignore @@ -173,4 +173,5 @@ logs*.txt SUBNETS.json chalicelib/.config -chalicelib/saas \ No newline at end of file +chalicelib/saas +README/* \ No newline at end of file diff --git a/ee/api/chalicelib/core/integration_jira_cloud_issue.py b/ee/api/chalicelib/core/integration_jira_cloud_issue.py index 00fac2fcb..bb847007a 100644 --- a/ee/api/chalicelib/core/integration_jira_cloud_issue.py +++ b/ee/api/chalicelib/core/integration_jira_cloud_issue.py @@ -34,7 +34,7 @@ class JIRACloudIntegrationIssue(BaseIntegrationIssue): if len(projects_map[integration_project_id]) > 0: jql += f" AND ID IN ({','.join(projects_map[integration_project_id])})" issues = self._client.get_issues(jql, offset=0) - results += [issues] + results += issues return {"issues": results} def get(self, integration_project_id, assignment_id): diff --git a/ee/api/chalicelib/core/sessions_assignments.py b/ee/api/chalicelib/core/sessions_assignments.py index 2b9c28d8f..3e0929dad 100644 --- a/ee/api/chalicelib/core/sessions_assignments.py +++ b/ee/api/chalicelib/core/sessions_assignments.py @@ -119,7 +119,6 @@ def get_by_session(tenant_id, user_id, project_id, session_id): continue r = integration.issue_handler.get_by_ids(saved_issues=issues[tool]) - print(r) for i in r["issues"]: i["provider"] = tool results += r["issues"] diff --git a/ee/api/chalicelib/utils/jira_client.py b/ee/api/chalicelib/utils/jira_client.py index 6da501bbe..a7ab92932 100644 --- a/ee/api/chalicelib/utils/jira_client.py +++ b/ee/api/chalicelib/utils/jira_client.py @@ -68,7 +68,8 @@ class JiraManager: # print(issue.raw) issue_dict_list.append(self.__parser_issue_info(issue, include_comments=False)) - return {"total": issues.total, "issues": issue_dict_list} + # return {"total": issues.total, "issues": issue_dict_list} + return issue_dict_list def get_issue(self, issue_id: str): try: