From 277ab2f11736fb362b3cd8fc34676cdd7d00a6f7 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Aug 16 2018 12:09:45 +0000
Subject: fix watcher count


update the watcher count to include default watchers like the project owner
that didn't get added to the watchers table unless they've changed their
watcher status

Signed-off-by: Karsten Hopp <karsten@redhat.com>

---

diff --git a/pagure/templates/repo_info.html b/pagure/templates/repo_info.html
index c9b5114..77f1ce0 100644
--- a/pagure/templates/repo_info.html
+++ b/pagure/templates/repo_info.html
@@ -134,7 +134,7 @@
                       <i class="fa {{ 'fa-eye-slash' if watch_button_text == 'Watch' else 'fa-eye text-success' }} fa-fw"></i>
                       <span>{{watch_button_text}}</span>
                     </a>
-                    <span class="btn btn-sm btn-primary font-weight-bold">{{repo.watchers|length}}</span>
+                    <span class="btn btn-sm btn-primary font-weight-bold">{{num_watchers}}</span>
                     <div class="dropdown-menu dropdown-menu-right watch-menu">
                       <form method="POST" id="watch_project" name="watch_project"
                         action="{{ url_for('ui_ns.watch_repo',
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index 6b6f81c..908c9d7 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -136,6 +136,17 @@ def view_repo(repo, username=None, namespace=None):
         branchname = repo_obj.head.shorthand
     else:
         branchname = None
+    project = pagure.lib.get_authorized_project(
+        flask.g.session, repo, user=username, namespace=namespace)
+    watch_users = [project.user.username]
+    for access_type in project.access_users.keys():
+        for user in project.access_users[access_type]:
+            if user.username not in watch_users:
+                watch_users.append(user.username)
+    for watcher in project.watchers:
+        if (watcher.watch_issues or watcher.watch_commits) and \
+           watcher.user.username not in watch_users:
+            watch_users.append(watcher.user.username)
     readmefile = get_preferred_readme(tree)
     if readmefile:
         name, ext = os.path.splitext(readmefile.name)
@@ -158,6 +169,7 @@ def view_repo(repo, username=None, namespace=None):
         branchname=branchname,
         last_commits=last_commits,
         tree=tree,
+        num_watchers=len(watch_users),
     )
 
 
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index 541c320..6f587ee 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -5388,6 +5388,16 @@ index 0000000..fb7093d
                 'You are no longer'
                 ' watching this project', output_text)
 
+            output = self.app.get(
+                '/test', data=data,
+                follow_redirects=True)
+            output_text = output.get_data(as_text=True)
+            self.assertIn(
+                ('<span class="btn btn-sm btn-primary font-weight-bold">1'
+                 '</span>\n                    '
+                 '<div class="dropdown-menu dropdown-menu-right watch-menu">'),
+                output_text)
+
             output = self.app.post(
                 '/fork/foo/test/watch/settings/1', data=data,
                 follow_redirects=True)
@@ -5396,6 +5406,16 @@ index 0000000..fb7093d
                 'You are now'
                 ' watching issues and PRs on this project', output_text)
 
+            output = self.app.get(
+                '/test', data=data,
+                follow_redirects=True)
+            output_text = output.get_data(as_text=True)
+            self.assertIn(
+                ('<span class="btn btn-sm btn-primary font-weight-bold">1'
+                 '</span>\n                    '
+                 '<div class="dropdown-menu dropdown-menu-right watch-menu">'),
+                output_text)
+
             output = self.app.post(
                 '/fork/foo/test/watch/settings/2', data=data,
                 follow_redirects=True)
@@ -5413,6 +5433,35 @@ index 0000000..fb7093d
                  ' watching issues, PRs, and commits on this project'),
                 output_text)
 
+            output = self.app.get(
+                '/test', data=data,
+                follow_redirects=True)
+            output_text = output.get_data(as_text=True)
+            self.assertIn(
+                ('<span class="btn btn-sm btn-primary font-weight-bold">1'
+                 '</span>\n                    '
+                 '<div class="dropdown-menu dropdown-menu-right watch-menu">'),
+                output_text)
+
+            project = pagure.lib._get_project(self.session, 'test')
+            pagure.lib.add_user_to_project(
+                self.session, project,
+                new_user='foo',
+                user='pingou',
+                access='commit'
+            )
+            self.session.commit()
+
+            output = self.app.get(
+                '/test', data=data,
+                follow_redirects=True)
+            output_text = output.get_data(as_text=True)
+            self.assertIn(
+                ('<span class="btn btn-sm btn-primary font-weight-bold">2'
+                 '</span>\n                    '
+                 '<div class="dropdown-menu dropdown-menu-right watch-menu">'),
+                output_text)
+
             output = self.app.post(
                 '/fork/foo/test/watch/settings/-1', data=data,
                 follow_redirects=True)
@@ -5421,6 +5470,16 @@ index 0000000..fb7093d
                 'Watch status reset',
                 output_text)
 
+            output = self.app.get(
+                '/test', data=data,
+                follow_redirects=True)
+            output_text = output.get_data(as_text=True)
+            self.assertIn(
+                ('<span class="btn btn-sm btn-primary font-weight-bold">2'
+                 '</span>\n                    '
+                 '<div class="dropdown-menu dropdown-menu-right watch-menu">'),
+                output_text)
+
     def test_delete_report(self):
         """ Test the  delete_report endpoint. """