From 96cbf4d6fc6426f26815afc2ec6ff2a2487dfbac Mon Sep 17 00:00:00 2001
From: Guewen Baconnier <guewen.baconnier@camptocamp.com>
Date: Fri, 18 Sep 2015 10:43:38 +0200
Subject: [PATCH] Optimization: make only 1 call to write per revision

Instead of 1 write per change
---
 .../models/res_partner_revision.py            | 36 +++++++++++++------
 partner_revision/tests/test_revision_flow.py  | 22 ++++++++++++
 2 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/partner_revision/models/res_partner_revision.py b/partner_revision/models/res_partner_revision.py
index adcd78ad7..4ecb3bfd1 100644
--- a/partner_revision/models/res_partner_revision.py
+++ b/partner_revision/models/res_partner_revision.py
@@ -19,7 +19,9 @@
 #
 #
 
+from itertools import groupby
 from lxml import etree
+from operator import attrgetter
 
 from openerp import models, fields, api, exceptions, _
 from openerp.osv.orm import setup_modifiers
@@ -245,12 +247,29 @@ class ResPartnerRevisionChange(models.Model):
 
     @api.multi
     def apply(self):
-        # TODO: optimize with 1 write for all fields, group by revision
-        for change in self:
-            if change.state in ('cancel', 'done'):
+        """ Apply the change on the revision's partner
+
+        It is optimized thus that it makes only one write on the partner
+        per revision if many changes are applied at once.
+        """
+        changes_ok = self.browse()
+        key = attrgetter('revision_id')
+        for revision, changes in groupby(self.sorted(key=key), key=key):
+            values = {}
+            partner = revision.partner_id
+            for change in changes:
+                if change.state in ('cancel', 'done'):
+                    continue
+
+                value_for_write = change._convert_value_for_write(
+                    change.get_new_value()
+                )
+                values[change.field_id.name] = value_for_write
+                changes_ok |= change
+
+            if not values:
                 continue
 
-            revision = change.revision_id
             previous_revisions = self.env['res.partner.revision'].search(
                 [('date', '<', revision.date),
                  ('state', '=', 'draft'),
@@ -266,15 +285,12 @@ class ResPartnerRevisionChange(models.Model):
                       'this one.')
                 )
 
-            partner = revision.partner_id
-            value_for_write = change._convert_value_for_write(
-                change.get_new_value()
-            )
-            partner.write({change.field_id.name: value_for_write})
-            change.write({'state': 'done'})
+            partner.write(values)
+        changes_ok.write({'state': 'done'})
 
     @api.multi
     def cancel(self):
+        """ Reject the change """
         if any(change.state == 'done' for change in self):
             raise exceptions.Warning(
                 _('This change has already be applied.')
diff --git a/partner_revision/tests/test_revision_flow.py b/partner_revision/tests/test_revision_flow.py
index 9bf9964fc..2fc18d2f6 100644
--- a/partner_revision/tests/test_revision_flow.py
+++ b/partner_revision/tests/test_revision_flow.py
@@ -227,3 +227,25 @@ class TestRevisionFlow(RevisionMixin, common.TransactionCase):
         revision = self._create_revision(self.partner, changes)
         with self.assertRaises(exceptions.Warning):
             revision.change_ids.apply()
+
+    def test_apply_different_revisions(self):
+        """ Apply different revisions at once """
+        partner2 = self.env['res.partner'].create({'name': 'P2'})
+        changes = [
+            (self.field_name, 'Y', 'draft'),
+            (self.field_street, 'street Y', 'draft'),
+            (self.field_street2, 'street2 Y', 'draft'),
+        ]
+        revision = self._create_revision(self.partner, changes)
+        revision2 = self._create_revision(partner2, changes)
+        self.assertEqual(revision.state, 'draft')
+        self.assertEqual(revision2.state, 'draft')
+        (revision + revision2).apply()
+        self.assertEqual(self.partner.name, 'Y')
+        self.assertEqual(self.partner.street, 'street Y')
+        self.assertEqual(self.partner.street2, 'street2 Y')
+        self.assertEqual(partner2.name, 'Y')
+        self.assertEqual(partner2.street, 'street Y')
+        self.assertEqual(partner2.street2, 'street2 Y')
+        self.assertEqual(revision.state, 'done')
+        self.assertEqual(revision2.state, 'done')