From 106d59006b41b41c8b437b8434231ae36b3ddb89 Mon Sep 17 00:00:00 2001
From: Ken Tsang <ken.tsang@digital.cabinet-office.gov.uk>
Date: Tue, 11 Jul 2017 17:04:29 +0100
Subject: [PATCH] Removed dao_update_organisation

---
 app/dao/organisations_dao.py            | 5 -----
 app/organisation/rest.py                | 4 +---
 tests/app/dao/test_organisations_dao.py | 9 ++++-----
 tests/app/organisation/test_rest.py     | 2 +-
 4 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/dao/organisations_dao.py b/app/dao/organisations_dao.py
index f8cb22090..b9046816f 100644
--- a/app/dao/organisations_dao.py
+++ b/app/dao/organisations_dao.py
@@ -14,8 +14,3 @@ def dao_get_organisation_by_id(org_id):
 @transactional
 def dao_create_organisation(organisation):
     db.session.add(organisation)
-
-
-@transactional
-def dao_update_organisation(organisation):
-    db.session.add(organisation)
diff --git a/app/organisation/rest.py b/app/organisation/rest.py
index 66318a3d5..2262d2cb0 100644
--- a/app/organisation/rest.py
+++ b/app/organisation/rest.py
@@ -2,7 +2,6 @@ from flask import Blueprint, jsonify, request
 
 from app.dao.organisations_dao import (
     dao_create_organisation,
-    dao_update_organisation,
     dao_get_organisations,
     dao_get_organisation_by_id,
 )
@@ -41,12 +40,11 @@ def create_organisation():
 
 @organisation_blueprint.route('/<uuid:organisation_id>', methods=['POST'])
 def update_organisation(organisation_id):
-    fetched_organisation = dao_get_organisation_by_id(organisation_id)
-
     data = request.get_json()
 
     validate(data, post_update_organisation_schema)
 
+    fetched_organisation = dao_get_organisation_by_id(organisation_id)
     for key in data.keys():
         setattr(fetched_organisation, key, data[key])
 
diff --git a/tests/app/dao/test_organisations_dao.py b/tests/app/dao/test_organisations_dao.py
index b2464a9e1..cb5b1466f 100644
--- a/tests/app/dao/test_organisations_dao.py
+++ b/tests/app/dao/test_organisations_dao.py
@@ -4,7 +4,7 @@ from sqlalchemy.exc import IntegrityError
 from app.dao.organisations_dao import (
     dao_create_organisation,
     dao_get_organisations,
-    dao_get_organisation_by_id, dao_update_organisation
+    dao_get_organisation_by_id
 )
 from app.models import Organisation
 
@@ -60,9 +60,8 @@ def test_update_organisation(notify_db, notify_db_session):
     organisation_from_db = Organisation.query.first()
     assert organisation_from_db.name != updated_name
 
-    organisation.name = updated_name
+    setattr(organisation_from_db, 'name', updated_name)
 
-    dao_update_organisation(organisation)
-    organisation_from_db = Organisation.query.first()
+    organisation_from_db_again = Organisation.query.first()
 
-    assert organisation_from_db.name == updated_name
+    assert organisation_from_db_again.name == updated_name
diff --git a/tests/app/organisation/test_rest.py b/tests/app/organisation/test_rest.py
index ecd566d76..ea5926f5d 100644
--- a/tests/app/organisation/test_rest.py
+++ b/tests/app/organisation/test_rest.py
@@ -84,7 +84,7 @@ def test_post_create_organisation_without_name_or_colour_is_valid(admin_request,
 
 @pytest.mark.parametrize('data_update', [
     ({'name': 'test organisation 1'}),
-    ({'logo': 'images/text_x3.png', 'colour': '#ffffff'})
+    ({'logo': 'images/text_x3.png', 'colour': '#ffffff'}),
 ])
 def test_post_update_organisation_updates_field(admin_request, notify_db_session, data_update):
     data = {