spot out of date dev agreements (bug 719222)

Andy McKay · Andy McKay · commit 850c7008b517 · 2012-09-26T17:56:45.000-07:00
diff --git a/apps/amo/tests/__init__.py b/apps/amo/tests/__init__.py
@@ -199,6 +199,10 @@ def decorated(request, *args, **kwargs):
     return decorated
 
 
+def days_ago(days):
+    return datetime.now() - timedelta(days=days)
+
+
 class TestCase(RedisTest, test_utils.TestCase):
     """Base class for all amo tests."""
     client_class = TestClient
@@ -378,7 +382,7 @@ def grant_permission(self, user_obj, rules):
         GroupUser.objects.create(group=group, user=user_obj)
 
     def days_ago(self, days):
-        return datetime.now() - timedelta(days=days)
+        return days_ago(days)
 
 
 class AMOPaths(object):
diff --git a/lib/settings_base.py b/lib/settings_base.py
@@ -1546,3 +1546,9 @@ def read_only_mode(env):
 
 # Set this to True if you want region stores (eg: marketplace).
 REGION_STORES = False
+
+# When the dev. agreement gets updated and you need users to re-accept it
+# change this date. You won't want to do this for minor format changes.
+# The tuple is passed through to datetime.date, so please use a valid date
+# tuple. If the value is None, then it will just not be used at all.
+DEV_AGREEMENT_LAST_UPDATED = None
diff --git a/mkt/developers/helpers.py b/mkt/developers/helpers.py
@@ -1,12 +1,13 @@
 from collections import defaultdict
 import urllib
 
+from django.conf import settings
 from django.utils.encoding import smart_unicode
 
 import chardet
 import jinja2
 from jingo import register
-from jingo.helpers import datetime
+from jingo.helpers import datetime as jingo_datetime
 from tower import ugettext as _, ungettext as ngettext
 
 import amo
@@ -125,11 +126,11 @@ def status_choices(addon):
 def file_status_message(file, addon, file_history=False):
     choices = status_choices(addon)
     return {'fileid': file.id, 'platform': file.amo_platform.name,
-            'created': datetime(file.created),
+            'created': jingo_datetime(file.created),
             'status': choices[file.status],
             'file_history': file_history,
             'actions': amo.LOG_REVIEW_EMAIL_USER,
-            'status_date': datetime(file.datestatuschanged)}
+            'status_date': jingo_datetime(file.datestatuschanged)}
 
 
 @register.function
