From e0cea4018dc2c8644a8bca1867bdc41504e38cae Mon Sep 17 00:00:00 2001 From: sidpremkumar Date: Aug 01 2019 13:24:58 +0000 Subject: Adding check for JIRA issue fields before checking --- diff --git a/sync2jira/downstream.py b/sync2jira/downstream.py index a74a63f..9d65a50 100644 --- a/sync2jira/downstream.py +++ b/sync2jira/downstream.py @@ -130,8 +130,9 @@ def _matching_jira_issue_query(client, issue, config, free=False): final_results = [] for result in results_of_query: - # If the queried JIRA issue has the id of the upstream issue or the same title - if issue.id in result.fields.description or issue.title == result.fields.summary: + description = result.fields.description or "" + summary = result.fields.summary or "" + if issue.id in description or issue.title == summary: search = check_comments_for_duplicate(client, result, find_username(issue, config)) if search is True: diff --git a/sync2jira/email_template.jinja b/sync2jira/email_template.jinja index 0a8dc2f..afac25b 100644 --- a/sync2jira/email_template.jinja +++ b/sync2jira/email_template.jinja @@ -2,6 +2,12 @@

Hello {{ user['name'] }},
It looks like you have some duplicate issues for upstream issue {{ issue._title }}

+

This issue was selected:

+

But these issues were also found: