fix: Improve comment formatting as per PR comments

Author: novakzaballa

api/integrations/github/constants.py

@@ -3,12 +3,11 @@
 
 LINK_FEATURE_TITLE = """**Flagsmith feature linked:** `%s`
 Default Values:\n"""
-FEATURE_TABLE_HEADER = """| Environment | Enabled | Value | Type | Updated (UTC) |
-| :--- | :----- | :------ | :------- | :------ |\n"""
-FEATURE_TABLE_ROW = "| [%s](%s) | %s | `%s` | %s | %s |\n"
+FEATURE_TABLE_HEADER = """| Environment | Enabled | Value | Last Updated (UTC) |
+| :--- | :----- | :------ | :------ |\n"""
+FEATURE_TABLE_ROW = "| [%s](%s) | %s | %s | %s |\n"
 LINK_SEGMENT_TITLE = "Segment `%s` values:\n"
 UNLINKED_FEATURE_TEXT = "### The feature flag `%s` was unlinked from the issue/PR"
 UPDATED_FEATURE_TEXT = "Flagsmith Feature `%s` has been updated:\n"
-LAST_UPDATED_FEATURE_TEXT = "Last Updated %s"
 DELETED_FEATURE_TEXT = "### The Feature Flag `%s` was deleted"
 FEATURE_ENVIRONMENT_URL = "%s/project/%s/environment/%s/features?feature=%s&tab=%s"

api/integrations/github/github.py

@@ -6,6 +6,7 @@
 import requests
 from core.helpers import get_current_site_url
 from django.conf import settings
+from django.utils.formats import get_format
 
 from features.models import FeatureState, FeatureStateValue
 from integrations.github.client import generate_token
@@ -15,7 +16,6 @@
     FEATURE_TABLE_HEADER,
     FEATURE_TABLE_ROW,
     GITHUB_API_URL,
-    LAST_UPDATED_FEATURE_TEXT,
     LINK_FEATURE_TITLE,
     LINK_SEGMENT_TITLE,
     UNLINKED_FEATURE_TEXT,
@@ -86,8 +86,8 @@ def generate_body_comment(
     if is_removed:
         return delete_text
 
-    last_updated_string = LAST_UPDATED_FEATURE_TEXT % (
-        datetime.datetime.now().strftime("%dth %b %Y %I:%M%p")
+    last_updated_string = datetime.datetime.now().strftime(
+        get_format("DATETIME_INPUT_FORMATS")[0]
     )
 
     result = UPDATED_FEATURE_TEXT % (name) if is_update else LINK_FEATURE_TITLE % (name)
@@ -97,7 +97,6 @@ def generate_body_comment(
 
     for v in feature_states:
         feature_value = v.get("feature_state_value")
-        feature_value_type = v.get("feature_state_value_type")
         tab = "segment-overrides" if v.get("segment_name") is not None else "value"
         environment_link_url = FEATURE_ENVIRONMENT_URL % (
             get_current_site_url(),
@@ -113,9 +112,8 @@ def generate_body_comment(
         table_row = FEATURE_TABLE_ROW % (
             v["environment_name"],
             environment_link_url,
-            "✅ Enabled" if v["feature_value"] else "❌ Disabled",
-            feature_value if feature_value else "",
-            feature_value_type,
+            "✅ Enabled" if v["enabled"] else "❌ Disabled",
+            f"`{feature_value}`" if feature_value else "",
             last_updated_string,
         )
         result += table_row
@@ -152,7 +150,7 @@ def generate_data(
                 feature_env_data["feature_state_value_type"] = feature_state_value_type
             if type is not WebhookEventType.FEATURE_EXTERNAL_RESOURCE_REMOVED.value:
                 feature_env_data["environment_name"] = feature_state.environment.name
-                feature_env_data["feature_value"] = feature_state.enabled
+                feature_env_data["enabled"] = feature_state.enabled
                 feature_env_data["environment_api_key"] = (
                     feature_state.environment.api_key
                 )

api/tests/unit/features/test_unit_feature_external_resources_views.py

@@ -59,11 +59,11 @@ def test_create_feature_external_resource(
     expected_comment_body = (
         "**Flagsmith feature linked:** `feature_with_value`\n"
         + "Default Values:\n"
-        + "| Environment | Enabled | Value | Type | Updated (UTC) |\n"
-        + "| :--- | :----- | :------ | :------- | :------ |\n"
+        + "| Environment | Enabled | Value | Last Updated (UTC) |\n"
+        + "| :--- | :----- | :------ | :------ |\n"
         + f"| [Test Environment](https://example.com/project/{project.id}/"
         + f"environment/{environment.api_key}/features?feature={feature_with_value.id}&tab=value) "
-        + "| ❌ Disabled | `value` | unicode | Last Updated 01th Jan 2024 12:00AM |\n"
+        + "| ❌ Disabled | `value` | 2024-01-01 00:00:00 |\n"
     )
 
     feature_external_resource_data = {