[IMP] Speed installation time and discard concurrent events

mail_tracking/__init__.py

@@ -5,4 +5,4 @@
 
 from . import models
 from . import controllers
-from .hooks import post_init_hook
+from .hooks import pre_init_hook

mail_tracking/__openerp__.py

@@ -5,7 +5,7 @@
 {
     "name": "Email tracking",
     "summary": "Email tracking system for all mails sent",
-    "version": "8.0.2.0.0",
+    "version": "8.0.2.0.1",
     "category": "Social Network",
     "website": "http://www.tecnativa.com",
     "author": "Tecnativa, "
@@ -28,5 +28,5 @@
     "qweb": [
         "static/src/xml/mail_tracking.xml",
     ],
-    "post_init_hook": "post_init_hook",
+    "pre_init_hook": "pre_init_hook",
 }

mail_tracking/hooks.py

@@ -8,17 +8,29 @@
 _logger = logging.getLogger(__name__)
 
 
-def post_init_hook(cr, registry):
-    with api.Environment.manage():
-        env = api.Environment(cr, SUPERUSER_ID, {})
-        # Recalculate all partner tracking_email_ids
-        partners = env['res.partner'].search([
-            ('email', '!=', False),
-        ])
-        emails = partners.mapped('email')
-        _logger.info(
-            "Recalculating 'tracking_email_ids' in 'res.partner' "
-            "model for %d email addresses", len(emails))
-        for email in emails:
-            env['mail.tracking.email'].tracking_ids_recalculate(
-                'res.partner', 'email', 'tracking_email_ids', email)
+def column_exists(cr, table, column):
+    cr.execute("""
+        SELECT column_name
+        FROM information_schema.columns
+        WHERE table_name = %s AND column_name = %s""", (table, column))
+    return bool(cr.fetchall())
+
+
+def column_add_with_value(cr, table, column, field_type, value):
+    if not column_exists(cr, table, column):
+        cr.execute("""
+            ALTER TABLE %s
+            ADD COLUMN %s %s""", (table, column, field_type))
+        cr.execute("""
+            UPDATE %s SET %s = %s""", (table, column, value))
+
+
+def pre_init_hook(cr):
+    _logger.info("Creating res.partner.tracking_emails_count column "
+                 "with value 0")
+    column_add_with_value(
+        cr, 'res_partner', 'tracking_emails_count', 'integer', 0)
+    _logger.info("Creating res.partner.email_score column "
+                 "with value 50.0")
+    column_add_with_value(
+        cr, 'res_partner', 'email_score', 'double precision', 50.0)

mail_tracking/models/mail_tracking_email.py

@@ -13,6 +13,9 @@
 
 _logger = logging.getLogger(__name__)
 
+EVENT_OPEN_DELTA = 10
+EVENT_CLICK_DELTA = 5
+
 
 class MailTrackingEmail(models.Model):
     _name = "mail.tracking.email"
@@ -256,13 +259,36 @@ def _event_prepare(self, event_type, metadata):
             _logger.info('Unknown event type: %s' % event_type)
         return False
 
+    def _concurrent_events(self, event_type, metadata):
+        m_event = self.env['mail.tracking.event']
+        self.ensure_one()
+        concurrent_event_ids = False
+        if event_type in {'open', 'click'}:
+            ts = metadata.get('timestamp', time.time())
+            delta = EVENT_OPEN_DELTA if event_type == 'open' \
+                else EVENT_CLICK_DELTA
+            domain = [
+                ('timestamp', '>=', ts - delta),
+                ('timestamp', '<=', ts + delta),
+                ('tracking_email_id', '=', self.id),
+                ('event_type', '=', event_type),
+            ]
+            if event_type == 'click':
+                domain.append(('url', '=', metadata.get('url', False)))
+            concurrent_event_ids = m_event.search(domain)
+        return concurrent_event_ids
+
     @api.multi
     def event_create(self, event_type, metadata):
         event_ids = self.env['mail.tracking.event']
         for tracking_email in self:
