Merge lp:~akretion-team/openerp-connector-magento/7.0-export-partner-and-address into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0

[Florian da Costa]

I have completed the magentoerpconnect_export_partner module to fix the export of partners and add the export of addresses.

I have added a method '_after_export' in MagentoExporter so we do not need to manually add the magento bind address for each partner and contact.

I still have to implement some tests.

What do you think?

[lp:~akretion-team/openerp-connector-magento/7.0-export-partner-and-address]

1003. By Florian da Costa on 2014-06-12

[IMP] Add tests

[Florian da Costa (florian-dacosta)]

here, I have added the tests.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Hi Florian,

Thanks for your proposal.
I left some comments in the diff.

review: Needs Fixing

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

Also, you should take a look at: https://code.launchpad.net/~camptocamp/openerp-connector-magento/7.0-export-dependency+lock/+merge/223508
And use this branch as base, I left some comments in the diff where you should use some of my branch's features.

[Guewen Baconnier @ Camptocamp (gbaconnier-c2c)]

What about the password?

[lp:~akretion-team/openerp-connector-magento/7.0-export-partner-and-address]

1004. By Florian da Costa on 2014-06-23

[MERGE]

1005. By Florian da Costa on 2014-06-23

[FIX]Remove useless code + improve basic stuff to export partner

[lp:~akretion-team/openerp-connector-magento/7.0-export-partner-and-address]

1006. By Florian da Costa on 2014-06-24

[FIX] add change_by decorator on mapping methods

1007. By Florian da Costa on 2014-06-24

[FIX]change method _validate_data to make 2 different method, one for create a record, one for update + do not export a partner like an address if it is a company

1008. By Florian da Costa on 2014-09-10

[FIX] Remove password field, it will be handle by a wizard

Unmerged revisions

1008. By Florian da Costa on 2014-09-10

[FIX] Remove password field, it will be handle by a wizard

1007. By Florian da Costa on 2014-06-24

[FIX]change method _validate_data to make 2 different method, one for create a record, one for update + do not export a partner like an address if it is a company

1006. By Florian da Costa on 2014-06-24

[FIX] add change_by decorator on mapping methods

1005. By Florian da Costa on 2014-06-23

[FIX]Remove useless code + improve basic stuff to export partner

1004. By Florian da Costa on 2014-06-23

[MERGE]

1003. By Florian da Costa on 2014-06-12

[IMP] Add tests

1002. By Florian da Costa on 2014-06-11

[IMP] fix partner export + add address export

=== modified file 'magentoerpconnect/partner.py'
--- magentoerpconnect/partner.py	2014-05-26 09:37:00 +0000
+++ magentoerpconnect/partner.py	2014-06-12 13:48:52 +0000
@@ -78,7 +78,7 @@
     _inherits = {'res.partner': 'openerp_id'}
     _description = 'Magento Partner'
 
-    _rec_name = 'website_id'
+    _rec_name = 'name'
 
     def _get_mag_partner_from_website(self, cr, uid, ids, context=None):
         mag_partner_obj = self.pool['magento.res.partner']
@@ -568,6 +568,11 @@
                               [filters] if filters else [{}])]
 
 
+    def create(self, data):
+        """ Create a record on the external system """
+        partner_id = data.pop('partner_id')
+        return self._call('%s.create' % self._magento_model, [partner_id, data])
+
 @magento
 class AddressImport(MagentoImportSynchronizer):
     _model_name = ['magento.address']
@@ -624,6 +629,7 @@
         ('company', 'company'),
     ]
 
+
     @mapping
     def names(self, record):
         # TODO create a glue module for base_surname

=== modified file 'magentoerpconnect/unit/export_synchronizer.py'
--- magentoerpconnect/unit/export_synchronizer.py	2014-05-26 09:37:00 +0000
+++ magentoerpconnect/unit/export_synchronizer.py	2014-06-12 13:48:52 +0000
@@ -149,6 +149,10 @@
         """
         return self.mapper.map_record(self.binding_record)
 
+
+    def _after_export(self):
+        return True
+
     def _validate_data(self, data):
         """ Check if the values to import are correct
 
