Add bugs from layered product to qe space

Signed-off-by: ratamir <[email protected]>

Author: RazTamir

config.py

@@ -30,6 +30,7 @@
 # ocs-4.2.0 --> ocs-x.y.z so you'll need to add only ocs-4.2 in order to see
 # all bugs in version x.y
 BUGZILLA_VERSION_FLAG = g.get_cell_value(7, 5)
+LAYERED_PRODUCT = g.get_cell_value(10, 4)
 
 # [CHANGE NEEDED] List here all the teams you want to sample, for example:
 team1 = "manage"

helpers.py

@@ -452,7 +452,6 @@ def get_bugs_per_member(member_name, product=''):
         "include_fields": [
             "id",
             "status",
-            "qa_contact",
             "severity"
         ],
         "o2": "equals",

qe_space.py

@@ -6,34 +6,54 @@
 g = gapi.GoogleSpreadSheetAPI(SPREADSHEET_NAME, "QE Space")
 
 bug_to_member = dict()
+layered_product_bug_to_member = dict()
 for member in TEAM_MEMBERS:
-    qe_backlog = get_bugs_per_member(member, PRODUCT)
+    qe_backlog = get_bugs_per_member(member, BUGZILLA_PRODUCT)
+    if qe_backlog:
+        if member not in bug_to_member.keys():
+            bug_to_member[member] = list()
     for bug in qe_backlog:
-        qa_contact = bug.qa_contact.split('@')[0]
-        if qa_contact not in bug_to_member.keys():
-            bug_to_member[qa_contact] = list()
-        bug_to_member[qa_contact].append(bug)
-
+        bug_to_member[member].append(bug)
+    if LAYERED_PRODUCT:
+        layered_qe_backlog = get_bugs_per_member(member, LAYERED_PRODUCT)
+        if layered_qe_backlog:
+            if member not in layered_product_bug_to_member.keys():
+                layered_product_bug_to_member[member] = list()
+        for layered_bug in layered_qe_backlog:
+            layered_product_bug_to_member[member].append(layered_bug)
 row = 4
 col = 2
-for key, bugs in bug_to_member.items():
+for member, bugs in bug_to_member.items():
     bugs_distribution = dict()
     bugs_distribution['urgent'] = filter_by_severity(bugs, 'urgent')
     bugs_distribution['high'] = filter_by_severity(bugs, 'high')
     bugs_distribution['medium'] = filter_by_severity(bugs, 'medium')
     bugs_distribution['low'] = filter_by_severity(bugs, 'low')
-    bugs_distribution['unspecified'] = filter_by_severity(bugs, 'unspecified')
     idx = col
-    g.update_sheet(row, col, key)
-    for key, val in bugs_distribution.items():
+    g.update_sheet(row, col, member)
+    for severity, bugs_by_severity in bugs_distribution.items():
         idx += 1
-        if len(val) > 0:
-            bug_ids = [str(bug.id) for bug in val]
+        if len(bugs_by_severity) > 0:
+            bug_ids = [str(bug.id) for bug in bugs_by_severity]
             link = get_bug_url_link(bug_ids)
-            g.update_sheet(row, idx, f'=HYPERLINK("{str(link)}", "{len(val)}")')
+            g.update_sheet(
+                row, idx, f'=HYPERLINK("{str(link)}", "{len(bugs_by_severity)}")'
+            )
         else:
             if not g.get_cell_value(row, idx) == '-':
                 g.update_sheet(row, idx, '-')
+    if layered_product_bug_to_member.get(member):
+        bug_ids = [str(bug.id) for bug in layered_product_bug_to_member[member]]
+        link = get_bug_url_link(bug_ids)
+        g.update_sheet(
+            row,
+            idx + 1,
+            f'=HYPERLINK("{str(link)}", '
+            f'"{len(layered_product_bug_to_member[member])}")'
+        )
+    else:
+        if not g.get_cell_value(row, idx + 1) == '-':
+            g.update_sheet(row, idx + 1, '-')
     row += 1
 for row in range(row, 30 + 1):
     if g.get_cell_value(row, col):