Merge pull request globocom#212 from globocom/add_receive_treshold_emails_on_database

Add receive treshold emails on database

Author: otherpirate

dbaas/api/database.py

@@ -16,11 +16,16 @@
 
 class DatabaseSerializer(serializers.HyperlinkedModelSerializer):
     plan = serializers.HyperlinkedRelatedField(
-        source='plan', view_name='plan-detail', queryset=Plan.objects.filter(is_active=True))
-    environment = serializers.HyperlinkedRelatedField(source='environment', view_name='environment-detail',
-                                                      queryset=Environment.objects)
+        source='plan', view_name='plan-detail',
+        queryset=Plan.objects.filter(is_active=True)
+    )
+    environment = serializers.HyperlinkedRelatedField(
+        source='environment', view_name='environment-detail',
+        queryset=Environment.objects
+    )
     team = serializers.HyperlinkedRelatedField(
-        source='team', view_name='team-detail', queryset=Team.objects)
+        source='team', view_name='team-detail', queryset=Team.objects
+    )
     endpoint = serializers.Field(source='endpoint')
     quarantine_dt = serializers.Field(source='quarantine_dt')
     total_size_in_bytes = serializers.Field(source='total_size')
@@ -30,10 +35,13 @@ class DatabaseSerializer(serializers.HyperlinkedModelSerializer):
 
     class Meta:
         model = models.Database
-        fields = ('url', 'id', 'name', 'endpoint', 'plan', 'environment',
-                  'project', 'team', 'quarantine_dt', 'total_size_in_bytes',
-                  'credentials', 'description', 'contacts', 'status',
-                  'used_size_in_bytes', 'created_at')
+        fields = (
+            'url', 'id', 'name', 'endpoint', 'plan', 'environment',
+            'project', 'team', 'quarantine_dt', 'total_size_in_bytes',
+            'credentials', 'description', 'contacts', 'status',
+            'used_size_in_bytes', 'subscribe_to_email_events',
+            'created_at',
+        )
         read_only = ('credentials', 'status', 'used_size_in_bytes')
 
     def __init__(self, *args, **kwargs):
@@ -43,16 +51,11 @@ def __init__(self, *args, **kwargs):
         if request:
             creating = request.method == 'POST'
 
-            # when database is created, user can't change plan, environment and
-            # name
             self.fields['plan'].read_only = not creating
             self.fields['environment'].read_only = not creating
             self.fields['name'].read_only = not creating
             self.fields['credentials'].read_only = True
 
-        # quarantine is always readonly
-        # self.fields['quarantine_dt'].read_only = True
-
 
 class DatabaseAPI(viewsets.ModelViewSet):
 
@@ -68,6 +71,7 @@ class DatabaseAPI(viewsets.ModelViewSet):
                 "project": "{api_url}/project/{project_id}/",
                 "team": "{api_url}/team/{team_id}/",
                 "description": "{description}",
+                "subscribe_to_email_events": "{subscribe_to_email_events}",
                 "contacts": "{contacts}"
             }
     *   ### __Show details about a database__
