From 363873dfcba399d45f1ee618cb294044c765eef5 Mon Sep 17 00:00:00 2001
From: ochlocracy <5885236+ochlocracy@users.noreply.github.com>
Date: Wed, 2 Oct 2019 18:55:01 -0400
Subject: [PATCH] Display Fan entity as Fan category in Alexa (#27135)

* Added Fan to display categories.

* Added Doorbell to display categories.

* Added Microwave to display categories.

* Added Security Panel to display categories.

* Updated FanCapabilities to use FAN display category.

* Updated Tests for FanCapabilities to use FAN display category.
---
 homeassistant/components/alexa/entities.py | 14 +++++++++++++-
 tests/components/alexa/test_smart_home.py  |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/homeassistant/components/alexa/entities.py b/homeassistant/components/alexa/entities.py
index f0d72af23d5..55b5878f667 100644
--- a/homeassistant/components/alexa/entities.py
+++ b/homeassistant/components/alexa/entities.py
@@ -76,9 +76,18 @@ class DisplayCategory:
     # Indicates a door.
     DOOR = "DOOR"
 
+    # Indicates a doorbell.
+    DOOR_BELL = "DOORBELL"
+
+    # Indicates a fan.
+    FAN = "FAN"
+
     # Indicates light sources or fixtures.
     LIGHT = "LIGHT"
 
+    # Indicates a microwave oven.
+    MICROWAVE = "MICROWAVE"
+
     # Indicates an endpoint that detects and reports motion.
     MOTION_SENSOR = "MOTION_SENSOR"
 
@@ -91,6 +100,9 @@ class DisplayCategory:
     # order is unimportant.    Applies to Scenes
     SCENE_TRIGGER = "SCENE_TRIGGER"
 
+    # Indicates a security panel.
+    SECURITY_PANEL = "SECURITY_PANEL"
+
     # Indicates an endpoint that locks.
     SMARTLOCK = "SMARTLOCK"
 
@@ -324,7 +336,7 @@ class FanCapabilities(AlexaEntity):
 
     def default_display_categories(self):
         """Return the display categories for this entity."""
-        return [DisplayCategory.OTHER]
+        return [DisplayCategory.FAN]
 
     def interfaces(self):
         """Yield the supported interfaces."""
diff --git a/tests/components/alexa/test_smart_home.py b/tests/components/alexa/test_smart_home.py
index 3cafa899024..e5e5b8ab7ae 100644
--- a/tests/components/alexa/test_smart_home.py
+++ b/tests/components/alexa/test_smart_home.py
@@ -308,7 +308,7 @@ async def test_fan(hass):
     appliance = await discovery_test(device, hass)
 
     assert appliance["endpointId"] == "fan#test_1"
-    assert appliance["displayCategories"][0] == "OTHER"
+    assert appliance["displayCategories"][0] == "FAN"
     assert appliance["friendlyName"] == "Test fan 1"
     assert_endpoint_capabilities(
         appliance, "Alexa.PowerController", "Alexa.EndpointHealth"
@@ -333,7 +333,7 @@ async def test_variable_fan(hass):
     appliance = await discovery_test(device, hass)
 
     assert appliance["endpointId"] == "fan#test_2"
-    assert appliance["displayCategories"][0] == "OTHER"
+    assert appliance["displayCategories"][0] == "FAN"
     assert appliance["friendlyName"] == "Test fan 2"
 
     assert_endpoint_capabilities(