Moving poll_result_uploaded_by_encuestador to steps

2 files changed, 36 insertions, 29 deletions

diff --git a/webapp/webapp/features/poll_result_details.py b/webapp/webapp/features/poll_result_details.py
index 43dbdd2..160a64a 100644
--- a/webapp/webapp/features/poll_result_details.py
+++ b/webapp/webapp/features/poll_result_details.py
@@ -11,35 +11,6 @@ from pollster.models import Pollster
 from django.conf import settings
 
 
-def get_fixture(poll_result):
-    path = os.path.abspath(os.path.dirname(__file__))
-    path = os.path.join(path, "fixtures", poll_result)
-    return path
-
-
-@step(u'And with "([^"]*)" uploaded by "([^"]*)" on "([^"]*)"')
-def poll_result_uploaded_by_encuestador(step, poll_result_name,
-                                        encuestador_name, datetime_str):
-    poll_result_path = get_fixture(poll_result_name)
-    encuestador = get_pollster_by_username(encuestador_name)
-
-    with open(poll_result_path) as f:
-        poll_result_data = json.load(f, "utf-8")
-    poll_result_data['poll_id'] = world.poll_id.__str__()
-    poll_result_data['pollster_username'] = encuestador.username
-    poll_result_data['pollster_id'] = encuestador.id.__str__()
-    poll_result_data['upload_timestamp'] = datetime_str
-
-    poll_result_path = create_poll_result_file(poll_result_data,
-                                               poll_result_name)
-
-    media_results = settings.RESULT_BCK_ROOT
-    results_dir = os.path.join(media_results, world.poll_id.__str__())
-    if not os.path.exists(results_dir):
-        os.mkdir(results_dir)
-    shutil.move(poll_result_path, results_dir)
-
-
 def create_poll_result_file(poll_result_data, poll_result_name):
     tmp_file = tempfile.NamedTemporaryFile(suffix='.poll_result', delete=False)
     try:
diff --git a/webapp/webapp/features/steps.py b/webapp/webapp/features/steps.py
index 7691cd5..4a7fac3 100644
--- a/webapp/webapp/features/steps.py
+++ b/webapp/webapp/features/steps.py
@@ -1,12 +1,19 @@
 # -*- coding: utf-8 -*-
+import os
+import json
+import shutil
+
 from lettuce.django import django_url
 from lettuce import step, world
+from django.conf import settings
 
 from sociologist.models import Sociologist
 from pollster.models import Pollster
 from polls.models import Poll
 from poll_result_details import get_pollster_by_username
 
+from poll_result_details import create_poll_result_file
+
 
 @step(u'Given I am a researcher')
 def given_i_am_a_researcher(step):
@@ -51,3 +58,32 @@ def and_encuestador_is_binded_to_poll(step, encuestador, poll_name):
         pollster = Pollster.create(username=username, password=password)
     polls = [world.poll_id]
     Poll.pollster_assignment(pollster.id, polls)
+
+
+def get_fixture(poll_result):
+    path = os.path.abspath(os.path.dirname(__file__))
+    path = os.path.join(path, "fixtures", poll_result)
+    return path
+
+
+@step(u'And with "([^"]*)" uploaded by "([^"]*)" on "([^"]*)"')
+def poll_result_uploaded_by_encuestador(step, poll_result_name,
+                                        encuestador_name, datetime_str):
+    poll_result_path = get_fixture(poll_result_name)
+    encuestador = get_pollster_by_username(encuestador_name)
+
+    with open(poll_result_path) as f:
+        poll_result_data = json.load(f, "utf-8")
+    poll_result_data['poll_id'] = world.poll_id.__str__()
+    poll_result_data['pollster_username'] = encuestador.username
+    poll_result_data['pollster_id'] = encuestador.id.__str__()
+    poll_result_data['upload_timestamp'] = datetime_str
+
+    poll_result_path = create_poll_result_file(poll_result_data,
+                                               poll_result_name)
+
+    media_results = settings.RESULT_BCK_ROOT
+    results_dir = os.path.join(media_results, world.poll_id.__str__())
+    if not os.path.exists(results_dir):
+        os.mkdir(results_dir)
+    shutil.move(poll_result_path, results_dir)