Merge lp:~salgado/offspring/disable-subscription-for-private-projects into lp:~linaro-automation/offspring/private-builds

[Guilherme Salgado]

This branch disables the ability to subscribe to notifications of private projects as well as the sending of notifications about private projects

[James Westby (james-w)]

On Mon, 17 Oct 2011 19:43:31 -0000, Guilherme Salgado <email address hidden> wrote:
> Guilherme Salgado has proposed merging lp:~salgado/offspring/disable-subscription-for-private-projects into lp:~linaro-infrastructure/offspring/private-builds with lp:~salgado/offspring/more-piston-handlers as a prerequisite.
>
> Requested reviews:
> Linaro Infrastructure (linaro-infrastructure)
>
> For more details, see:
> https://code.launchpad.net/~salgado/offspring/disable-subscription-for-private-projects/+merge/79606
>
> This branch disables the ability to subscribe to notifications of
> private projects as well as the sending of notifications about private
> projects

Hi,

What's the rationale for this one?

Thanks,

James

[James Tunnicliffe (dooferlad)]

On 17 October 2011 21:34, James Westby <email address hidden> wrote:
> What's the rationale for this one?

The idea is to close the loop on:

1. Project is public
2. User subscribes to project
3. Project is made private
4. User is still subscribed to project, doesn't matter if they are a
member of the private projects team or not.

This is an initial implementation with a view to adding subscriptions
back to private projects if they are needed later.

--
James Tunnicliffe

=== modified file 'lib/offspring/master/models.py'
--- lib/offspring/master/models.py	2011-09-23 14:01:26 +0000
+++ lib/offspring/master/models.py	2011-10-17 19:42:29 +0000
@@ -157,6 +157,7 @@
     title = Unicode()
     priority = Int(default=0)
     is_active = Bool(default=True)
+    is_private = Bool(default=False)
     launchpad_project_id = Unicode()
     launchpad_project = Reference(launchpad_project_id, "LaunchpadProject.name")
     suite = Unicode()
 
=== modified file 'lib/offspring/master/notifications.py'
--- lib/offspring/master/notifications.py	2010-11-29 08:27:24 +0000
+++ lib/offspring/master/notifications.py	2011-10-17 19:42:29 +0000
@@ -88,6 +88,9 @@
 def notify_buildresult(build_result):
     project = build_result.project
     builder = build_result.builder
+    if project.is_private:
+        # We don't support subscriptions for private projects.
+        return
     
     build_date, build_id = build_result.name.rsplit('-', 1)
     build_url = "%s/%s/%s/%s" % (offspring.config.web('build_results_uri'), project.name, build_date, build_id)
 
=== modified file 'lib/offspring/master/tests.py'
--- lib/offspring/master/tests.py	2011-09-08 19:12:29 +0000
+++ lib/offspring/master/tests.py	2011-10-17 19:42:29 +0000
@@ -5,7 +5,12 @@
 import unittest
 
 from offspring import config
+from offspring.master.models import (
+    Project,
+    ProjectNotificationSubscription,
+    )
 from offspring.master.notifications import (
+    notify_buildresult,
     notify_crash,
     notify_problem,
 )
@@ -20,6 +25,12 @@
         self.mails.append((sender, rcpt, msg))
 
 
+class FakeLexBuilder(object):
+    
+    def __init__(self, name):
+        self.name = name
+
+
 class Factory(object):
 
     def __init__(self):
@@ -29,6 +40,13 @@
         self.counter += 1
         return 'str%s' % self.counter
 
+    def makeProject(self, is_private=False):
+        name = self.getUniqueString()
+        project = Project(name=name)
+        project.title = name.decode('utf-8')
+        project.is_private = is_private
+        return project
+
 
 class TestCaseWithFactory(unittest.TestCase):
 
@@ -119,3 +137,24 @@
         from_header = mailer.mails[0][0]
         sender_real_name, sender_addr = email.utils.parseaddr(from_header)
         self.assertEqual(addr, sender_addr)
+
+
+class FakeBuildResult(object):
+
+    def __init__(self, project):
+        self.project = project
+        self.builder = None
+
+
+class TestNotifyBuildResult(TestCaseWithFactory):
+
+    def test_private_project(self):
+        # For simplicity, we don't support subscriptions for private projects,
+        # so no notifications are sent here even though there is a project
+        # subscription.
+        mailer = StubMailer()
+        project = self.factory.makeProject(is_private=True)
+        project.subscriptions = [ProjectNotificationSubscription()]
+        build = FakeBuildResult(project)
+        notify_buildresult(build)
+        self.assertEquals([], mailer.mails)
 
=== modified file 'lib/offspring/web/templates/queuemanager/project_details.html'
--- lib/offspring/web/templates/queuemanager/project_details.html	2011-10-10 19:42:14 +0000
+++ lib/offspring/web/templates/queuemanager/project_details.html	2011-10-17 19:42:29 +0000
@@ -537,8 +537,16 @@
             contents:"${isSubscribed ? 'Unsubscribe' : 'Subscribe'} to Notifications",
             dynamicContents:true,
             icon: "/assets/images/mail--plus.png",
+{% if not user.is_authenticated %}
+            prompt: "You must login to manage your project build notification subscription",
+            disabled: true,
+{% else %} {% if project.is_private %}
+            prompt: "Build notification subscription disabled for private projects",
+            disabled: true,
+{% else %}
             prompt: "Manage project build notification subscription",
-            disabled: {% if user.is_authenticated %}false{% else %}true{% endif %},
+            disabled: false,
+{% endif %} {% endif %}
             click: function() {
                 toggle_subscription();
                 return false;