From 2d89c60ac5bbd6764b4668a05a809665069d3ef0 Mon Sep 17 00:00:00 2001
From: Artur Pragacz <49985303+arturpragacz@users.noreply.github.com>
Date: Fri, 8 Aug 2025 22:51:24 +0200
Subject: [PATCH] Improve service schemas in unifiprotect (#150236)

---
 .../components/unifiprotect/services.py       | 50 +++++++------------
 1 file changed, 19 insertions(+), 31 deletions(-)

diff --git a/homeassistant/components/unifiprotect/services.py b/homeassistant/components/unifiprotect/services.py
index 708a4883ddd..5a3dcc6ddfd 100644
--- a/homeassistant/components/unifiprotect/services.py
+++ b/homeassistant/components/unifiprotect/services.py
@@ -60,43 +60,31 @@ ALL_GLOBAL_SERIVCES = [
     SERVICE_GET_USER_KEYRING_INFO,
 ]
 
-DOORBELL_TEXT_SCHEMA = vol.All(
-    vol.Schema(
-        {
-            **cv.ENTITY_SERVICE_FIELDS,
-            vol.Required(ATTR_MESSAGE): cv.string,
-        },
-    ),
-    cv.has_at_least_one_key(ATTR_DEVICE_ID),
+DOORBELL_TEXT_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_DEVICE_ID): str,
+        vol.Required(ATTR_MESSAGE): cv.string,
+    },
 )
 
-CHIME_PAIRED_SCHEMA = vol.All(
-    vol.Schema(
-        {
-            **cv.ENTITY_SERVICE_FIELDS,
-            "doorbells": cv.TARGET_SERVICE_FIELDS,
-        },
-    ),
-    cv.has_at_least_one_key(ATTR_DEVICE_ID),
+CHIME_PAIRED_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_DEVICE_ID): str,
+        "doorbells": cv.ENTITY_SERVICE_FIELDS,
+    },
 )
 
-REMOVE_PRIVACY_ZONE_SCHEMA = vol.All(
-    vol.Schema(
-        {
-            **cv.ENTITY_SERVICE_FIELDS,
-            vol.Required(ATTR_NAME): cv.string,
-        },
-    ),
-    cv.has_at_least_one_key(ATTR_DEVICE_ID),
+REMOVE_PRIVACY_ZONE_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_DEVICE_ID): str,
+        vol.Required(ATTR_NAME): cv.string,
+    },
 )
 
-GET_USER_KEYRING_INFO_SCHEMA = vol.All(
-    vol.Schema(
-        {
-            **cv.ENTITY_SERVICE_FIELDS,
-        },
-    ),
-    cv.has_at_least_one_key(ATTR_DEVICE_ID),
+GET_USER_KEYRING_INFO_SCHEMA = vol.Schema(
+    {
+        vol.Required(ATTR_DEVICE_ID): str,
+    },
 )