@@ -78,6 +82,8 @@ class DatabaseAPI(viewsets.ModelViewSet):
         __PUT__ /api/database/`database_id`/
             {
                 "project": "{api_url}/project/{project_id}/",
+                "description": "{description}",
+                "subscribe_to_email_events": "{subscribe_to_email_events}",
                 "contacts": "{contacts}"
             }
     """
@@ -98,22 +104,23 @@ def create(self, request):
             task_history.arguments = "Database name: {}".format(data['name'])
             task_history.save()
 
-            result = create_database.delay(name=data['name'],
-                                           plan=data['plan'],
-                                           environment=data['environment'],
-                                           team=data['team'],
-                                           project=data['project'],
-                                           description=data['description'],
-                                           contacts=data['contacts'],
-                                           task_history=task_history,
-                                           user=request.user)
+            result = create_database.delay(
+                name=data['name'], plan=data['plan'],
+                environment=data['environment'], team=data['team'],
+                project=data['project'], description=data['description'],
+                subscribe_to_email_events=data['subscribe_to_email_events'],
+                contacts=data['contacts'], task_history=task_history,
+                user=request.user
+            )
 
             headers = self.get_success_headers(data)
             task_url = Site.objects.get_current().domain + \
                 '/api/task?task_id=%s' % str(result.id)
 
-            return Response({"task": task_url}, status=status.HTTP_201_CREATED,
-                            headers=headers)
+            return Response(
+                {"task": task_url}, status=status.HTTP_201_CREATED,
+                headers=headers
+            )
 
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 

dbaas/api/tests/test_databaseapi.py

@@ -28,7 +28,10 @@ def setUp(self):
         self.environment = self.datainfra.environment
 
     def model_new(self):
-        return factory.DatabaseFactory.build(databaseinfra=self.datainfra, team=self.team, project=self.project, environment=self.environment)
+        return factory.DatabaseFactory.build(
+            databaseinfra=self.datainfra, team=self.team, project=self.project,
+            environment=self.environment
+        )
 
     def model_create(self):
         return factory.DatabaseFactory(databaseinfra=self.datainfra)
@@ -42,7 +45,8 @@ def test_post_create_new(self, mock_delay):
 
         LOG.debug("Response: ".format(response))
         LOG.debug("Call args {}, Call count {}".format(
-            mock_delay.call_args, mock_delay.call_count))
+            mock_delay.call_args, mock_delay.call_count)
+        )
 
         self.assertEquals(mock_delay.call_count, 1)
         call_args = mock_delay.call_args[1]
@@ -72,9 +76,11 @@ def test_delete(self):
         url = self.url_detail(obj.pk)
         response = self.client.delete(url)
 
-        # assert status code
         self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
 
-        # assert if object gone
-        self.assertRaises(ObjectDoesNotExist, Database.objects.filter(
-            is_in_quarantine=False, pk=obj.pk).get)
+        self.assertRaises(
+            ObjectDoesNotExist,
+            Database.objects.filter(
+                is_in_quarantine=False, pk=obj.pk
+            ).get
+        )

dbaas/logical/admin/database.py

@@ -83,15 +83,19 @@ class DatabaseAdmin(admin.DjangoServicesAdmin):
         (None, {
             'fields': (
                 'name', 'description', 'contacts', 'project', 'engine',
-                'environment', 'team', 'plan', 'is_in_quarantine',
+                'environment', 'team', 'subscribe_to_email_events', 'plan',
+                'is_in_quarantine',
             )
         }
         ),
     )
 
     fieldsets_change_basic = (
         (None, {
-            'fields': ['name', 'description', 'contacts', 'project', 'team', ]
+            'fields': [
+                'name', 'description', 'contacts', 'project', 'team',
+                'subscribe_to_email_events',
+            ]
         }
         ),
     )
@@ -390,13 +394,13 @@ def add_view(self, request, form_url='', extra_context=None):
                 if not form.is_valid():
                     return super(DatabaseAdmin, self).add_view(request, form_url, extra_context=extra_context)
 
-                LOG.debug(
-                    "call create_database - name=%s, plan=%s, environment=%s, team=%s, project=%s, description=%s, user=%s" % (
-                        form.cleaned_data['name'], form.cleaned_data[
-                            'plan'], form.cleaned_data['environment'],
-                        form.cleaned_data['team'], form.cleaned_data[
-                            'project'], form.cleaned_data['description'],
-                        request.user))
+                database_creation_message = "call create_database - name={}, plan={}, environment={}, team={}, project={}, description={}, user={}, subscribe_to_email_events {}".format(
+                    form.cleaned_data['name'], form.cleaned_data['plan'],
+                    form.cleaned_data['environment'], form.cleaned_data['team'],
+                    form.cleaned_data['project'], form.cleaned_data['description'],
+                    request.user, form.cleaned_data['subscribe_to_email_events']
+                )
+                LOG.debug(database_creation_message)
 
                 task_history = TaskHistory()
                 task_history.task_name = "create_database"
@@ -406,17 +410,18 @@ def add_view(self, request, form_url='', extra_context=None):
                 task_history.user = request.user
                 task_history.save()
 
-                create_database.delay(name=form.cleaned_data['name'],
-                                      plan=form.cleaned_data['plan'],
-                                      environment=form.cleaned_data[
-                                          'environment'],
-                                      team=form.cleaned_data['team'],
-                                      project=form.cleaned_data['project'],
-                                      description=form.cleaned_data[
-                                          'description'],
-                                      contacts=form.cleaned_data['contacts'],
-                                      task_history=task_history,
-                                      user=request.user)
+                create_database.delay(
+                    name=form.cleaned_data['name'],
+                    plan=form.cleaned_data['plan'],
+                    environment=form.cleaned_data['environment'],
+                    team=form.cleaned_data['team'],
+                    project=form.cleaned_data['project'],
+                    description=form.cleaned_data['description'],
+                    subscribe_to_email_events=form.cleaned_data['subscribe_to_email_events'],
+                    contacts=form.cleaned_data['contacts'],
+                    task_history=task_history,
+                    user=request.user
+                )
 
                 url = reverse('admin:notification_taskhistory_changelist')
                 # Redirect after POST
@@ -448,7 +453,16 @@ def change_view(self, request, object_id, form_url='', extra_context=None):
         else:
             extra_context['is_dba'] = False
 
-        return super(DatabaseAdmin, self).change_view(request, object_id, form_url, extra_context=extra_context)
+        if request.method == 'POST':
+            form = DatabaseForm(request.POST)
+            if not form.is_valid():
+                return super(DatabaseAdmin, self).change_view(
+                    request, object_id, form_url, extra_context=extra_context
+                )
+
+        return super(DatabaseAdmin, self).change_view(
+            request, object_id, form_url, extra_context=extra_context
+        )
 
     def delete_view(self, request, object_id, extra_context=None):
         database = Database.objects.get(id=object_id)
@@ -853,7 +867,6 @@ def database_disk_resize_view(self, request, database_id):
                                   locals(),
                                   context_instance=RequestContext(request))
 
-
     def restore_snapshot(self, request, database_id):
         database = Database.objects.get(id=database_id)
 
@@ -1068,8 +1081,9 @@ def delete_selected(self, request, queryset):
                 raise PermissionDenied
 
             n = queryset.count()
-            quarantine = any(result[
-                             'is_in_quarantine'] == True for result in queryset.values('is_in_quarantine'))
+            quarantine = any(
+                result['is_in_quarantine'] is True for result in queryset.values('is_in_quarantine')
+            )
 
             if n:
                 for obj in queryset:

dbaas/logical/forms/database.py

@@ -115,8 +115,8 @@ class DatabaseForm(models.ModelForm):
     class Meta:
         model = Database
         fields = (
-            'name', 'description', 'contacts', 'project', 'team',
-            'is_in_quarantine',
+            'name', 'description', 'contacts', 'subscribe_to_email_events',
+            'project', 'team', 'is_in_quarantine',
         )
 
     def remove_fields_not_in_models(self):