From 3b1f229384d1723991fe43fffe7e2aa73fd96181 Mon Sep 17 00:00:00 2001
From: Ken Tsang <ken.tsang@digital.cabinet-office.gov.uk>
Date: Fri, 7 Jul 2017 14:48:00 +0100
Subject: [PATCH] Renamed migration script and refactor code

---
 app/dao/organisations_dao.py                              | 2 +-
 app/organisation/rest.py                                  | 7 ++-----
 ...o_not_nullable.py => 0106_change_logo_not_nullable.py} | 8 ++++----
 tests/app/conftest.py                                     | 6 +-----
 tests/app/dao/test_organisations_dao.py                   | 6 ++++--
 5 files changed, 12 insertions(+), 17 deletions(-)
 rename migrations/versions/{0105_change_logo_not_nullable.py => 0106_change_logo_not_nullable.py} (75%)

diff --git a/app/dao/organisations_dao.py b/app/dao/organisations_dao.py
index 53acf5394..f8cb22090 100644
--- a/app/dao/organisations_dao.py
+++ b/app/dao/organisations_dao.py
@@ -1,5 +1,5 @@
 from app import db
-from app.dao.dao_utils import transactional, version_class
+from app.dao.dao_utils import transactional
 from app.models import Organisation
 
 
diff --git a/app/organisation/rest.py b/app/organisation/rest.py
index a4260377a..630a1f8ef 100644
--- a/app/organisation/rest.py
+++ b/app/organisation/rest.py
@@ -1,14 +1,11 @@
 from flask import Blueprint, jsonify, request
 
 from app.dao.organisations_dao import (
+    dao_create_organisation,
     dao_get_organisations,
     dao_get_organisation_by_id,
-    dao_create_organisation
-)
-from app.errors import (
-    InvalidRequest,
-    register_errors
 )
+from app.errors import register_errors
 from app.models import Organisation
 from app.organisation.organisation_schema import post_organisation_schema
 from app.schema_validation import validate
diff --git a/migrations/versions/0105_change_logo_not_nullable.py b/migrations/versions/0106_change_logo_not_nullable.py
similarity index 75%
rename from migrations/versions/0105_change_logo_not_nullable.py
rename to migrations/versions/0106_change_logo_not_nullable.py
index 09efbcb41..1031a9092 100644
--- a/migrations/versions/0105_change_logo_not_nullable.py
+++ b/migrations/versions/0106_change_logo_not_nullable.py
@@ -1,14 +1,14 @@
 """empty message
 
-Revision ID: 0105_change_logo_not_nullable
-Revises: 0104_more_letter_orgs
+Revision ID: 0106_change_logo_not_nullable
+Revises: 0105_opg_letter_org
 Create Date: 2017-07-06 10:14:35.188404
 
 """
 
 # revision identifiers, used by Alembic.
-revision = '0105_change_logo_not_nullable'
-down_revision = '0104_more_letter_orgs'
+revision = '0106_change_logo_not_nullable'
+down_revision = '0105_opg_letter_org'
 
 from alembic import op
 import sqlalchemy as sa
diff --git a/tests/app/conftest.py b/tests/app/conftest.py
index 290b74f6b..4fb05d422 100644
--- a/tests/app/conftest.py
+++ b/tests/app/conftest.py
@@ -39,7 +39,7 @@ from app.dao.invited_user_dao import save_invited_user
 from app.dao.provider_rates_dao import create_provider_rates
 from app.clients.sms.firetext import FiretextClient
 from tests import create_authorization_header
-from tests.app.db import create_user, create_template, create_notification, create_organisation
+from tests.app.db import create_user, create_template, create_notification
 
 
 @pytest.yield_fixture
@@ -974,10 +974,6 @@ def sample_provider_rate(notify_db, notify_db_session, valid_from=None, rate=Non
     )
 
 
-def sample_organisation(notify_db, notify_db_session):
-    create_organisation()
-
-
 @pytest.fixture
 def restore_provider_details(notify_db, notify_db_session):
     """
diff --git a/tests/app/dao/test_organisations_dao.py b/tests/app/dao/test_organisations_dao.py
index ada346de1..b2464a9e1 100644
--- a/tests/app/dao/test_organisations_dao.py
+++ b/tests/app/dao/test_organisations_dao.py
@@ -35,12 +35,14 @@ def test_create_organisation_without_logo_raises_error(notify_db, notify_db_sess
 
 
 def test_get_organisations_gets_all_organisations(notify_db, notify_db_session):
-    create_organisation(name='test_org_1')
-    create_organisation(name='test_org_2')
+    org_1 = create_organisation(name='test_org_1')
+    org_2 = create_organisation(name='test_org_2')
 
     organisations = dao_get_organisations()
 
     assert len(organisations) == 2
+    assert org_1 == organisations[0]
+    assert org_2 == organisations[1]
 
 
 def test_get_organisation_by_id_gets_correct_organisation(notify_db, notify_db_session):