Fix filter model unique fields

line · Mar 6, 2019 · 95684ce · 95684ce
1 parent 181c58a
commit 95684ce
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 36 deletions.
diff --git a/promgen/migrations/0007_message_filter.py b/promgen/migrations/0007_message_filter.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.1.2 on 2019-03-06 01:50
+# Generated by Django 2.1.2 on 2019-03-06 06:20
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -15,13 +15,20 @@ class Migration(migrations.Migration):
             name='Filter',
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=128, unique=True)),
-                ('value', models.CharField(max_length=128, unique=True)),
+                ('name', models.CharField(max_length=128)),
+                ('value', models.CharField(max_length=128)),
             ],
+            options={
+                'ordering': ('sender', 'name', 'value'),
+            },
         ),
         migrations.AddField(
             model_name='filter',
             name='sender',
             field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='promgen.Sender'),
         ),
+        migrations.AlterUniqueTogether(
+            name='filter',
+            unique_together={('sender', 'name', 'value')},
+        ),
     ]
diff --git a/promgen/models.py b/promgen/models.py
@@ -142,8 +142,12 @@ def filtered(self, alert):
 
 class Filter(models.Model):
     sender = models.ForeignKey("Sender", on_delete=models.CASCADE)
-    name = models.CharField(max_length=128, unique=True)
-    value = models.CharField(max_length=128, unique=True)
+    name = models.CharField(max_length=128)
+    value = models.CharField(max_length=128)
+
+    class Meta:
+        ordering = ("sender", "name", "value")
+        unique_together = (("sender", "name", "value"),)
 
 
 class Shard(models.Model):

diff --git a/promgen/tests/test_webhook.py b/promgen/tests/test_webhook.py
@@ -11,69 +11,81 @@
 from promgen.tests import PromgenTest
 
 
-TEST_SETTINGS = PromgenTest.data_yaml('examples', 'promgen.yml')
-TEST_ALERT = PromgenTest.data('examples', 'alertmanager.json')
+TEST_SETTINGS = PromgenTest.data_yaml("examples", "promgen.yml")
+TEST_ALERT = PromgenTest.data("examples", "alertmanager.json")
 
 
 class WebhookTest(PromgenTest):
-    @mock.patch('django.dispatch.dispatcher.Signal.send')
+    @mock.patch("django.dispatch.dispatcher.Signal.send")
     def setUp(self, mock_signal):
-        self.shard = models.Shard.objects.create(name='test.shard')
-        self.service = models.Service.objects.create(name='test.service', shard=self.shard)
-        self.project = models.Project.objects.create(name='test.project', service=self.service)
+        self.shard = models.Shard.objects.create(name="test.shard")
+        self.service = models.Service.objects.create(
+            name="test.service", shard=self.shard
+        )
+        self.project = models.Project.objects.create(
+            name="test.project", service=self.service
+        )
 
-        self.sender = models.Sender.objects.create(
+        self.senderA = models.Sender.objects.create(
             obj=self.project,
             sender=NotificationWebhook.__module__,
-            value='http://project.example.com',
+            value="http://project.example.com",
         )
 
-        self.sender = models.Sender.objects.create(
+        self.senderB = models.Sender.objects.create(
             obj=self.service,
             sender=NotificationWebhook.__module__,
-            value='http://service.example.com',
+            value="http://service.example.com",
         )
 
     @override_settings(PROMGEN=TEST_SETTINGS)
     @override_settings(CELERY_TASK_ALWAYS_EAGER=True)
     @override_settings(CELERY_TASK_EAGER_PROPAGATES=True)
     @mock.patch("promgen.util.post")
     def test_webhook(self, mock_post):
-        self.client.post(reverse('alert'),
-            data=TEST_ALERT,
-            content_type='application/json'
+        response = self.client.post(
+            reverse("alert"), data=TEST_ALERT, content_type="application/json"
         )
 
-        self.assertEqual(models.Alert.objects.count(), 1, 'Alert should be queued')
+        self.assertEqual(response.status_code, 202)
+        self.assertEqual(models.Alert.objects.count(), 1, "Alert should be queued")
+        self.assertEqual(mock_post.call_count, 2, "Two alerts should be sent")
 
         # Our sample is the same as the original, with some annotations added
-        _SAMPLE = PromgenTest.data_json('examples', 'alertmanager.json')
-        _SAMPLE['commonAnnotations']['service'] = 'http://example.com' + self.service.get_absolute_url()
-        _SAMPLE['commonAnnotations']['project'] = 'http://example.com' + self.project.get_absolute_url()
-
-        mock_post.assert_has_calls([
-            mock.call(
-                'http://project.example.com',
-                json=_SAMPLE,
-            ),
-            mock.call(
-                'http://service.example.com',
-                json=_SAMPLE,
-            )
-        ], any_order=True)
+        _SAMPLE = PromgenTest.data_json("examples", "alertmanager.json")
+        _SAMPLE["commonAnnotations"]["service"] = (
+            "http://example.com" + self.service.get_absolute_url()
+        )
+        _SAMPLE["commonAnnotations"]["project"] = (
+            "http://example.com" + self.project.get_absolute_url()
+        )
+
+        mock_post.assert_has_calls(
+            [
+                mock.call("http://project.example.com", json=_SAMPLE),
+                mock.call("http://service.example.com", json=_SAMPLE),
+            ],
+            any_order=True,
+        )
 
     @override_settings(PROMGEN=TEST_SETTINGS)
     @override_settings(CELERY_TASK_ALWAYS_EAGER=True)
     @override_settings(CELERY_TASK_EAGER_PROPAGATES=True)
     @mock.patch("promgen.util.post")
     def test_filter(self, mock_post):
-        models.Filter.objects.create(sender=self.sender, name="severity", value="major")
-        self.assertEqual(models.Filter.objects.count(), 1, "Should be one filter")
+        # Our first sender will only allow critical messages
+        models.Filter.objects.create(sender=self.senderA, name="severity", value="critical")
+
+        # Our second sender allows critical and major
+        models.Filter.objects.create(sender=self.senderB, name="severity", value="critical")
+        models.Filter.objects.create(sender=self.senderB, name="severity", value="major")
+
+        self.assertEqual(models.Filter.objects.count(), 3, "Should be three filters")
 
         response = self.client.post(
             reverse("alert"), data=TEST_ALERT, content_type="application/json"
         )
         self.assertEqual(response.status_code, 202)
 
         self.assertEqual(models.Alert.objects.count(), 1, "Alert should be queued")
-        self.assertEqual(mock_post.call_count, 0, "Alert should not send")
+        self.assertEqual(mock_post.call_count, 1, "One notification should be skipped")