add migration, fix integration config getter

Flagsmith · Jul 27, 2024 · db5d694 · db5d694
1 parent e2a33e9
commit db5d694
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 10 deletions.
diff --git a/api/audit/signals.py b/api/audit/signals.py
@@ -45,13 +45,12 @@ def call_webhooks(sender, instance, **kwargs):
 def _get_integration_config(
     instance: AuditLog, integration_name: str
 ) -> IntegrationsModel | None:
-    match True:
-        case hasattr(instance.organisation as organisation, integration_name):
-            return getattr(organisation, integration_name)
-        case hasattr(instance.project as project, integration_name):
-            return getattr(project, integration_name)
-        case hasattr(instance.environment as environment, integration_name):
-            return getattr(environment, integration_name)
+    if hasattr(organisation := instance.organisation, integration_name):
+        return getattr(organisation, integration_name)
+    if hasattr(project := instance.project, integration_name):
+        return getattr(project, integration_name)
+    if hasattr(environment := instance.environment, integration_name):
+        return getattr(environment, integration_name)
     return None
 
 

diff --git a/api/integrations/grafana/migrations/0002_add_grafana_organisation_configuration.py b/api/integrations/grafana/migrations/0002_add_grafana_organisation_configuration.py
@@ -0,0 +1,61 @@
+# Generated by Django 3.2.25 on 2024-07-27 14:21
+
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("organisations", "0055_alter_percent_usage"),
+        ("projects", "0024_add_project_edge_v2_migration_read_capacity_budget"),
+        ("grafana", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name="GrafanaConfiguration",
+            new_name="GrafanaProjectConfiguration",
+        ),
+        migrations.CreateModel(
+            name="GrafanaOrganisationConfiguration",
+            fields=[
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "deleted_at",
+                    models.DateTimeField(
+                        blank=True,
+                        db_index=True,
+                        default=None,
+                        editable=False,
+                        null=True,
+                    ),
+                ),
+                (
+                    "uuid",
+                    models.UUIDField(default=uuid.uuid4, editable=False, unique=True),
+                ),
+                ("base_url", models.URLField(null=True)),
+                ("api_key", models.CharField(max_length=100)),
+                (
+                    "organisation",
+                    models.OneToOneField(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="grafana_config",
+                        to="organisations.organisation",
+                    ),
+                ),
+            ],
+            options={
+                "abstract": False,
+            },
+        ),
+    ]
diff --git a/api/integrations/grafana/models.py b/api/integrations/grafana/models.py
@@ -43,9 +43,6 @@ class GrafanaProjectConfiguration(IntegrationsModel):
         Project, on_delete=models.CASCADE, related_name="grafana_config"
     )
 
-    class Meta:
-        db_table = "grafana_configuration"
-
 
 class GrafanaOrganisationConfiguration(IntegrationsModel):
     organisation = models.OneToOneField(