Fix Finding_Text (#12628)

Author: 9alexx3

dojo/jira_link/helper.py

@@ -362,6 +362,14 @@ def get_epic_name_field_name(jira_instance):
     return "customfield_" + str(jira_instance.epic_name_id)
 
 
+def get_jira_finding_text(jira_instance):
+    if jira_instance and jira_instance.finding_text:
+        return jira_instance.finding_text
+
+    logger.debug("finding_text not found in Jira instance")
+    return None
+
+
 def has_jira_issue(obj):
     return get_jira_issue(obj) is not None
 
@@ -627,12 +635,11 @@ def jira_summary(obj):
     return summary.replace("\r", "").replace("\n", "")[:255]
 
 
-def jira_description(obj):
+def jira_description(obj, **kwargs):
     template = get_jira_issue_template(obj)
 
     logger.debug("rendering description for jira from: %s", template)
 
-    kwargs = {}
     if isinstance(obj, Finding):
         kwargs["finding"] = obj
     elif isinstance(obj, Finding_Group):
@@ -840,7 +847,7 @@ def failure_to_add_message(message: str, exception: Exception, _: Any) -> bool:
             project_key=jira_project.project_key,
             issuetype_name=jira_instance.default_issue_type,
             summary=jira_summary(obj),
-            description=jira_description(obj),
+            description=jira_description(obj, finding_text=get_jira_finding_text(jira_instance)),
             component_name=jira_project.component,
             custom_fields=jira_project.custom_fields,
             labels=labels,
@@ -968,7 +975,7 @@ def failure_to_update_message(message: str, exception: Exception, obj: Any) -> b
             project_key=jira_project.project_key,
             issuetype_name=jira_instance.default_issue_type,
             summary=jira_summary(obj),
-            description=jira_description(obj),
+            description=jira_description(obj, finding_text=get_jira_finding_text(jira_instance)),
             component_name=jira_project.component if not issue.fields.components else None,
             labels=labels + issue.fields.labels,
             environment=jira_environment(obj),

dojo/templates/issue-trackers/jira_full/jira-description.tpl

@@ -94,4 +94,10 @@
 {{ finding.references|safe }}
 {% endif %}
 
+{% if finding_text %}
+*Finding Text*:
+{{ finding_text|safe }}
+{% endif %}
+
+
 *Reporter:* [{{ finding.reporter|full_name}} ({{ finding.reporter.email }})|mailto:{{ finding.reporter.email }}]

dojo/templates/issue-trackers/jira_full/jira-finding-group-description.tpl

@@ -88,5 +88,11 @@ h3. [{{ finding.title|jiraencode}}|{{ finding_url|full_url }}]
 {{ finding.references|safe }}
 {% endif %}
 
+{% if finding_text %}
+*Finding Text*:
+{{ finding_text|safe }}
+{% endif %}
+
+
 *Reporter:* [{{ finding.reporter|full_name}} ({{ finding.reporter.email }})|mailto:{{ finding.reporter.email }}]
 {% endfor %}

dojo/templates/issue-trackers/jira_limited/jira-description.tpl

@@ -9,4 +9,9 @@
 
 *Product/Engagement/Test:* [{{ finding.test.engagement.product.name }}|{{ product_url|full_url }}] / [{{ finding.test.engagement.name }}|{{ engagement_url|full_url }}] / [{{ finding.test }}|{{ test_url|full_url }}]
 
-*Reporter:* [{{ finding.reporter|full_name}} ({{ finding.reporter.email }})|mailto:{{ finding.reporter.email }}]
+*Reporter:* [{{ finding.reporter|full_name}} ({{ finding.reporter.email }})|mailto:{{ finding.reporter.email }}]
+
+{% if finding_text %}
+*Finding Text*:
+{{ finding_text|safe }}
+{% endif %}

dojo/templates/issue-trackers/jira_limited/jira-finding-group-description.tpl

@@ -25,3 +25,8 @@ Findings:
 {% if finding_group.test.engagement.commit_hash %}
 *Commit hash:* {{ finding_group.test.engagement.commit_hash }}
 {% endif %}
+
+{% if finding_text %}
+*Finding Text*:
+{{ finding_text|safe }}
+{% endif %}