From 94fb957e2beafaa2e303e63d0e9fc954e37daf85 Mon Sep 17 00:00:00 2001
From: Matthew Elwell <matthew.elwell@flagsmith.com>
Date: Tue, 1 Aug 2023 11:40:55 +0100
Subject: [PATCH] fix: environment webhooks shows current date, not created
 date (#2555)

Co-authored-by: Ben Rometsch <ben.rometsch@gmail.com>
---
 ...t_and_updated_at_to_organisationwebhook.py | 33 +++++++++++++++++++
 api/organisations/models.py                   |  2 ++
 api/organisations/serializers.py              |  2 +-
 .../pages/EnvironmentSettingsPage.js          |  2 +-
 .../pages/OrganisationSettingsPage.js         | 14 ++++----
 5 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 api/organisations/migrations/0043_add_created_at_and_updated_at_to_organisationwebhook.py

diff --git a/api/organisations/migrations/0043_add_created_at_and_updated_at_to_organisationwebhook.py b/api/organisations/migrations/0043_add_created_at_and_updated_at_to_organisationwebhook.py
new file mode 100644
index 000000000000..69f185eceb9b
--- /dev/null
+++ b/api/organisations/migrations/0043_add_created_at_and_updated_at_to_organisationwebhook.py
@@ -0,0 +1,33 @@
+# Generated by Django 3.2.20 on 2023-08-01 09:14
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('organisations', '0042_alter_subscription_payment_method'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='organisationwebhook',
+            name='created_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name='organisationwebhook',
+            name='updated_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='organisationwebhook',
+            name='created_at',
+            field=models.DateTimeField(auto_now_add=True, blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='organisationwebhook',
+            name='updated_at',
+            field=models.DateTimeField(auto_now=True, blank=True, null=True),
+        )
+    ]
diff --git a/api/organisations/models.py b/api/organisations/models.py
index 8dad0adcae9f..c0de2827bd3d 100644
--- a/api/organisations/models.py
+++ b/api/organisations/models.py
@@ -253,6 +253,8 @@ class OrganisationWebhook(AbstractBaseExportableWebhookModel):
     organisation = models.ForeignKey(
         Organisation, on_delete=models.CASCADE, related_name="webhooks"
     )
+    created_at = models.DateTimeField(null=True, auto_now_add=True)
+    updated_at = models.DateTimeField(null=True, auto_now=True)
 
     class Meta:
         ordering = ("id",)  # explicit ordering to prevent pagination warnings
diff --git a/api/organisations/serializers.py b/api/organisations/serializers.py
index 20a276157b92..9c3bfe3b90ca 100644
--- a/api/organisations/serializers.py
+++ b/api/organisations/serializers.py
@@ -211,7 +211,7 @@ class PortalUrlSerializer(serializers.Serializer):
 class OrganisationWebhookSerializer(serializers.ModelSerializer):
     class Meta:
         model = OrganisationWebhook
-        fields = ("id", "url", "enabled", "secret")
+        fields = ("id", "url", "enabled", "secret", "created_at", "updated_at")
         read_only_fields = ("id",)
 
 
diff --git a/frontend/web/components/pages/EnvironmentSettingsPage.js b/frontend/web/components/pages/EnvironmentSettingsPage.js
index 8fad3e83218c..42df497293db 100644
--- a/frontend/web/components/pages/EnvironmentSettingsPage.js
+++ b/frontend/web/components/pages/EnvironmentSettingsPage.js
@@ -791,7 +791,7 @@ const EnvironmentSettingsPage = class extends Component {
                                   <Button theme='text'>{webhook.url}</Button>
                                   <div className='list-item-footer faint'>
                                     Created{' '}
-                                    {moment(webhook.created_date).format(
+                                    {moment(webhook.created_at).format(
                                       'DD/MMM/YYYY',
                                     )}
                                   </div>
diff --git a/frontend/web/components/pages/OrganisationSettingsPage.js b/frontend/web/components/pages/OrganisationSettingsPage.js
index 5c236164e070..e8318f07cedb 100644
--- a/frontend/web/components/pages/OrganisationSettingsPage.js
+++ b/frontend/web/components/pages/OrganisationSettingsPage.js
@@ -1248,12 +1248,14 @@ const OrganisationSettingsPage = class extends Component {
                                       <Button theme='text'>
                                         {webhook.url}
                                       </Button>
-                                      <div className='list-item-footer faint'>
-                                        Created{' '}
-                                        {moment(webhook.created_date).format(
-                                          'DD/MMM/YYYY',
-                                        )}
-                                      </div>
+                                      {webhook.created_at ? (
+                                        <div className='list-item-footer faint'>
+                                          Created{' '}
+                                          {moment(webhook.created_at).format(
+                                            'DD/MMM/YYYY',
+                                          )}
+                                        </div>
+                                      ) : null}
                                     </div>
                                     <Row>
                                       <Switch checked={webhook.enabled} />