Merge lp:~deryck/launchpad/hot-bugtasks-to-hot-bugs-442170 into lp:launchpad/db-devel

[Deryck Hodge]

Make the method getting a hot bugs list get bugs by heat rather than recently touched bugtasks.

[Deryck Hodge (deryck)]

This branch moves the hot_bugtasks method from the bug listing view to a hot_bugs method on a bug target view, which changes the behavior to return 10 bugs according to heat rather than recently touched bug tasks.

This change also allows us to fix Bug #442170, since the code ensures the same bug isn't shown twice. The code uses default_bugtask for display.

The "hot bugs" test in stories/bugs/xx-product-bugs-page.txt has been updated to use factory data, rather than sample data, and to test that bugs are listed by heat.

The branch builds on a branch from Tom/Brian M. that allows sorting by heat, so the diff for my changes is pasted:

http://pastebin.ubuntu.com/360139/

[Eleanor Berger (intellectronica)]

At last, real hot bugs!!!

We've discussed a few minor changes:

1. Exiting from the loop instead of returning twice in hot_bugs.
2. Accessing bug/prop instead of bug/default_bugtask/bug/prop in the template.

Everything else looks great.

review: Approve

[Eleanor Berger (intellectronica)]

On further discussion, we realised that there's a subtle problem with using the default_bugtask, since it isn't necessarily a task on the same bugtarget we're viewing. Instead of returning bugs, we should return the task we got back from searchTasks. That does complicate the loop in hot_bugs a bit.

review: Needs Fixing

[Deryck Hodge (deryck)]

I believe I've fixed everything now. Latest incremental diff:

=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py 2010-01-20 18:27:12 +0000
+++ lib/lp/bugs/browser/bugtarget.py 2010-01-21 17:51:36 +0000
@@ -1264,12 +1264,13 @@
         hot_bugs = []
         count = 0
         for task in bugtasks:
- if task.bug not in hot_bugs:
+ # Ensure we only represent a bug once in the list.
+ if task.bug not in [hot_task.bug for hot_task in hot_bugs]:
                 if count < 10:
- hot_bugs.append(task.bug)
+ hot_bugs.append(task)
                     count += 1
- elif count == 10:
- return hot_bugs
+ else:
+ break
         return hot_bugs

=== modified file 'lib/lp/bugs/model/bugtask.py'
--- lib/lp/bugs/model/bugtask.py 2010-01-19 22:34:00 +0000
+++ lib/lp/bugs/model/bugtask.py 2010-01-21 20:45:05 +0000
@@ -1257,7 +1257,7 @@
         "number_of_duplicates": "Bug.number_of_duplicates",
         "message_count": "Bug.message_count",
         "users_affected_count": "Bug.users_affected_count",
