17170 ContactGroup Serializer nested and fix related objects

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:

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'),
+                ),
+            ),
         }