simple-login/app
1
1
Fork 0
mirror of https://github.com/simple-login/app.git synced 2024-11-18 06:31:27 +08:00
Code Issues Projects Releases Packages Wiki Activity

add mailbox to AliasInfo

Browse source
This commit is contained in:
Son NK 2020-04-25 11:14:17 +02:00
parent 5839c637f6
commit 1c9d953044
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/api/serializer.py
View file

@ -2,6 +2,7 @@ from dataclasses import dataclass
from arrow import Arrow from arrow import Arrow
from sqlalchemy import or_, func, case from sqlalchemy import or_, func, case
from sqlalchemy.orm import joinedload
from app.config import PAGE_LIMIT from app.config import PAGE_LIMIT
from app.extensions import db from app.extensions import db
@ -11,6 +12,7 @@ from app.models import Alias, Contact, EmailLog, Mailbox
@dataclass @dataclass
class AliasInfo: class AliasInfo:
alias: Alias alias: Alias
mailbox: Mailbox
nb_forward: int nb_forward: int
nb_blocked: int nb_blocked: int
@ -89,6 +91,7 @@ def get_alias_infos_with_pagination(user, page_id=0, query=None) -> [AliasInfo]:
ret = [] ret = []
q = ( q = (
db.session.query(Alias) db.session.query(Alias)
.options(joinedload(Alias.mailbox))
.filter(Alias.user_id == user.id) .filter(Alias.user_id == user.id)
.order_by(Alias.created_at.desc()) .order_by(Alias.created_at.desc())
) )
@ -120,6 +123,7 @@ def get_alias_infos_with_pagination_v2(user, page_id=0, query=None) -> [AliasInf
q = ( q = (
db.session.query(Alias, latest_activity) db.session.query(Alias, latest_activity)
.options(joinedload(Alias.mailbox))
.join(Contact, Alias.id == Contact.alias_id, isouter=True) .join(Contact, Alias.id == Contact.alias_id, isouter=True)
.join(EmailLog, Contact.id == EmailLog.contact_id, isouter=True) .join(EmailLog, Contact.id == EmailLog.contact_id, isouter=True)
.filter(Alias.user_id == user.id) .filter(Alias.user_id == user.id)
@ -147,7 +151,9 @@ def get_alias_info(alias: Alias) -> AliasInfo:
.filter(EmailLog.contact_id == Contact.id) .filter(EmailLog.contact_id == Contact.id)
) )
alias_info = AliasInfo(alias=alias, nb_blocked=0, nb_forward=0, nb_reply=0,) alias_info = AliasInfo(
alias=alias, nb_blocked=0, nb_forward=0, nb_reply=0, mailbox=alias.mailbox
)
for _, el in q: for _, el in q:
if el.is_reply: if el.is_reply:
@ -171,7 +177,9 @@ def get_alias_info_v2(alias: Alias) -> AliasInfo:
latest_email_log = None latest_email_log = None
latest_contact = None latest_contact = None
alias_info = AliasInfo(alias=alias, nb_blocked=0, nb_forward=0, nb_reply=0,) alias_info = AliasInfo(
alias=alias, nb_blocked=0, nb_forward=0, nb_reply=0, mailbox=alias.mailbox
)
for contact, email_log in q: for contact, email_log in q:
if email_log.is_reply: if email_log.is_reply: