few fixes

.gitignore

@@ -26,6 +26,7 @@ node_modules
 
 # TOX stuff
 test_project/modoboa.db
+test_project/redis
 
 /.project
 /.pydevproject

docker-compose.yml

@@ -33,15 +33,17 @@ services:
       DB: "SQLITE"
       DEBUG: "True"
       REDIS_HOST: redis
+      REDIS_PORT: 6379
     command: >
-      sh -c "redis-server &
-             cd test_project
+      sh -c  "cd test_project
              python3 manage.py migrate
              python3 manage.py load_initial_data
              django-admin compilemessages
              python3 manage.py runserver 0:8000"
     volumes:
       - .:/code
+    depends_on:
+      - redis
 
   front:
     container_name: modoboa_front
@@ -58,3 +60,6 @@ services:
       DOCKER: "yes"
     depends_on:
       - api
+
+volumes:
+  redis-cache:

modoboa/admin/api/v1/serializers.py

@@ -155,8 +155,8 @@ class MailboxSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.Mailbox
         fields = (
-            "pk", "full_address", "use_domain_quota", "quota",
-            "quota_usage", "message_limit"
+            "pk", "full_address", "use_domain_quota", "quota", "message_limit",
+            "quota_usage"
         )
 
     def get_quota_usage(self, mb) -> int:

modoboa/admin/api/v2/serializers.py

@@ -392,7 +392,7 @@ class MailboxSerializer(serializers.ModelSerializer):
     class Meta:
         model = models.Mailbox
         fields = (
-            "pk", "use_domain_quota", "quota", "message_limit"
+            "pk", "use_domain_quota", "quota", "message_limit",
         )
 
     def validate_quota(self, value):

modoboa/admin/models/mailbox.py

@@ -322,7 +322,7 @@ class Mailbox(mixins.MessageLimitMixin, AdminObject):
                 not user.userobjectlimit_set.get(name="quota").max_value
             )
             self.set_quota(values["quota"], override_rules)
-        if values.get("message_limit", "absent") != "absent":
+        if "message_limit" in values:
             self.message_limit = values["message_limit"]
         if newaddress:
             self.rename(local_part, domain)