From 978b5b0ed607e4247923f985e9e43fdb0fb5f4a4 Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Fri, 11 Apr 2025 10:21:55 -0700
Subject: [PATCH] 17170 ContactGroup Serializer nested and fix related objects

---
 netbox/tenancy/api/serializers_/contacts.py | 3 ++-
 netbox/tenancy/views.py                     | 8 +++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/netbox/tenancy/api/serializers_/contacts.py b/netbox/tenancy/api/serializers_/contacts.py
index 7fc6a15e6..fd4d1ac8e 100644
--- a/netbox/tenancy/api/serializers_/contacts.py
+++ b/netbox/tenancy/api/serializers_/contacts.py
@@ -47,7 +47,8 @@ class ContactSerializer(NetBoxModelSerializer):
         queryset=ContactGroup.objects.all(),
         serializer=ContactGroupSerializer,
         required=False,
-        many=True
+        many=True,
+        nested=True
     )
 
     class Meta:
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index dd584d745..21c2bd66e 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -164,7 +164,13 @@ class ContactGroupView(GetRelatedModelsMixin, generic.ObjectView):
         groups = instance.get_descendants(include_self=True)
 
         return {
-            'related_models': self.get_related_models(request, groups),
+            'related_models': self.get_related_models(
+                request,
+                groups,
+                extra=(
+                    (Contact.objects.restrict(request.user, 'view').filter(groups__in=groups), 'group_id'),
+                ),
+            ),
         }