Merge pull request #1529 from modoboa/feature/api_domain_stats

Added counters to domain serializer.
This commit is contained in:
Antoine Nguyen
2018-07-11 15:24:03 +02:00
committed by GitHub
2 changed files with 8 additions and 4 deletions
+5 -3
View File
@@ -26,7 +26,6 @@ from . import lib, models
class DomainSerializer(serializers.ModelSerializer):
"""Base Domain serializer."""
class Meta:
@@ -34,9 +33,12 @@ class DomainSerializer(serializers.ModelSerializer):
fields = (
"pk", "name", "quota", "default_mailbox_quota", "enabled", "type",
"enable_dkim", "dkim_key_selector", "dkim_key_length",
"dkim_public_key", "dkim_private_key_path"
"dkim_public_key", "dkim_private_key_path",
"mailbox_count", "mbalias_count", "domainalias_count"
)
read_only_fields = (
"pk", "mailbox_count", "mbalias_count", "domainalias_count"
)
read_only_fields = ("pk", )
def validate_name(self, value):
"""Check name constraints."""
+3 -1
View File
@@ -49,8 +49,10 @@ class DomainAPITestCase(ModoAPITestCase):
url = reverse(
"api:domain-detail", args=[domain["pk"]])
response = self.client.get(url)
data = response.json()
self.assertEqual(response.status_code, 200)
self.assertEqual(response.data["name"], domain["name"])
self.assertEqual(data["name"], domain["name"])
self.assertEqual(data["mailbox_count"], 2)
def test_create_domain(self):
"""Check domain creation."""