List top 10 fixers

2 files changed, 34 insertions, 9 deletions

diff --git a/esc-reporting/esc-analyze.py b/esc-reporting/esc-analyze.py
index 7c16aec..8332a41 100755
--- a/esc-reporting/esc-analyze.py
+++ b/esc-reporting/esc-analyze.py
@@ -123,13 +123,13 @@ def util_create_person_gerrit(person, email):
                          '1month': {'owner': 0, 'reviewer': 0, 'total': 0},
                          '1week':  {'owner': 0, 'reviewer': 0, 'total': 0}},
              'qa':      {'1year':  {'owner': 0, 'reviewer': 0, 'regression': 0, 'bibisected': 0,
-                                    'bisected': 0, 'backtrace': 0, 'total': 0},
+                                    'bisected': 0, 'backtrace': 0, 'fixed': 0, 'total': 0},
                          '3month': {'owner': 0, 'reviewer': 0, 'regression': 0, 'bibisected': 0,
-                                    'bisected': 0, 'backtrace': 0, 'total': 0},
+                                    'bisected': 0, 'backtrace': 0, 'fixed': 0, 'total': 0},
                          '1month': {'owner': 0, 'reviewer': 0, 'regression': 0, 'bibisected': 0,
-                                    'bisected': 0, 'backtrace': 0, 'total': 0},
+                                    'bisected': 0, 'backtrace': 0, 'fixed': 0, 'total': 0},
                          '1week':  {'owner': 0, 'reviewer': 0, 'regression': 0, 'bibisected': 0,
-                                    'bisected': 0, 'backtrace': 0, 'total': 0}},
+                                    'bisected': 0, 'backtrace': 0, 'fixed': 0, 'total': 0}},
              'isCommitter': False,
              'isContributor': False,
              'hasLicense': False,
@@ -429,6 +429,10 @@ def analyze_qa(statList, openhubData, gerritData, gitData, bugzillaData, cfg):
                 util_build_period_stat(cfg, statList, xDate, email, '', 'regression', base='qa')
               if keyword == 'haveBacktrace':
                 util_build_period_stat(cfg, statList, xDate, email, '', 'backtrace', base='qa')
+          elif entry['field_name'] == 'resolution':
+            if entry['added'] == 'FIXED':
+              util_build_period_stat(cfg, statList, xDate, email, '', 'fixed', base='qa')
+
 
       for change in row['comments']:
         email = util_check_mail('*UNKNOWN*', change['creator'], statList, cfg['contributor']['combine-email'])
diff --git a/esc-reporting/esc-report.py b/esc-reporting/esc-report.py
index ae8f694..6281b45 100755
--- a/esc-reporting/esc-report.py
+++ b/esc-reporting/esc-report.py
@@ -437,7 +437,7 @@ def report_qa(statList, openhubData, gerritData, gitData, bugzillaData, cfg):
              'name': statList['people'][i]['name'],
              'week' :statList['people'][i]['qa']['1week']['owner'],
              'month' :statList['people'][i]['qa']['1month']['owner'],
-             '3month':statList['people'][i]['qa']['1month']['owner']}
+             '3month':statList['people'][i]['qa']['3month']['owner']}
         top10reporters.append(x)
         if len(top10reporters) >= 10:
           break
@@ -448,6 +448,27 @@ def report_qa(statList, openhubData, gerritData, gitData, bugzillaData, cfg):
       print('          {} reported {} bugs in 1 week, {} bugs in 1 month and {} bugs in 3 months'.format(
             i['name'], i['week'], i['month'], i['3month']), file=fp)
 
+
+    tmpClist = sorted(statList['people'], key=lambda k: (statList['people'][k]['qa']['1week']['fixed']), reverse=True)
+    top10fixers = []
+    for i in tmpClist:
+      if i != 'qa-admin@libreoffice.org' and i != 'libreoffice-commits@lists.freedesktop.org':
+        x = {'mail': i,
+             'name': statList['people'][i]['name'],
+             'week' :statList['people'][i]['qa']['1week']['fixed'],
+             'month' :statList['people'][i]['qa']['1month']['fixed'],
+             '3month':statList['people'][i]['qa']['3month']['fixed']}
+        top10fixers.append(x)
+        if len(top10fixers) >= 10:
+          break
+
+    print("\n    + top 10 bugs fixers:", file=fp)
+    xRow = []
+    for i in top10fixers:
+      print('          {} fixed {} bugs in 1 week, {} bugs in 1 month and {} bugs in 3 months'.format(
+            i['name'], i['week'], i['month'], i['3month']), file=fp)
+
+
     tmpClist = sorted(statList['people'], key=lambda k: (statList['people'][k]['qa']['1week']['bisected']), reverse=True)
     top10bisected = []
     for i in tmpClist:
@@ -457,7 +478,7 @@ def report_qa(statList, openhubData, gerritData, gitData, bugzillaData, cfg):
              'name': statList['people'][i]['name'],
              'week' :statList['people'][i]['qa']['1week']['bisected'],
              'month' :statList['people'][i]['qa']['1month']['bisected'],
-             '3month':statList['people'][i]['qa']['1month']['bisected']}
+             '3month':statList['people'][i]['qa']['3month']['bisected']}
         top10bisected.append(x)
         if len(top10bisected) >= 10:
           break
@@ -478,7 +499,7 @@ def report_qa(statList, openhubData, gerritData, gitData, bugzillaData, cfg):
              'name': statList['people'][i]['name'],
              'week' :statList['people'][i]['qa']['1week']['bibisected'],
              'month' :statList['people'][i]['qa']['1month']['bibisected'],
-             '3month':statList['people'][i]['qa']['1month']['bibisected']}
+             '3month':statList['people'][i]['qa']['3month']['bibisected']}
         top10bibisected.append(x)
         if len(top10bibisected) >= 10:
           break
@@ -499,7 +520,7 @@ def report_qa(statList, openhubData, gerritData, gitData, bugzillaData, cfg):
              'name': statList['people'][i]['name'],
              'week' :statList['people'][i]['qa']['1week']['regression'],
              'month' :statList['people'][i]['qa']['1month']['regression'],
-             '3month':statList['people'][i]['qa']['1month']['regression']}
+             '3month':statList['people'][i]['qa']['3month']['regression']}
         top10regression.append(x)
         if len(top10regression) >= 10:
           break
@@ -519,7 +540,7 @@ def report_qa(statList, openhubData, gerritData, gitData, bugzillaData, cfg):
              'name': statList['people'][i]['name'],
              'week' :statList['people'][i]['qa']['1week']['backtrace'],
              'month' :statList['people'][i]['qa']['1month']['backtrace'],
-             '3month':statList['people'][i]['qa']['1month']['backtrace']}
+             '3month':statList['people'][i]['qa']['3month']['backtrace']}
         top10backtrace.append(x)
         if len(top10backtrace) >= 10:
           break