Fixing bug I introduced in auditor:link_to_support_item_issues()

Netflix · Nov 11, 2017 · a5f74f0 · a5f74f0
1 parent 245a26d
commit a5f74f0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/security_monkey/auditor.py b/security_monkey/auditor.py
@@ -948,17 +948,14 @@ def link_to_support_item_issues(self, item, sub_item, sub_issue_message=None, is
                 matching_issues.append(sub_issue)
 
         for matching_issue in matching_issues:
-            if issue is None:
-                if issue_message is None:
-                    issue_message = sub_issue_message or 'UNDEFINED'
-
-                score = score or matching_issue.score
-                issue = self.add_issue(score, issue_message, item)
-            else:
+            if issue:
                 issue.score = score or issue.score + matching_issue.score
+            else:
+                issue_message = issue_message or sub_issue_message or 'UNDEFINED'
+                link_score = score or matching_issue.score
+                issue = self.add_issue(link_score, issue_message, item)
 
-            issue.sub_items.append(sub_item)
-
+        issue.sub_items.append(sub_item)
         return issue
 
     def link_to_support_item(self, score, issue_message, item, sub_item, issue=None):

diff --git a/security_monkey/tests/core/test_auditor.py b/security_monkey/tests/core/test_auditor.py
@@ -88,17 +88,15 @@ def test_link_to_support_item_issues(self):
         issue1_score = 10
         issue2_score = 5
 
-        item = ChangeItem(index='test_index',
-                          account='test_account', name='item_name')
-        sub_item = Item(id=sub_item_id, tech_id=1,
-                        account_id=1, name='sub_item_name')
-        sub_item.issues.append(
-            ItemAudit(score=issue1_score, issue=issue1_text))
-        sub_item.issues.append(
-            ItemAudit(score=issue2_score, issue=issue2_text))
-        auditor.link_to_support_item_issues(item, sub_item, None, "TEST")
+        item = ChangeItem(index='test_index', account='test_account', name='item_name')
+        sub_item = Item(id=sub_item_id, tech_id=1, account_id=1, name='sub_item_name')
+        sub_item.issues.append(ItemAudit(score=issue1_score, issue=issue1_text))
+        sub_item.issues.append(ItemAudit(score=issue2_score, issue=issue2_text))
+
+        auditor.link_to_support_item_issues(item, sub_item, issue_message="TEST")
         self.assertTrue(len(item.audit_issues) == 1)
         new_issue = item.audit_issues[0]
+
         self.assertTrue(new_issue.score == issue1_score + issue2_score)
         self.assertTrue(new_issue.issue == "TEST")
         self.assertTrue(len(new_issue.sub_items) == 1)