Merge pull request #7325 from akatsoulas/platform-seg-tags

Send platform segmentation tags to ZD

Author: akatsoulas

kitsune/customercare/forms.py

@@ -12,9 +12,13 @@
 
 OS_CHOICES = [
     (None, _lazy("Select platform")),
-    ("win10", _lazy("Windows")),
-    ("mac", _lazy("Mac OS")),
-    ("linux", _lazy("Linux")),
+    ("win64", _lazy("Windows 64-bit")),
+    ("win_arm64", _lazy("Windows ARM64/AArch64")),
+    ("win32", _lazy("Windows 32-bit")),
+    ("mac", _lazy("macOS")),
+    ("linux64", _lazy("Linux 64-bit")),
+    ("linux_arm64", _lazy("Linux ARM64/AArch64")),
+    ("linux32", _lazy("Linux 32-bit")),
     ("android", _lazy("Android")),
     ("ios", _lazy("iOS")),
     ("other", _lazy("Other")),
@@ -42,6 +46,19 @@
     ("not_sure", "Not sure / Need help selecting"),
 ]
 
+OS_TAGS = {
+    "win64": "seg-platform-win64",
+    "win_arm64": "seg-platform-win-arm64",
+    "win32": "seg-platform-win32",
+    "mac": "seg-platform-mac",
+    "linux64": "seg-platform-linux64",
+    "linux_arm64": "seg-platform-linux-arm64",
+    "linux32": "seg-platform-linux32",
+    "android": "seg-platform-android",
+    "ios": "seg-platform-ios",
+    "other": "seg-platform-other",
+}
+
 UPDATE_CHANNEL_TAGS = {
     "esr": "seg-rel-esr",
     "rapid_release": "seg-rel-rapid-release",
@@ -195,6 +212,10 @@ def send(self, user, product):
                             else:
                                 zendesk_tags.append(tag_value)
 
+        if os := self.cleaned_data.get("os"):
+            if tag := OS_TAGS.get(os):
+                zendesk_tags.append(tag)
+
         if update_channel := self.cleaned_data.get("update_channel"):
             if tag := UPDATE_CHANNEL_TAGS.get(update_channel):
                 zendesk_tags.append(tag)

kitsune/customercare/tests/test_utils.py

@@ -228,7 +228,7 @@ def setUp(self):
         self.submission.description = "Test description"
         self.submission.category = "test"
         self.submission.email = "test@example.com"
-        self.submission.os = "win10"
+        self.submission.os = "win64"
         self.submission.country = "US"
         self.submission.update_channel = ""
         self.submission.policy_distribution = ""

kitsune/customercare/tests/test_zendesk.py

@@ -33,7 +33,7 @@ def test_create_ticket_includes_zendesk_tags_for_authenticated_user(self, mock_z
             "subject": "Test subject",
             "description": "Test description",
             "category": "accounts",
-            "os": "win10",
+            "os": "win64",
             "country": "US",
             "ticket_form_id": 456,
             "zendesk_tags": [
@@ -132,7 +132,7 @@ def test_create_ticket_without_zendesk_tags(self, mock_zenpy):
             "subject": "Test subject",
             "description": "Test description",
             "category": "accounts",
-            "os": "win10",
+            "os": "win64",
             "country": "US",
             "ticket_form_id": 456,
         }
@@ -169,7 +169,7 @@ def test_create_ticket_with_empty_zendesk_tags(self, mock_zenpy):
             "subject": "Test subject",
             "description": "Test description",
             "category": "accounts",
-            "os": "win10",
+            "os": "win64",
             "country": "US",
             "ticket_form_id": 456,
             "zendesk_tags": [],  # Empty list
@@ -241,7 +241,7 @@ def test_create_ticket_includes_deployment_fields(self, mock_zenpy):
             "subject": "Test subject",
             "description": "Test description",
             "category": "technical",
-            "os": "win10",
+            "os": "win64",
             "country": "US",
             "ticket_form_id": 456,
             "update_channel": "esr",
@@ -282,7 +282,7 @@ def test_create_ticket_omits_empty_deployment_fields(self, mock_zenpy):
             "subject": "Test subject",
             "description": "Test description",
             "category": "technical",
-            "os": "win10",
+            "os": "win64",
             "country": "US",
             "ticket_form_id": 456,
             "update_channel": "",
@@ -321,7 +321,7 @@ def test_create_ticket_includes_brand_id(self, mock_zenpy):
             "subject": "Test subject",
             "description": "Test description",
             "category": "technical",
-            "os": "win10",
+            "os": "win64",
             "country": "US",
             "ticket_form_id": 456,
             "brand_id": "360000001234",
@@ -355,7 +355,7 @@ def test_create_ticket_omits_brand_id_when_not_set(self, mock_zenpy):
             "subject": "Test subject",
             "description": "Test description",
             "category": "technical",
-            "os": "win10",
+            "os": "win64",
             "country": "US",
             "ticket_form_id": 456,
             "brand_id": "",