Merge pull request #81 from PritishC/feature/task-7084

Refactored StoreView to use AR pattern on find_and_create() #7084
openlabs · Mar 16, 2015 · 8fcd7f8 · 8fcd7f8
2 parents 28d8fdf + 12c1400
commit 8fcd7f8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/magento_.py b/magento_.py
@@ -229,7 +229,11 @@ def import_websites(cls, instances):
 
                     # Create store views
                     for mag_store_view in mag_store_views:
-                            StoreView.find_or_create(store, mag_store_view)
+                            store_view = StoreView.find_or_create(
+                                store, mag_store_view
+                            )
+                            # AR refactoring
+                            store_view.save()
 
     @classmethod
     @ModelView.button_action('magento.wizard_import_carriers')
@@ -652,12 +656,12 @@ def find_or_create(cls, store, values):
         if store_views:
             return store_views[0]
 
-        return cls.create([{
+        return cls(**{
             'name': values['name'],
             'code': values['code'],
             'store': store.id,
             'magento_id': int(values['store_id']),
-        }])[0]
+        })
 
     @classmethod
     @ModelView.button_action('magento.wizard_import_orders')

diff --git a/tests/test_website_import.py b/tests/test_website_import.py
@@ -112,9 +112,10 @@ def test_0030_import_store_views(self):
                 )
 
                 store_views_before_import = self.StoreView.search([])
-                self.StoreView.find_or_create(
+                store_view = self.StoreView.find_or_create(
                     store, load_json('core', 'store_view')
                 )
+                store_view.save()
                 store_views_after_import = self.StoreView.search([])
 
                 self.assertTrue(