Merge branch 'refactor-notifications' of https://github.com/CenterForOpenScience/osf.io into add-new-notifications-data-model

* 'refactor-notifications' of https://github.com/CenterForOpenScience/osf.io:
  ignore Django maintenance state outside block

Author: Johnetordoff

osf/migrations/0030_new_notifications_model.py renamed to osf/migrations/0031_new_notifications_model.py

@@ -8,7 +8,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('osf', '0029_remove_abstractnode_keenio_read_key'),
+        ('osf', '0030_alter_osfgroupgroupobjectpermission_unique_together_and_more'),
     ]
 
     operations = [

tests/test_registrations/test_retractions.py

@@ -907,8 +907,7 @@ def test_non_contributor_GET_approval_returns_HTTPError_FORBIDDEN(self):
         assert self.registration.is_pending_retraction
         assert not self.registration.is_retracted
 
-
-    def test_non_contributor_GET_disapproval_returns_HTTPError_UNAUTHORIZED(self):
+    def test_non_contributor_GET_disapproval_returns_HTTPError_FORBIDDEN(self):
         non_contributor = AuthUserFactory()
         self.registration.retract_registration(self.user)
         rejection_token = self.registration.retraction.approval_state[self.user._id]['rejection_token']

website/maintenance.py

@@ -42,11 +42,19 @@ def set_maintenance(message, level=1, start=None, end=None):
 
     return {'start': state.start, 'end': state.end}
 
+
+class InFailedSqlTransaction:
+    pass
+
+
 def get_maintenance():
     """Get the current start and end times for the maintenance state.
     Return None if there is no current maintenance state.
     """
-    maintenance = MaintenanceState.objects.all().first()
+    try:
+        maintenance = MaintenanceState.objects.all().first()
+    except InFailedSqlTransaction:
+        return None
     return MaintenanceStateSerializer(maintenance).data if maintenance else None
 
 def unset_maintenance():