From 748a61472bb979cb6afdae0a3b84d632040b6e1b Mon Sep 17 00:00:00 2001
From: Spitap <dev@asdrip.fr>
Date: Mon, 19 Jun 2023 14:44:43 +0200
Subject: [PATCH] few fixes

---
 .gitignore                          | 1 +
 docker-compose.yml                  | 9 +++++++--
 modoboa/admin/api/v1/serializers.py | 4 ++--
 modoboa/admin/api/v2/serializers.py | 2 +-
 modoboa/admin/models/mailbox.py     | 2 +-
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index fbe718e92..a67024e4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ node_modules
 
 # TOX stuff
 test_project/modoboa.db
+test_project/redis
 
 /.project
 /.pydevproject
diff --git a/docker-compose.yml b/docker-compose.yml
index d7c306b7c..08f81b488 100644
--- a/docker-compose.yml
+++ b/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:
diff --git a/modoboa/admin/api/v1/serializers.py b/modoboa/admin/api/v1/serializers.py
index d735455df..545028bdf 100644
--- a/modoboa/admin/api/v1/serializers.py
+++ b/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:
diff --git a/modoboa/admin/api/v2/serializers.py b/modoboa/admin/api/v2/serializers.py
index 4e0cec594..c4f12b446 100644
--- a/modoboa/admin/api/v2/serializers.py
+++ b/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):
diff --git a/modoboa/admin/models/mailbox.py b/modoboa/admin/models/mailbox.py
index f4159933f..25075b03e 100644
--- a/modoboa/admin/models/mailbox.py
+++ b/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)