Merge pull request #7284 from akatsoulas/zd-segmentation-tags

Add segmentation tags for Enterprise

Author: akatsoulas

kitsune/customercare/forms.py

@@ -42,6 +42,23 @@
     ("not_sure", "Not sure / Need help selecting"),
 ]
 
+UPDATE_CHANNEL_TAGS = {
+    "esr": "seg-rel-esr",
+    "rapid_release": "seg-rel-rapid-release",
+    "full_release": "seg-rel-full-release",
+    "beta": "seg-rel-beta",
+    "other": "seg-rel-channel-other",
+}
+
+POLICY_DISTRIBUTION_TAGS = {
+    "group_policy_admx": "seg-policy-windows-gpo",
+    "windows_mdm": "seg-policy-windows-mdm",
+    "macos_config_profiles": "seg-policy-macos-config-profiles",
+    "policies_json": "seg-policy-json",
+    "autoconfig": "seg-policy-autoconfig",
+    "not_sure": "seg-policy-dist-other",
+}
+
 ZENDESK_PRODUCT_SLUGS = {v: k for k, v in PRODUCT_SLUG_ALIASES.items()}
 
 
@@ -178,6 +195,14 @@ def send(self, user, product):
                             else:
                                 zendesk_tags.append(tag_value)
 
+        if update_channel := self.cleaned_data.get("update_channel"):
+            if tag := UPDATE_CHANNEL_TAGS.get(update_channel):
+                zendesk_tags.append(tag)
+
+        if policy_distribution := self.cleaned_data.get("policy_distribution"):
+            if tag := POLICY_DISTRIBUTION_TAGS.get(policy_distribution):
+                zendesk_tags.append(tag)
+
         if settings.STAGE:
             zendesk_tags.append("stage")
 

kitsune/customercare/tests/test_forms.py

@@ -2,7 +2,11 @@
 
 from django.contrib.auth.models import AnonymousUser
 
-from kitsune.customercare.forms import ZendeskForm
+from kitsune.customercare.forms import (
+    POLICY_DISTRIBUTION_TAGS,
+    UPDATE_CHANNEL_TAGS,
+    ZendeskForm,
+)
 from kitsune.customercare.models import SupportTicket
 from kitsune.products.tests import (
     ProductFactory,
@@ -512,3 +516,72 @@ def test_send_stores_deployment_fields(self, mock_task):
         self.assertEqual(submission.update_channel, "esr")
         self.assertEqual(submission.policy_distribution, "group_policy_admx")
         mock_task.assert_called_once_with(submission.id)
+
+    @patch("kitsune.customercare.tasks.zendesk_submission_classifier.delay")
+    def test_send_appends_update_channel_segmentation_tag(self, mock_task):
+        """Test that update_channel value is mapped to its segmentation tag."""
+        self.vpn_zendesk.enable_deployment_fields = True
+        self.vpn_zendesk.save()
+
+        for channel, expected_tag in UPDATE_CHANNEL_TAGS.items():
+            with self.subTest(channel=channel):
+                form = ZendeskForm(
+                    data={
+                        "email": "test@example.com",
+                        "category": "vpn-connection-issues",
+                        "subject": "Test subject",
+                        "description": "Test description",
+                        "update_channel": channel,
+                        "policy_distribution": "group_policy_admx",
+                    },
+                    product=self.vpn_product,
+                    user=self.user,
+                )
+                self.assertTrue(form.is_valid())
+                submission = form.send(self.user, self.vpn_product)
+                self.assertIn(expected_tag, submission.zendesk_tags)
+
+    @patch("kitsune.customercare.tasks.zendesk_submission_classifier.delay")
+    def test_send_appends_policy_distribution_segmentation_tag(self, mock_task):
+        """Test that policy_distribution value is mapped to its segmentation tag."""
+        self.vpn_zendesk.enable_deployment_fields = True
+        self.vpn_zendesk.save()
+
+        for distribution, expected_tag in POLICY_DISTRIBUTION_TAGS.items():
+            with self.subTest(distribution=distribution):
+                form = ZendeskForm(
+                    data={
+                        "email": "test@example.com",
+                        "category": "vpn-connection-issues",
+                        "subject": "Test subject",
+                        "description": "Test description",
+                        "update_channel": "esr",
+                        "policy_distribution": distribution,
+                    },
+                    product=self.vpn_product,
+                    user=self.user,
+                )
+                self.assertTrue(form.is_valid())
+                submission = form.send(self.user, self.vpn_product)
+                self.assertIn(expected_tag, submission.zendesk_tags)
+
+    @patch("kitsune.customercare.tasks.zendesk_submission_classifier.delay")
+    def test_send_no_deployment_tags_when_fields_empty(self, mock_task):
+        """Test that no deployment segmentation tags are added when fields are empty."""
+        form = ZendeskForm(
+            data={
+                "email": "test@example.com",
+                "category": "vpn-connection-issues",
+                "subject": "Test subject",
+                "description": "Test description",
+            },
+            product=self.vpn_product,
+            user=self.user,
+        )
+        self.assertTrue(form.is_valid())
+        submission = form.send(self.user, self.vpn_product)
+
+        for tag in UPDATE_CHANNEL_TAGS.values():
+            self.assertNotIn(tag, submission.zendesk_tags)
+        for tag in POLICY_DISTRIBUTION_TAGS.values():
+            self.assertNotIn(tag, submission.zendesk_tags)

kitsune/tags/migrations/0002_auto_20241115_0241.py

@@ -180,6 +180,19 @@
     ("VPN::Unsupported::No OS Named", "seg-vpn-unsup-none"),
     ("VPN::Unsupported::Hardware", "seg-vpn-unsup-hrdware"),
     ("VPN::Unsupported::Windows", "seg-vpn-unsup-win"),
+    # Update Channel segmentation tags
+    ("Release channel: ESR", "seg-rel-esr"),
+    ("Release channel: Rapid Release", "seg-rel-rapid-release"),
+    ("Release channel: Full Release", "seg-rel-full-release"),
+    ("Release channel: Beta", "seg-rel-beta"),
+    ("Release channel: Other", "seg-rel-channel-other"),
+    # Policy Distribution segmentation tags
+    ("Policy distribution: Windows Group Policy (ADMX)", "seg-policy-windows-gpo"),
+    ("Policy distribution: Windows MDM", "seg-policy-windows-mdm"),
+    ("Policy distribution: macOS Configuration Profiles", "seg-policy-macos-config-profiles"),
+    ("Policy distribution: policies.json", "seg-policy-json"),
+    ("Policy distribution: Autoconfig", "seg-policy-autoconfig"),
+    ("Policy distribution: Not sure / Need help selecting", "seg-policy-dist-other"),
 ]