From c7827c796025915a21317e03ff629c070d7c38d1 Mon Sep 17 00:00:00 2001
From: Arthur <worldnomad@gmail.com>
Date: Wed, 12 Mar 2025 13:06:53 -0700
Subject: [PATCH] 17170 update api, detail view, graphql

---
 netbox/templates/tenancy/contact.html       | 8 ++++++--
 netbox/tenancy/api/serializers_/contacts.py | 2 +-
 netbox/tenancy/graphql/types.py             | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/netbox/templates/tenancy/contact.html b/netbox/templates/tenancy/contact.html
index b2d1a4078..cf94c9451 100644
--- a/netbox/templates/tenancy/contact.html
+++ b/netbox/templates/tenancy/contact.html
@@ -18,8 +18,12 @@
         <h2 class="card-header">{% trans "Contact" %}</h2>
         <table class="table table-hover attr-table">
           <tr>
-            <th scope="row">{% trans "Group" %}</th>
-            <td>{{ object.group|linkify|placeholder }}</td>
+            <th scope="row">{% trans "Groups" %}</th>
+            <td>
+              {% for group in object.groups.all %}
+                {{ group|linkify|placeholder }}{% if not forloop.last %}, {% endif %}
+              {% endfor %}
+            </td>
           </tr>
           <tr>
             <th scope="row">{% trans "Name" %}</th>
diff --git a/netbox/tenancy/api/serializers_/contacts.py b/netbox/tenancy/api/serializers_/contacts.py
index 8c24df734..a36a49ce9 100644
--- a/netbox/tenancy/api/serializers_/contacts.py
+++ b/netbox/tenancy/api/serializers_/contacts.py
@@ -43,7 +43,7 @@ class ContactRoleSerializer(NetBoxModelSerializer):
 
 
 class ContactSerializer(NetBoxModelSerializer):
-    group = ContactGroupSerializer(nested=True, required=False, allow_null=True, default=None)
+    groups = ContactGroupSerializer(many=True, nested=True, required=False, allow_null=True, default=None)
 
     class Meta:
         model = Contact
diff --git a/netbox/tenancy/graphql/types.py b/netbox/tenancy/graphql/types.py
index c340cdf7c..b47ac2da3 100644
--- a/netbox/tenancy/graphql/types.py
+++ b/netbox/tenancy/graphql/types.py
@@ -97,7 +97,7 @@ class TenantGroupType(OrganizationalObjectType):
 
 @strawberry_django.type(models.Contact, fields='__all__', filters=ContactFilter)
 class ContactType(ContactAssignmentsMixin, NetBoxObjectType):
-    group: Annotated['ContactGroupType', strawberry.lazy('tenancy.graphql.types')] | None
+    groups: List[Annotated['ContactGroupType', strawberry.lazy('tenancy.graphql.types')]]
 
 
 @strawberry_django.type(models.ContactRole, fields='__all__', filters=ContactRoleFilter)