From 1c5a6693a523e030d02b3205845e820f6f639f7d Mon Sep 17 00:00:00 2001
From: Suhaib Mujahid <smujahid@mozilla.com>
Date: Fri, 28 Oct 2022 17:26:34 -0400
Subject: [PATCH 1/2] [no_severity] Fix the query to exclude bugs that recently
 changed components

---
 auto_nag/scripts/workflow/no_severity.py | 52 ++++++++++++++----------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/auto_nag/scripts/workflow/no_severity.py b/auto_nag/scripts/workflow/no_severity.py
index de3220c2f..d6a4739cb 100644
--- a/auto_nag/scripts/workflow/no_severity.py
+++ b/auto_nag/scripts/workflow/no_severity.py
@@ -226,30 +226,38 @@ def get_bz_params(self, date):
                     "f5": "product",
                     "o5": "changedafter",
                     "v5": second,
-                    "f6": "CP",
-                    "j7": "AND",
-                    "f7": "OP",
-                    "f8": "component",
-                    "o8": "changedbefore",
-                    "v8": second,
-                    "n9": 1,
+                    "n6": 1,
+                    "f6": "component",
+                    "o6": "changedafter",
+                    "v6": second,
+                    "f7": "CP",
+                    "j8": "AND",
+                    "f8": "OP",
                     "f9": "component",
-                    "o9": "changedafter",
+                    "o9": "changedbefore",
+                    "n10": 1,
+                    "f10": "product",
+                    "o10": "changedafter",
+                    "v10": second,
                     "v9": second,
-                    "f10": "CP",
-                    "j11": "AND",
-                    "f11": "OP",
-                    "f12": "creation_ts",
-                    "o12": "lessthaneq",
-                    "v12": second,
-                    "n13": 1,
-                    "f13": "product",
-                    "o13": "everchanged",
-                    "n14": 1,
-                    "f14": "component",
-                    "o14": "everchanged",
-                    "f15": "CP",
-                    "f16": "CP",
+                    "n11": 1,
+                    "f11": "component",
+                    "o11": "changedafter",
+                    "v11": second,
+                    "f12": "CP",
+                    "j13": "AND",
+                    "f13": "OP",
+                    "f14": "creation_ts",
+                    "o14": "lessthaneq",
+                    "v14": second,
+                    "n15": 1,
+                    "f15": "product",
+                    "o15": "everchanged",
+                    "n16": 1,
+                    "f16": "component",
+                    "o16": "everchanged",
+                    "f17": "CP",
+                    "f18": "CP",
                     "n20": 1,
                     "j20": "OR",
                     "f20": "OP",

From a56698a3c414f7eb2ba0b2b6f739ad8057fec302 Mon Sep 17 00:00:00 2001
From: Suhaib Mujahid <smujahid@mozilla.com>
Date: Fri, 28 Oct 2022 19:31:37 -0400
Subject: [PATCH 2/2] Fix the params order

---
 auto_nag/scripts/workflow/no_severity.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/auto_nag/scripts/workflow/no_severity.py b/auto_nag/scripts/workflow/no_severity.py
index d6a4739cb..8187993f9 100644
--- a/auto_nag/scripts/workflow/no_severity.py
+++ b/auto_nag/scripts/workflow/no_severity.py
@@ -235,11 +235,11 @@ def get_bz_params(self, date):
                     "f8": "OP",
                     "f9": "component",
                     "o9": "changedbefore",
+                    "v9": second,
                     "n10": 1,
                     "f10": "product",
                     "o10": "changedafter",
                     "v10": second,
-                    "v9": second,
                     "n11": 1,
                     "f11": "component",
                     "o11": "changedafter",