@@ -206,6 +210,7 @@
             if not record:
                 return _('Nothing to export.')
             self.magento_id = self._create(record)
+        self._after_export()
         return _('Record exported with ID %s on Magento.') % self.magento_id
 
 

=== modified file 'magentoerpconnect_export_partner/__init__.py'
--- magentoerpconnect_export_partner/__init__.py	2013-03-19 16:53:26 +0000
+++ magentoerpconnect_export_partner/__init__.py	2014-06-12 13:48:52 +0000
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
 
+import connector
 import consumer
 import partner

=== modified file 'magentoerpconnect_export_partner/consumer.py'
--- magentoerpconnect_export_partner/consumer.py	2013-10-09 19:41:58 +0000
+++ magentoerpconnect_export_partner/consumer.py	2014-06-12 13:48:52 +0000
@@ -28,8 +28,8 @@
 import openerp.addons.magentoerpconnect.consumer as magentoerpconnect
 
 
-@on_record_create(model_names='magento.res.partner')
-@on_record_write(model_names='magento.res.partner')
+@on_record_create(model_names=['magento.address', 'magento.res.partner'])
+@on_record_write(model_names=['magento.address', 'magento.res.partner'])
 def delay_export(session, model_name, record_id, vals):
     magentoerpconnect.delay_export(session, model_name,
                                    record_id, vals)
@@ -41,6 +41,19 @@
                                                 record_id, vals)
 
 
-@on_record_unlink(model_names='magento.res.partner')
+@on_record_write(model_names='res.partner')
+def delay_export_all_bindings_for_address(session, model_name, 
+                                          record_id, vals):
+    if session.context.get('connector_no_export'):
+        return
+    model = session.pool.get(model_name)
+    record = model.browse(session.cr, session.uid,
+                          record_id, context=session.context)
+    for binding in record.magento_address_bind_ids:
+        export_record.delay(session, binding._model._name, binding.id,
+                            vals)
+
+
+@on_record_unlink(model_names=['magento.res.partner', 'magento.address'])
 def delay_unlink(session, model_name, record_id):
     magentoerpconnect.delay_unlink(session, model_name, record_id)

=== modified file 'magentoerpconnect_export_partner/partner.py'
--- magentoerpconnect_export_partner/partner.py	2013-05-01 09:54:36 +0000
+++ magentoerpconnect_export_partner/partner.py	2014-06-12 13:48:52 +0000
@@ -23,34 +23,90 @@
 from openerp.addons.connector.unit.mapper import (mapping,
                                                   changed_by,
                                                   ExportMapper)
+from openerp.addons.connector.exception import InvalidDataError
 from openerp.addons.magentoerpconnect.unit.delete_synchronizer import (
         MagentoDeleteSynchronizer)
 from openerp.addons.magentoerpconnect.unit.export_synchronizer import (
         MagentoExporter)
+from openerp.addons.magentoerpconnect.partner import (
+        AddressAdapter)
 from openerp.addons.magentoerpconnect.backend import magento
 
 
 @magento
 class PartnerDeleteSynchronizer(MagentoDeleteSynchronizer):
     """ Partner deleter for Magento """
-    _model_name = ['magento.res.partner']
+    _model_name = ['magento.res.partner',
+                   'magento.address']
 
 
 @magento
 class PartnerExport(MagentoExporter):
     _model_name = ['magento.res.partner']
 
