fix: Move call to GitHub integration tasks out from trigger_feature_state_change_webhooks

api/features/signals.py

@@ -1,8 +1,14 @@
 import logging
+from dataclasses import asdict
 
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 
+from integrations.github.github import GithubData, generate_data
+from integrations.github.tasks import call_github_app_webhook_for_feature_state
+from organisations.models import Organisation
+from webhooks.webhooks import WebhookEventType
+
 # noinspection PyUnresolvedReferences
 from .models import FeatureState
 from .tasks import trigger_feature_state_change_webhooks
@@ -12,6 +18,34 @@
 
 @receiver(post_save, sender=FeatureState)
 def trigger_feature_state_change_webhooks_signal(instance, **kwargs):
+    # Enqueue Github integration tasks if feature has GitHub external resources
+    if (
+        not instance.identity_id
+        and not instance.feature_segment
+        and instance.feature.external_resources.exists()
+        and instance.environment.project.github_project.exists()
+        and hasattr(instance.environment.project.organisation, "github_config")
+    ):
+        github_configuration = (
+            Organisation.objects.prefetch_related("github_config")
+            .get(id=instance.environment.project.organisation_id)
+            .github_config.first()
+        )
+        feature_states = []
+        feature_states.append(instance)
+
+        feature_data: GithubData = generate_data(
+            github_configuration=github_configuration,
+            feature_id=instance.feature.id,
+            feature_name=instance.feature.name,
+            type=WebhookEventType.FLAG_UPDATED.value,
+            feature_states=feature_states,
+        )
+
+        call_github_app_webhook_for_feature_state.delay(
+            args=(asdict(feature_data),),
+        )
+
     if instance.environment_feature_version_id:
         return
     trigger_feature_state_change_webhooks(instance)

api/features/tasks.py

@@ -1,11 +1,7 @@
 import logging
-from dataclasses import asdict
 
 from environments.models import Webhook
 from features.models import Feature, FeatureState
-from integrations.github.github import GithubData, generate_data
-from integrations.github.tasks import call_github_app_webhook_for_feature_state
-from organisations.models import Organisation
 from task_processor.decorators import register_task_handler
 from webhooks.constants import WEBHOOK_DATETIME_FORMAT
 from webhooks.webhooks import (
@@ -59,39 +55,6 @@ def trigger_feature_state_change_webhooks(
         )
     )
 
-    if (
-        not instance.identity_id
-        and not instance.feature_segment
-        and instance.feature.external_resources.exists()
-        and instance.environment.project.github_project.exists()
-        and hasattr(instance.environment.project.organisation, "github_config")
-    ):
-        github_configuration = (
-            Organisation.objects.prefetch_related("github_config")
-            .get(id=instance.environment.project.organisationn_id)
-            .github_config.first()
-        )
-        feature_state = {
-            "environment_name": new_state["environment"]["name"],
-            "feature_value": new_state["enabled"],
-        }
-        feature_states = []
-        feature_states.append(instance)
-
-        feature_data: GithubData = generate_data(
-            github_configuration=github_configuration,
-            feature_id=history_instance.feature.id,
-            feature_name=history_instance.feature.name,
-            type=WebhookEventType.FLAG_UPDATED.value,
-            feature_states=feature_states,
-        )
-
-        feature_data.feature_states.append(feature_state)
-
-        call_github_app_webhook_for_feature_state.delay(
-            args=(asdict(feature_data),),
-        )
-
 
 def _get_previous_state(
     instance: FeatureState,