@@ -208,3 +209,23 @@ def disabled_payments_notice(context, addon=None):
     """
     addon = context.get('addon', addon)
     return {'request': context.get('request'), 'addon': addon}
+
+
+@register.function
+def dev_agreement_ok(user):
+    latest = settings.DEV_AGREEMENT_LAST_UPDATED
+    if not latest:
+        # Value not set for last updated.
+        return True
+
+    if not user.read_dev_agreement:
+        # If you don't have any apps, we we won't worry about this because
+        # you'll be prompted on the first submission.
+        return True
+
+    current = user.read_dev_agreement
+    if current and current.date() < latest:
+        # The dev agreement has been updated since you last submitted.
+        return False
+
+    return True
diff --git a/mkt/developers/templates/developers/skeleton_impala.html b/mkt/developers/templates/developers/skeleton_impala.html
@@ -83,7 +83,7 @@ <h1 class="logo"><a href="{{ url('ecosystem.landing') }}">
         {% endblock %}
       {% endblock site_header %}
     </section>
-    {% if ADMIN_MESSAGE or settings.READ_ONLY %}
+    {% if ADMIN_MESSAGE or settings.READ_ONLY or not dev_agreement_ok(amo_user) %}
       <div id="site-notice">
         <div class="pad">
           {% if ADMIN_MESSAGE %}
@@ -95,9 +95,16 @@ <h1 class="logo"><a href="{{ url('ecosystem.landing') }}">
               website maintenance. We'll be back to full capacity shortly.
               {% endtrans %}</p>
           {% endif %}
+          {% if not dev_agreement_ok(amo_user) %}
+             <p>{% trans url=url('mkt.developers.apps.terms') %}
+               The Terms of Service have changed since you last agreed to them.
+               Please read and agree to the <a href="{{ url }}">new terms</a>.
+               {% endtrans %}</p>
+          {% endif %}
         </div>
       </div>
     {% endif %}
+
     <div id="wrap">
       <div id="page" class="pad section c" role="main">
         {# Overridden in base_side_categories, which expands categories
diff --git a/mkt/developers/templates/developers/terms.html b/mkt/developers/templates/developers/terms.html
@@ -22,7 +22,7 @@ <h1>{{ title }}</h1>
           {{ _('Additional Marketplace Policies') }}</a>
       </li>
     </ol>
-    {% if not accepted %}
+    {% if not accepted or not dev_agreement_ok(amo_user) %}
       <form id="agreement-form" method="post">
         {{ csrf() }}
         {{ agreement_form.read_dev_agreement }}
diff --git a/mkt/developers/tests/test_helpers.py b/mkt/developers/tests/test_helpers.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from datetime import datetime, timedelta
 import unittest
 import urllib
 
@@ -15,6 +16,7 @@
 from addons.models import Addon
 from mkt.developers import helpers
 from files.models import File, Platform
+from users.models import UserProfile
 from versions.models import Version
 
 
@@ -202,3 +204,36 @@ def test_disabled(self):
         self.addon.status = amo.STATUS_PUBLIC
         self.file.status = amo.STATUS_DISABLED
         self.expect(amo.STATUS_CHOICES[amo.STATUS_DISABLED])
+
+
+class TestDevAgreement(amo.tests.TestCase):
+
+    def setUp(self):
+        self.user = UserProfile()
+
+    def test_none(self):
+        with self.settings(DEV_AGREEMENT_LAST_UPDATED=None):
+            eq_(helpers.dev_agreement_ok(self.user), True)
+
+    def test_date_oops(self):
+        with self.settings(DEV_AGREEMENT_LAST_UPDATED=('wat?')):
+            eq_(helpers.dev_agreement_ok(self.user), True)
+
+    def test_not_agreed(self):
+        # The user has never agreed to it so in this case we don't need to
+        # worry them about changes.
+        self.user.update(read_dev_agreement=None)
+        with self.settings(DEV_AGREEMENT_LAST_UPDATED=
+                           self.days_ago(10).date()):
+            eq_(helpers.dev_agreement_ok(self.user), True)
+
+    def test_past_agreed(self):
+        self.user.update(read_dev_agreement=self.days_ago(10))
+        with self.settings(DEV_AGREEMENT_LAST_UPDATED=self.days_ago(5).date()):
+            eq_(helpers.dev_agreement_ok(self.user), False)
+
+    def test_not_past(self):
+        self.user.update(read_dev_agreement=self.days_ago(5))
+        with self.settings(DEV_AGREEMENT_LAST_UPDATED=
+                           self.days_ago(10).date()):
+            eq_(helpers.dev_agreement_ok(self.user), True)
diff --git a/mkt/developers/tests/test_views.py b/mkt/developers/tests/test_views.py
@@ -1649,3 +1649,30 @@ def test_accept(self):
         res = self.client.post(self.url, {'read_dev_agreement': 'yeah'})
         eq_(res.status_code, 200)
         assert self.get_user().read_dev_agreement
+
+    @mock.patch.object(settings, 'DEV_AGREEMENT_LAST_UPDATED',
+                       amo.tests.days_ago(-5).date())
+    def test_update(self):
+        past = self.days_ago(10)
+        self.user.update(read_dev_agreement=past)
+        res = self.client.post(self.url, {'read_dev_agreement': 'yeah'})
+        eq_(res.status_code, 200)
+        assert self.get_user().read_dev_agreement != past
+
+    @mock.patch.object(settings, 'DEV_AGREEMENT_LAST_UPDATED',
+                       amo.tests.days_ago(-5).date())
+    def test_past(self):
+        past = self.days_ago(10)
+        self.user.update(read_dev_agreement=past)
+        res = self.client.get(self.url)
+        doc = pq(res.content)
+        eq_(doc('#site-notice').length, 1)
+        eq_(doc('#dev-agreement').length, 1)
+        eq_(doc('#agreement-form').length, 1)
+
+    def test_not_past(self):
+        res = self.client.get(self.url)
+        doc = pq(res.content)
+        eq_(doc('#site-notice').length, 0)
+        eq_(doc('#dev-agreement').length, 1)
+        eq_(doc('#agreement-form').length, 0)
diff --git a/mkt/developers/utils.py b/mkt/developers/utils.py
@@ -88,4 +88,3 @@ def check_upload(file_obj, upload_type, content_type):
                 errors.append(_('Icons must be square.'))
 
     return errors, upload_hash
-
diff --git a/mkt/settings.py b/mkt/settings.py
@@ -1,3 +1,4 @@
+import datetime
 import os
 
 from lib.settings_base import *
@@ -381,3 +382,6 @@ def APPCACHE_MEDIA_DEBUG():
     # The hidden list from AMO's settings:
     'cy', 'sr', 'sr-Latn', 'tr',
 )
+
+# Update this each time there's a major update.
+DEV_AGREEMENT_LAST_UPDATED = datetime.date(2012, 2, 23)

Original file line number	Diff line number	Diff line change
`@@ -88,4 +88,3 @@ def check_upload(file_obj, upload_type, content_type):`
`88`	`88`	`errors.append(_('Icons must be square.'))`
`89`	`89`
`90`	`90`	`return errors, upload_hash`
`91`		`-`