Merge pull request #1639 from alphagov/create-new-organisation-model

Create new organisation model

tests/app/dao/test_organisation_dao.py

@@ -0,0 +1,53 @@
+from app.dao.organisation_dao import (
+    dao_get_organisations,
+    dao_get_organisation_by_id,
+    dao_update_organisation,
+)
+from app.models import Organisation
+
+from tests.app.db import create_organisation
+
+
+def test_get_organisations_gets_all_organisations_alphabetically_with_active_organisations_first(
+    notify_db,
+    notify_db_session
+):
+    m_active_org = create_organisation(name='m_active_organisation')
+    z_inactive_org = create_organisation(name='z_inactive_organisation', active=False)
+    a_inactive_org = create_organisation(name='a_inactive_organisation', active=False)
+    z_active_org = create_organisation(name='z_active_organisation')
+    a_active_org = create_organisation(name='a_active_organisation')
+
+    organisations = dao_get_organisations()
+
+    assert len(organisations) == 5
+    assert organisations[0] == a_active_org
+    assert organisations[1] == m_active_org
+    assert organisations[2] == z_active_org
+    assert organisations[3] == a_inactive_org
+    assert organisations[4] == z_inactive_org
+
+
+def test_get_organisation_by_id_gets_correct_organisation(notify_db, notify_db_session):
+    organisation = create_organisation()
+
+    organisation_from_db = dao_get_organisation_by_id(organisation.id)
+
+    assert organisation_from_db == organisation
+
+
+def test_update_organisation(notify_db, notify_db_session):
+    updated_name = 'new name'
+    create_organisation()
+
+    organisation = Organisation.query.all()
+
+    assert len(organisation) == 1
+    assert organisation[0].name != updated_name
+
+    dao_update_organisation(organisation[0].id, **{'name': updated_name})
+
+    organisation = Organisation.query.all()
+
+    assert len(organisation) == 1
+    assert organisation[0].name == updated_name

tests/app/db.py

@@ -14,6 +14,7 @@ from app.models import (
     MonthlyBilling,
     Notification,
     EmailBranding,
+    Organisation,
     Rate,
     Service,
     ServiceEmailReplyTo,
@@ -41,6 +42,7 @@ from app.dao.services_dao import dao_create_service
 from app.dao.service_permissions_dao import dao_add_service_permission
 from app.dao.inbound_sms_dao import dao_create_inbound_sms
 from app.dao.email_branding_dao import dao_create_email_branding
+from app.dao.organisation_dao import dao_create_organisation
 
 
 def create_user(mobile_number="+447700900986", email="notify@digital.cabinet-office.gov.uk", state='active'):
@@ -479,3 +481,14 @@ def create_letter_rate(
     db.session.commit()
 
     return rate
+
+
+def create_organisation(name='test_org_1', active=True):
+    data = {
+        'name': name,
+        'active': active
+    }
+    organisation = Organisation(**data)
+    dao_create_organisation(organisation)
+
+    return organisation

tests/app/organisation/test_rest.py

@@ -0,0 +1,105 @@
+from app.models import Organisation
+from tests.app.db import create_organisation
+
+
+def test_get_all_organisations(admin_request, notify_db_session):
+    create_organisation(name='inactive org', active=False)
+    create_organisation(name='active org')
+
+    response = admin_request.get(
+        'organisation.get_organisations',
+        _expected_status=200
+    )
+
+    assert len(response) == 2
+    assert response[0]['name'] == 'active org'
+    assert response[0]['active'] is True
+    assert response[1]['name'] == 'inactive org'
+    assert response[1]['active'] is False
+
+
+def test_get_organisation_by_id(admin_request, notify_db_session):
+    org = create_organisation()
+
+    response = admin_request.get(
+        'organisation.get_organisation_by_id',
+        _expected_status=200,
+        organisation_id=org.id
+    )
+
+    assert set(response.keys()) == {'id', 'name', 'active'}
+    assert response['id'] == str(org.id)
+    assert response['name'] == 'test_org_1'
+    assert response['active'] is True
+
+
+def test_post_create_organisation(admin_request, notify_db_session):
+    data = {
+        'name': 'test organisation',
+        'active': True
+    }
+
+    response = admin_request.post(
+        'organisation.create_organisation',
+        _data=data,
+        _expected_status=201
+    )
+
+    organisation = Organisation.query.all()
+
+    assert data['name'] == response['name']
+    assert data['active'] == response['active']
+    assert len(organisation) == 1
+
+
+def test_post_create_organisation_with_missing_name_gives_validation_error(admin_request, notify_db_session):
+    data = {
+        'active': False
+    }
+
+    response = admin_request.post(
+        'organisation.create_organisation',
+        _data=data,
+        _expected_status=400
+    )
+
+    assert len(response['errors']) == 1
+    assert response['errors'][0]['error'] == 'ValidationError'
+    assert response['errors'][0]['message'] == 'name is a required property'
+
+
+def test_post_update_organisation_updates_fields(admin_request, notify_db_session):
+    org = create_organisation()
+    data = {
+        'name': 'new organisation name',
+        'active': False
+    }
+
+    admin_request.post(
+        'organisation.update_organisation',
+        _data=data,
+        organisation_id=org.id,
+        _expected_status=204
+    )
+
+    organisation = Organisation.query.all()
+
+    assert len(organisation) == 1
+    assert organisation[0].id == org.id
+    assert organisation[0].name == data['name']
+    assert organisation[0].active == data['active']
+
+
+def test_post_update_organisation_gives_404_status_if_org_does_not_exist(admin_request, notify_db_session):
+    data = {'name': 'new organisation name'}
+
+    admin_request.post(
+        'organisation.update_organisation',
+        _data=data,
+        organisation_id='31d42ce6-3dac-45a7-95cb-94423d5ca03c',
+        _expected_status=404
+    )
+
+    organisation = Organisation.query.all()
+
+    assert not organisation