Merge lp:~michael.nelson/ubuntu-webcatalog/1170742-import-for-purchase-broken into lp:ubuntu-webcatalog

[Michael Nelson]

Update departments based on slugs when importing from sca.

Update departments based on slugs when importing from sca.

See the bug for details.

`fab test:pg=true`

[Michael Foord (mfoord)]

Looks good to me.

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

Voting does not meet specified criteria. Required: Approve >= 1, Disapprove == 0, Needs Fixing == 0, Needs Information == 0, Resubmit == 0, Pending == 0. Got: 1 Pending.

[Michael Nelson (michael.nelson)]

review: Approve

=== modified file 'src/webcatalog/models/applications.py'
--- src/webcatalog/models/applications.py	2013-04-09 13:27:43 +0000
+++ src/webcatalog/models/applications.py	2013-04-23 10:25:34 +0000
@@ -160,10 +160,15 @@
 
         def get_dept(dept_name):
             dept, created = Department.objects.get_or_create(
-                name=dept_name, defaults={'slug': slugify(dept_name)})
+                slug=slugify(dept_name), defaults=dict(name=dept_name))
             if created:
                 logging.warn("Department %s automatically created!" %
                              dept_name)
+            if not created and dept_name != dept.name:
+                logging.warn("Department %s name updated to %s.",
+                             dept.name, dept_name)
+                dept.name = dept_name
+                dept.save()
             return dept
 
         if self.imported_from_sca:

=== modified file 'src/webcatalog/tests/test_models.py'
--- src/webcatalog/tests/test_models.py	2012-08-21 13:57:11 +0000
+++ src/webcatalog/tests/test_models.py	2013-04-23 10:25:34 +0000
@@ -92,6 +92,19 @@
         self.assertEqual(1, app.departments.count())
         self.assertEqual('Books & Magazines', app.departments.get().name)
 
+    def test_update_departments_new_name(self):
+        dept = self.factory.make_department('Role Spielen',
+                                            slug='role-spielen')
+        app = self.factory.make_application(
+            departments=[dept], imported_from_sca=True)
+
+        app.update_departments(['Role-Spielen'])
+
+        self.assertEqual(app.departments.count(), 1)
+        dept = app.departments.get()
+        self.assertEqual('role-spielen', dept.slug)
+        self.assertEqual('Role-Spielen', dept.name)
+
     def test_crumbs_no_department(self):
         app = self.factory.make_application()
         app_url = reverse('wc-package-detail',