From 83e540d1d47ba804640e3ac3c4c8d1d290734968 Mon Sep 17 00:00:00 2001
From: Son NK <>
Date: Fri, 5 Jun 2020 22:30:32 +0200
Subject: [PATCH] Create directory alias with directory mailboxes

---
 app/alias_utils.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/alias_utils.py b/app/alias_utils.py
index 4c7dd500..3fe21748 100644
--- a/app/alias_utils.py
+++ b/app/alias_utils.py
@@ -18,6 +18,7 @@ from app.models import (
     User,
     DeletedAlias,
     DomainDeletedAlias,
+    AliasMailbox,
 )
 
 
@@ -65,12 +66,19 @@ def try_auto_create_directory(address: str) -> Optional[Alias]:
         try:
             LOG.d("create alias %s for directory %s", address, directory)
 
+            mailboxes = directory.mailboxes
+
             alias = Alias.create(
                 email=address,
                 user_id=directory.user_id,
                 directory_id=directory.id,
-                mailbox_id=dir_user.default_mailbox_id,
+                mailbox_id=mailboxes[0].id,
             )
+            db.session.flush()
+            for i in range(1, len(mailboxes)):
+                AliasMailbox.create(
+                    alias_id=alias.id, mailbox_id=mailboxes[i].id,
+                )
 
             db.session.commit()
             return alias