pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX]mass mailing: performance issue on stats #469

Browse Source
This commit is contained in:
Anthony Muschang
2014-06-11 11:36:11 +02:00
parent 387093a34a
commit 9fc4ad99f0
1 changed files with 67 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/mass_mailing/mass_mailing.py
+67 -24
View File
@@ -37,15 +37,36 @@ class MassMailingCampaign(osv.Model):
def _get_statistics(self, cr, uid, ids, name, arg, context=None): def _get_statistics(self, cr, uid, ids, name, arg, context=None):
""" Compute statistics of the mass mailing campaign """ """ Compute statistics of the mass mailing campaign """
results = dict.fromkeys(ids, False) results = dict.fromkeys(ids, {
for campaign in self.browse(cr, uid, ids, context=context): 'sent': 0,
results[campaign.id] = { 'delivered': 0,
'sent': len(campaign.statistics_ids), 'opened': 0,
'replied': 0,
'bounced': 0,
})
cr.execute("""
SELECT
mass_mailing_id,
COUNT(id) AS sent,
COUNT(CASE WHEN bounced is null THEN 1 ELSE null END) AS delivered,
COUNT(CASE WHEN opened is not null THEN 1 ELSE null END) AS opened,
COUNT(CASE WHEN replied is not null THEN 1 ELSE null END) AS replied ,
COUNT(CASE WHEN bounced is not null THEN 1 ELSE null END) AS bounced
FROM
mail_mail_statistics
WHERE
mass_mailing_id IN %s
GROUP BY
mass_mailing_id
""", (tuple(ids), ))
for (campaign_id, sent, delivered, opened, replied, bounced) in cr.fetchall():
results[campaign_id] = {
'sent': sent,
# delivered: shouldn't be: all mails - (failed + bounced) ? # delivered: shouldn't be: all mails - (failed + bounced) ?
'delivered': len([stat for stat in campaign.statistics_ids if not stat.bounced]), # stat.state == 'sent' and 'delivered': delivered,
'opened': len([stat for stat in campaign.statistics_ids if stat.opened]), 'opened': opened,
'replied': len([stat for stat in campaign.statistics_ids if stat.replied]), 'replied': replied,
'bounced': len([stat for stat in campaign.statistics_ids if stat.bounced]), 'bounced': bounced,
} }
return results return results
@@ -53,14 +74,14 @@ class MassMailingCampaign(osv.Model):
""" Gather data about mass mailings to display them in kanban view as """ Gather data about mass mailings to display them in kanban view as
nested kanban views is not possible currently. """ nested kanban views is not possible currently. """
results = dict.fromkeys(ids, '') results = dict.fromkeys(ids, '')
for campaign in self.browse(cr, uid, ids, context=context): for campaign_id in ids:
mass_mailing_results = [] mass_mailing_results = []
for mass_mailing in campaign.mass_mailing_ids[:self._kanban_mailing_nbr]: mass_mailing_results = self.pool['mail.mass_mailing'].search_read(cr, uid,
mass_mailing_object = {} domain=[('mass_mailing_campaign_id', '=', campaign_id)],
for attr in ['name', 'sent', 'delivered', 'opened', 'replied', 'bounced']: fields=['name', 'sent', 'delivered', 'opened', 'replied', 'bounced'],
mass_mailing_object[attr] = getattr(mass_mailing, attr) limit=self._kanban_mailing_nbr,
mass_mailing_results.append(mass_mailing_object) context=context)
results[campaign.id] = mass_mailing_results results[campaign_id] = mass_mailing_results
return results return results
_columns = { _columns = {
@@ -195,15 +216,37 @@ class MassMailing(osv.Model):
return res return res
def _get_statistics(self, cr, uid, ids, name, arg, context=None): def _get_statistics(self, cr, uid, ids, name, arg, context=None):
""" Compute statistics of the mass mailing campaign """ """ Compute statistics of the mass mailing """
results = dict.fromkeys(ids, False) results = dict.fromkeys(ids, {
for mass_mailing in self.browse(cr, uid, ids, context=context): 'sent': 0,
results[mass_mailing.id] = { 'delivered': 0,
'sent': len(mass_mailing.statistics_ids), 'opened': 0,
'delivered': len([stat for stat in mass_mailing.statistics_ids if not stat.bounced]), # mail.state == 'sent' and 'replied': 0,
'opened': len([stat for stat in mass_mailing.statistics_ids if stat.opened]), 'bounced': 0,
'replied': len([stat for stat in mass_mailing.statistics_ids if stat.replied]), })
'bounced': len([stat for stat in mass_mailing.statistics_ids if stat.bounced]), cr.execute("""
SELECT
mass_mailing_id,
COUNT(id) AS sent,
COUNT(CASE WHEN bounced is null THEN 1 ELSE null END) AS delivered,
COUNT(CASE WHEN opened is not null THEN 1 ELSE null END) AS opened,
COUNT(CASE WHEN replied is not null THEN 1 ELSE null END) AS replied ,
COUNT(CASE WHEN bounced is not null THEN 1 ELSE null END) AS bounced
FROM
mail_mail_statistics
WHERE
mass_mailing_id IN %s
GROUP BY
mass_mailing_id
""", (tuple(ids), ))
for (campaign_id, sent, delivered, opened, replied, bounced) in cr.fetchall():
results[campaign_id] = {
'sent': sent,
# delivered: shouldn't be: all mails - (failed + bounced) ?
'delivered': delivered,
'opened': opened,
'replied': replied,
'bounced': bounced,
} }
return results return results