- "heat": "Bug.hotness",
+ "heat": "Bug.heat",
         }

     _open_resolved_upstream = """

=== modified file 'lib/lp/bugs/stories/bugs/xx-product-bugs-page.txt'
--- lib/lp/bugs/stories/bugs/xx-product-bugs-page.txt 2010-01-20 20:52:20 +0000
+++ lib/lp/bugs/stories/bugs/xx-product-bugs-page.txt 2010-01-21 17:56:06 +0000
@@ -203,8 +203,8 @@
     #21 Summary for new bug 6 New Undecided ...

-Fix released bugs are not shown. We demonstrate this by setting the bugtask
-for bug 18 to be "Fix released".
+Fix Released bugs are not shown. We demonstrate this by setting the bugtask
+for bug 18 to be "Fix Released".

     >>> from lp.bugs.interfaces.bug import BugTaskStatus, IBugSet
     >>> from lp.registry.interfaces.person import IPersonSet
@@ -215,7 +215,7 @@
     ... BugTaskStatus.FIXRELEASED, project_owner)
     >>> logout()

-And then reloading the page. The Fix released bug, bug 18, is no longer shown.
+And then reloading the page. The Fix Released bug, bug 18, is no longer shown.

     >>> anon_browser.reload()
     >>> print extract_text(

=== modified file 'lib/lp/bugs/templates/bugtarget-bugs.pt'
--- lib/lp/bugs/templates/bugtarget-bugs.pt 2010-01-20 18:16:50 +0000
+++ lib/lp/bugs/templates/bugtarget-bugs.pt 2010-01-21 17:33:54 +0000
@@ -113,23 +113,23 @@
           </tr>
         </thead>
         <tbody>
- <tr tal:repeat="bug view/hot_bugs">
+ <tr tal:repeat="bugtask view/hot_bugs">
             <td class="icon left">
               <img alt="" src="/@@/bug" />
             </td>
             <td style="text-align: right">
- #<span tal:replace="bug/default_bugtask/bug/id" />
+ #<span tal:replace="bugtask/bug/id" />
             </td>
             <td>
- <a tal:attributes="href bug/default_bugtask/fmt:url"
- tal:content="bug/default_bugtask/bug/title" />
+ <a tal:attributes="href bugtask/fmt:url"
+ tal:content="bugtask/bug/title" />
      ...

[Eleanor Berger (intellectronica)]

review: Approve

=== modified file 'lib/lp/bugs/browser/bugtarget.py'
--- lib/lp/bugs/browser/bugtarget.py	2010-01-07 05:41:58 +0000
+++ lib/lp/bugs/browser/bugtarget.py	2010-01-22 16:41:25 +0000
@@ -40,6 +40,7 @@
 from canonical.config import config
 from lp.bugs.browser.bugtask import BugTaskSearchListingView
 from lp.bugs.interfaces.bug import IBug
+from lp.bugs.interfaces.bugtask import BugTaskSearchParams
 from canonical.launchpad.browser.feeds import (
     BugFeedLink, BugTargetLatestBugsFeedLink, FeedsMixin,
     PersonLatestBugsFeedLink)
@@ -55,6 +56,7 @@
 from canonical.launchpad.interfaces.launchpad import ILaunchpadCelebrities
 from canonical.launchpad.interfaces.temporaryblobstorage import (
     ITemporaryStorageManager)
+from canonical.launchpad.searchbuilder import any
 from canonical.launchpad.webapp import urlappend
 from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.webapp.interfaces import ILaunchBag, NotFoundError
@@ -1252,6 +1254,25 @@
         else:
             return 'None specified'
 
+    @property
+    def hot_bugs(self):
+        """Return the 10 hotest bugs according to IBug.heat."""
+        params = BugTaskSearchParams(
+            orderby=['-heat', '-date_last_updated'], omit_dupes=True,
+            user=self.user, status=any(*UNRESOLVED_BUGTASK_STATUSES))
+        bugtasks = self.context.searchTasks(params)
+        hot_bugs = []
+        count = 0
+        for task in bugtasks:
+            # Ensure we only represent a bug once in the list.
+            if task.bug not in [hot_task.bug for hot_task in hot_bugs]:
+                if count < 10:
+                    hot_bugs.append(task)
+                    count += 1
+                else:
+                    break
+        return hot_bugs
+
 
 class BugTargetBugTagsView(LaunchpadView):
     """Helper methods for rendering the bug tags portlet."""

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-01-19 16:43:20 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-01-22 16:41:25 +0000
@@ -2726,15 +2726,6 @@
         return IDistributionSourcePackage(self.context, None)
 
     @property
-    def hot_bugtasks(self):
-        """Return the 10 most recently updated bugtasks for this target."""
-        params = BugTaskSearchParams(
-            orderby="-date_last_updated", omit_dupes=True, user=self.user,
-            status=any(*UNRESOLVED_BUGTASK_STATUSES))
-        search = self.context.searchTasks(params)
-        return list(search[:10])
-
-    @property
     def addquestion_url(self):
         """Return the URL for the +addquestion view for the context."""
         if IQuestionTarget.providedBy(self.context):

=== modified file 'lib/lp/bugs/stories/bugs/xx-product-bugs-page.txt'
--- lib/lp/bugs/stories/bugs/xx-product-bugs-page.txt	2010-01-18 18:27:32 +0000
+++ lib/lp/bugs/stories/bugs/xx-product-bugs-page.txt	2010-01-22 16:41:25 +0000
@@ -131,38 +131,68 @@
 
 == Hot Bugs ==
 
-A listing of the 10 'hottest' bugs (currently simply the bugs most
-recently touched) is displayed to allow a quick overview of the project.
+A listing of the 10 'hottest' bugs is displayed to allow a quick
+overview of the project.
+
+To demonstrate this, we create 10 bugs and adjust their heat values manually.
+
+    >>> from zope.component import getUtility
+    >>> from canonical.launchpad.ftests import login, logout
+    >>> from lp.registry.interfaces.product import IProductSet
+    >>> import transaction
+    >>> login('[e-mail]')
+    >>> firefox = getUtility(IProductSet).getByName("firefox")
+    >>> heat_values = [0, 400, 200, 600, 100, 50, 50, 50, 50, 50, 50, 50]
+    >>> for count in range(1, 11):
+    ...     summary = 'Summary for new bug %d' % count
+    ...     bug = factory.makeBug(title=summary, product=firefox)
+    ...     bug.setHeat(heat_values[count])
+    >>> transaction.commit()
+    >>> logout()
+
 For each bug we have the number, title, status, importance and the time
 since the last update.
 
     >>> anon_browser.open('http://bugs.launchpad.dev/firefox')
     >>> print extract_text(
     ...     find_tag_by_id(anon_browser.contents, 'hot-bugs'))
-        Summary            Status Importance Last changed
-    #5 Firefox install... New    Critical   on 2006-07-14
-    #4 Reflow problems... New    Medium     on 2006-07-14
-    #1 Firefox does no... New    Low        on 2006-05-19
-
-
-Fix released bugs are not shown. We demonstrate this by setting the bugtask
-for bug 4 to be "Fix released".
-
-    >>> from zope.component import getUtility
+        Summary                   Status   Importance    Last changed
+    #18 Summary for new bug 3    New      Undecided     ...
+    #16 Summary for new bug 1    New      Undecided     ...
+    #17 Summary for new bug 2    New      Undecided     ...
+    #19 Summary for new bug 4    New      Undecided     ...
+    #25 Summary for new bug 10   New      Undecided     ...
+    #22 Summary for new bug 7    New      Undecided     ...
+    #23 Summary for new bug 8    New      Undecided     ...
+    #24 Summary for new bug 9    New      Undecided     ...
+    #20 Summary for new bug 5    New      Undecided     ...
+    #21 Summary for new bug 6    New      Undecided     ...
+
+
+Fix Released bugs are not shown. We demonstrate this by setting the bugtask
+for bug 18 to be "Fix Released".
+
     >>> from lp.bugs.interfaces.bug import BugTaskStatus, IBugSet
     >>> from lp.registry.interfaces.person import IPersonSet
     >>> login('[e-mail]')
-    >>> bug_4 = getUtility(IBugSet).get(4)
+    >>> bug_18 = getUtility(IBugSet).get(18)
     >>> project_owner = getUtility(IPersonSet).getByName('name12')
-    >>> bug_4.bugtasks[0].transitionToStatus(
+    >>> bug_18.bugtasks[0].transitionToStatus(
     ...     BugTaskStatus.FIXRELEASED, project_owner)
     >>> logout()
 
-And then reloading the page. The Fix released bug, bug 4, is no longer shown.
+And then reloading the page. The Fix Released bug, bug 18, is no longer shown.
 
     >>> anon_browser.reload()
     >>> print extract_text(
     ...     find_tag_by_id(anon_browser.contents, 'hot-bugs'))
-        Summary            Status Importance Last changed
-    #5 Firefox install... New    Critical   on 2006-07-14
-    #1 Firefox does no... New    Low        on 2006-05-19
+        Summary                   Status   Importance    Last changed
+    #16 Summary for new bug 1    New      Undecided     ...
+    #17 Summary for new bug 2    New      Undecided     ...
+    #19 Summary for new bug 4    New      Undecided     ...
+    #25 Summary for new bug 10   New      Undecided     ...
+    #22 Summary for new bug 7    New      Undecided     ...
+    #23 Summary for new bug 8    New      Undecided     ...
+    #24 Summary for new bug 9    New      Undecided     ...
+    #20 Summary for new bug 5    New      Undecided     ...
+    #21 Summary for new bug 6    New      Undecided     ...

=== modified file 'lib/lp/bugs/templates/bugtarget-bugs.pt'
--- lib/lp/bugs/templates/bugtarget-bugs.pt	2010-01-20 17:26:54 +0000
+++ lib/lp/bugs/templates/bugtarget-bugs.pt	2010-01-22 16:41:25 +0000
@@ -95,7 +95,7 @@
           </ul>
         </div>
 
-      <tal:has_hot_bugs condition="view/hot_bugtasks">
+      <tal:has_hot_bugs condition="view/hot_bugs">
         <div class="search-box">
           <metal:search
             use-macro="context/@@+bugtarget-macros-search/simple-search-form"
@@ -123,7 +123,7 @@
             </tr>
           </thead>
           <tbody>
-            <tr tal:repeat="bugtask view/hot_bugtasks">
+            <tr tal:repeat="bugtask view/hot_bugs">
               <td class="icon left">
                 <span tal:replace="structure bugtask/image:icon" />
               </td>
@@ -148,7 +148,7 @@
         </table>
       </tal:has_hot_bugs>
 
-      <tal:no_hot_bugs condition="not: view/hot_bugtasks">
+      <tal:no_hot_bugs condition="not: view/hot_bugs">
         <p id="no-bugs-filed"><strong>There are currently no bugs filed against
           <tal:project_title replace="context/title" />.</strong></p>