-            vals = tracking_email._event_prepare(event_type, metadata)
-            if vals:
-                event_ids += event_ids.sudo().create(vals)
+            other_ids = tracking_email._concurrent_events(event_type, metadata)
+            if not other_ids:
+                vals = tracking_email._event_prepare(event_type, metadata)
+                if vals:
+                    event_ids += event_ids.sudo().create(vals)
+            else:
+                _logger.info("Concurrent event '%s' discarded", event_type)
         return event_ids
 
     @api.model

mail_tracking/tests/test_mail_tracking.py

@@ -4,6 +4,7 @@
 
 import mock
 import base64
+import time
 from openerp.tests.common import TransactionCase
 from openerp.addons.mail_tracking.controllers.main import \
     MailTrackingController, BLANK
@@ -114,6 +115,77 @@ def test_mail_send(self):
             res = controller.mail_tracking_open(db, tracking.id)
             self.assertEqual(image, res.response[0])
 
+    def test_concurrent_open(self):
+        mail, tracking = self.mail_send()
+        ts = time.time()
+        metadata = {
+            'ip': '127.0.0.1',
+            'user_agent': 'Odoo Test/1.0',
+            'os_family': 'linux',
+            'ua_family': 'odoo',
+            'timestamp': ts,
+        }
+        # First open event
+        tracking.event_create('open', metadata)
+        opens = tracking.tracking_event_ids.filtered(
+            lambda r: r.event_type == 'open'
+        )
+        self.assertEqual(len(opens), 1)
+        # Concurrent open event
+        metadata['timestamp'] = ts + 2
+        tracking.event_create('open', metadata)
+        opens = tracking.tracking_event_ids.filtered(
+            lambda r: r.event_type == 'open'
+        )
+        self.assertEqual(len(opens), 1)
+        # Second open event
+        metadata['timestamp'] = ts + 350
+        tracking.event_create('open', metadata)
+        opens = tracking.tracking_event_ids.filtered(
+            lambda r: r.event_type == 'open'
+        )
+        self.assertEqual(len(opens), 2)
+
+    def test_concurrent_click(self):
+        mail, tracking = self.mail_send()
+        ts = time.time()
+        metadata = {
+            'ip': '127.0.0.1',
+            'user_agent': 'Odoo Test/1.0',
+            'os_family': 'linux',
+            'ua_family': 'odoo',
+            'timestamp': ts,
+            'url': 'https://www.example.com/route/1',
+        }
+        # First click event (URL 1)
+        tracking.event_create('click', metadata)
+        opens = tracking.tracking_event_ids.filtered(
+            lambda r: r.event_type == 'click'
+        )
+        self.assertEqual(len(opens), 1)
+        # Concurrent click event (URL 1)
+        metadata['timestamp'] = ts + 2
+        tracking.event_create('click', metadata)
+        opens = tracking.tracking_event_ids.filtered(
+            lambda r: r.event_type == 'click'
+        )
+        self.assertEqual(len(opens), 1)
+        # Second click event (URL 1)
+        metadata['timestamp'] = ts + 350
+        tracking.event_create('click', metadata)
+        opens = tracking.tracking_event_ids.filtered(
+            lambda r: r.event_type == 'click'
+        )
+        self.assertEqual(len(opens), 2)
+        # Concurrent click event (URL 2)
+        metadata['timestamp'] = ts + 2
+        metadata['url'] = 'https://www.example.com/route/2'
+        tracking.event_create('click', metadata)
+        opens = tracking.tracking_event_ids.filtered(
+            lambda r: r.event_type == 'click'
+        )
+        self.assertEqual(len(opens), 3)
+
     def test_smtp_error(self):
         with mock.patch(mock_send_email) as mock_func:
             mock_func.side_effect = Warning('Test error')