From a45a11e2f75be7d1fe5fb36be6ed79970d1014bb Mon Sep 17 00:00:00 2001
From: Andrew Melton <andrew.melton@rackspace.com>
Date: Thu, 27 Feb 2014 14:59:03 -0500
Subject: [PATCH] Refactoring repair api

---
 stacktach/dbapi.py       | 11 ++---------
 stacktach/urls.py        |  2 +-
 tests/unit/test_dbapi.py |  2 +-
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/stacktach/dbapi.py b/stacktach/dbapi.py
index 6450007..ad1a692 100644
--- a/stacktach/dbapi.py
+++ b/stacktach/dbapi.py
@@ -36,7 +36,6 @@ from stacktach import datetime_to_decimal as dt
 from stacktach import models
 from stacktach import stacklog
 from stacktach import utils
-from stacktach.models import InstanceExists, ImageExists
 
 DEFAULT_LIMIT = 50
 HARD_LIMIT = 1000
@@ -454,19 +453,13 @@ def get_verified_count(request):
                                           "format should be %YYYY-%mm-%dd)")
 
 
-def exists_factory(service):
-    model = InstanceExists
-    if service == 'glance':
-        model = ImageExists
-    return model
-
-
 def repair_stacktach_down(request):
     post_dict = dict((request.POST._iterlists()))
     message_ids = post_dict.get('message_ids')
     service = post_dict.get('service', ['nova'])
+    klass = _exists_model_factory(service[0])['klass']
     absent_exists, exists_not_pending = \
-        exists_factory(service[0]).mark_exists_as_sent_unverified(message_ids)
+        klass.mark_exists_as_sent_unverified(message_ids)
     response_data = {'absent_exists': absent_exists,
                      'exists_not_pending': exists_not_pending}
     response = HttpResponse(json.dumps(response_data),
diff --git a/stacktach/urls.py b/stacktach/urls.py
index a965594..50d8273 100644
--- a/stacktach/urls.py
+++ b/stacktach/urls.py
@@ -72,7 +72,7 @@ urlpatterns = patterns('',
     url(r'db/confirm/usage/exists/(?P<message_id>[\w\-]+)/$',
         'stacktach.dbapi.exists_send_status'),
     url(r'db/count/verified', 'stacktach.dbapi.get_verified_count'),
-    url(r'repair/', 'stacktach.dbapi.repair_stacktach_down'),
+    url(r'db/repair/', 'stacktach.dbapi.repair_stacktach_down'),
 
     url(r'^(?P<deployment_id>\d+)/$', 'stacktach.views.home', name='home'),
     url(r'^(?P<deployment_id>\d+)/details/(?P<column>\w+)/(?P<row_id>\d+)/$',
diff --git a/tests/unit/test_dbapi.py b/tests/unit/test_dbapi.py
index 7739c9e..3b4164f 100644
--- a/tests/unit/test_dbapi.py
+++ b/tests/unit/test_dbapi.py
@@ -1009,7 +1009,7 @@ class StacktachRepairScenarioApi(StacktachBaseTestCase):
         message_ids = ["04fd94b5-64dd-4559-83b7-981d9d4f7a5a",
                        "14fd94b5-64dd-4559-83b7-981d9d4f7a5a",
                        "24fd94b5-64dd-4559-83b7-981d9d4f7a5a"]
-        request.POST._iterlists().AndReturn([('service', 'nova'),
+        request.POST._iterlists().AndReturn([('service', ['nova']),
                                              ('message_ids', message_ids)])
         self.mox.StubOutWithMock(models.InstanceExists,
                                  'mark_exists_as_sent_unverified')