+    def _after_export(self):
+        address_ids = []
+        data = {
+            'magento_partner_id': self.binding_id,
+        }
+        if not self.binding_record.magento_address_bind_ids:
+            data['openerp_id'] = self.binding_record.openerp_id.id
+            data['is_default_billing'] = True
+            data['is_default_shipping'] = True
+            address_ids.append(self.session.create('magento.address', data))
+        for child in self.binding_record.child_ids:
+            if not child.magento_address_bind_ids:
+                data['is_default_billing'] = False
+                data['is_default_shipping'] = False
+                data['openerp_id'] = child.id
+                address_ids.append(self.session.create('magento.address', data))
+        return True
+
+
+    def _validate_data(self, data):
+        """ Check if the values to import are correct
+
+        Pro-actively check before the ``Model.create`` or
+        ``Model.update`` if some fields are missing
+
+        Raise `InvalidDataError`
+        """
+        if not data.get('email', False):
+            raise InvalidDataError("The partner does not have email "
+                                   "but it is mandatory for magento")
+        return
+
+
+@magento
+class AddressExport(MagentoExporter):
+    _model_name = ['magento.address']
+
+
+    def _validate_data(self, data):
+        """ Check if the values to import are correct
+
+        Pro-actively check before the ``Model.create`` or
+        ``Model.update`` if some fields are missing
+
+        Raise `InvalidDataError`
+        """
+        for required_key in ('city', 'street', 'postcode', 'country_id', 'telephone'):
+            if not data.get(required_key, False):
+                raise InvalidDataError("The address does not contain %s "
+                                       "but it is mandatory for magento" %
+                                       required_key)
+        return
+
 
 @magento
 class PartnerExportMapper(ExportMapper):
     _model_name = 'magento.res.partner'
 
     direct = [
-            ('emailid', 'email'),
+            ('email', 'email'),
             ('birthday', 'dob'),
             ('created_at', 'created_at'),
             ('updated_at', 'updated_at'),
-            ('emailid', 'email'),
             ('taxvat', 'taxvat'),
             ('group_id', 'group_id'),
             ('website_id', 'website_id'),
@@ -68,3 +124,57 @@
             lastname = record.name
             firstname = '-'
         return {'firstname': firstname, 'lastname': lastname}
+
+
+@magento
+class PartnerAddressExportMapper(ExportMapper):
+    _model_name = 'magento.address'
+ 
+    direct = [('zip', 'postcode'),
+              ('city', 'city'),
+              ('is_default_billing', 'is_default_billing'),
+              ('is_default_shipping', 'is_default_shipping'),
+              ]
+ 
+ 
+    @mapping
+    def partner(self, record):
+        return {'partner_id': int(record.magento_partner_id.magento_id)}
+ 
+
+    @mapping
+    def names(self, record):
+        # FIXME base_surname needed
+        if ' ' in record.name:
+            parts = record.name.split()
+            firstname = parts[0]
+            lastname = ' '.join(parts[1:])
+        else:
+            lastname = record.name
+            firstname = '-'
+        return {'firstname': firstname, 'lastname': lastname}
+ 
+
+    @mapping
+    def phone(self, record):
+        return {'telephone': record.phone or record.mobile}
+
+ 
+    @mapping
+    def country(self, record):
+        if record.country_id:
+            return {'country_id': record.country_id.code}
+ 
+ 
+    @mapping
+    def region(self, record):
+        if record.state_id:
+            return {'region': record.state_id.name}
+ 
+ 
+    @mapping
+    def street(self, record):
+        if record.street:
+            street = [record.street]
+            return {'street': street}
+

=== added directory 'magentoerpconnect_export_partner/tests'
=== added file 'magentoerpconnect_export_partner/tests/__init__.py'
--- magentoerpconnect_export_partner/tests/__init__.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_export_partner/tests/__init__.py	2014-06-12 13:48:52 +0000
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Florian da Costa
+#    Copyright 2014 Akretion
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+import test_synchronization
+
+fast_suite = [
+]
+
+checks = [
+    test_synchronization,
+]

=== added file 'magentoerpconnect_export_partner/tests/test_synchronization.py'
--- magentoerpconnect_export_partner/tests/test_synchronization.py	1970-01-01 00:00:00 +0000
+++ magentoerpconnect_export_partner/tests/test_synchronization.py	2014-06-12 13:48:52 +0000
@@ -0,0 +1,130 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    Author: Florian da Costa
+#    Copyright 2014 Akretion
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from openerp.addons.magentoerpconnect.tests.test_synchronization import (
+    SetUpMagentoSynchronized)
+from openerp.addons.magentoerpconnect.tests.test_data import (
+    magento_base_responses)
+from openerp.addons.magentoerpconnect.tests.common import (
+    mock_api,
+    mock_urlopen_image)
+from openerp.addons.magentoerpconnect.unit.export_synchronizer import (
+    export_record)
+
+
+class SetUpMagentoWithPartner(SetUpMagentoSynchronized):
+
+    def setUp(self):
+        super(SetUpMagentoWithPartner, self).setUp()
+        cr = self.cr
+        uid = self.uid
+        self.website_id = self.registry('magento.website').search(cr, uid, [
+            ('backend_id', '=', self.backend_id)])[0]
+        oe_partner_model = self.registry('res.partner')
+        country_id = self.registry('res.country').search(cr, uid, [
+            ('code', '=', 'BE')])[0]
+        self.partner_id = oe_partner_model.create(
+            cr, uid,
+            {'name': 'Partner Partner2',
+             'is_company': True,
+             'email': '[e-mail]',
+             'street': '15, test street',
+             'phone': '0000000000',
+             'zip': '00000',
+             'country_id': country_id,
+             'city': 'City test'})
+        self.contact_id = oe_partner_model.create(
+            cr, uid,
+            {'name': 'Contact',
+             'parent_id': self.partner_id,
+             'street': '15, contact test street',
+             'phone': '111111111',
+             'zip': '11111',
+             'country_id': country_id,
+             'city': 'City contact test'})
+
+
+class TestMagentoPartnerExport(SetUpMagentoWithPartner):
+    """ Test the export from a Magento Mock.
+    """
+
+    def test_1_export_partner(self):
+        """ Test export of partner"""
+        response = {
+            'customer.create': True,
+        }
+        cr = self.cr
+        uid = self.uid
+        with mock_api(response, key_func=lambda m, a: m) as calls_done:
+            mag_address_model = self.registry('magento.address')
+            mag_partner_model = self.registry('magento.res.partner')
+            mag_partner_id = mag_partner_model.create(cr, uid, {
+                'website_id': self.website_id,
+                'openerp_id': self.partner_id,
+                })
+            export_record(self.session, 'magento.res.partner', mag_partner_id)
+
+            self.assertEqual(len(calls_done), 1)
+            method, [values] = calls_done[0]
+            self.assertEqual(method, 'customer.create')
+            self.assertEqual(values['email'], '[e-mail]')
+            self.assertEqual(values['firstname'], 'Partner')
+            self.assertEqual(values['lastname'], 'Partner2')
+
+            mag_address_ids = mag_address_model.search(cr, uid, [
+            ('magento_partner_id', '=', mag_partner_id)])
+            self.assertEqual(len(mag_address_ids), 2)
+
+
+    def test_2_export_partner_address(self):
+        """ Test export of address"""
+        response = {
+            'customer_address.create': True,
+        }
+        cr = self.cr
+        uid = self.uid
+        with mock_api(response, key_func=lambda m, a: m) as calls_done:
+            mag_address_model = self.registry('magento.address')
+            mag_partner_model = self.registry('magento.res.partner')
+            mag_partner_id = mag_partner_model.create(cr, uid, {
+                'website_id': self.website_id,
+                'openerp_id': self.partner_id,
+                'magento_id': 1,
+                })
+            mag_address_id = mag_address_model.create(cr, uid, {
+                'magento_partner_id': mag_partner_id,
+                'openerp_id': self.partner_id,
+                })
+            export_record(self.session, 'magento.address', mag_address_id)
+
+            self.assertEqual(len(calls_done), 1)
+
+            method, [partner, values] = calls_done[0]
+
+            self.assertEqual(method, 'customer_address.create')
+            self.assertEqual(partner, 1)
+            self.assertEqual(values['postcode'], '00000')
+            self.assertEqual(values['city'], 'City test')
+            self.assertEqual(values['street'], '15, test street')
+            self.assertEqual(values['country_id'], 'BE')
+            self.assertEqual(values['telephone'], '0000000000')
+
+