From 4dd245ca87a1549a92b99eceeb57abdb88f15266 Mon Sep 17 00:00:00 2001
From: Chris Hill-Scott <me@quis.cc>
Date: Wed, 12 Jun 2019 11:09:36 +0100
Subject: [PATCH] Remove deprecated fields from orgs and services
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Once the admin app has started using the new fields returned in
https://github.com/alphagov/notifications-api/pull/2539 these fields
won’t be needed any more.
---
 app/user/rest.py            | 25 --------------------
 tests/app/user/test_rest.py | 46 -------------------------------------
 2 files changed, 71 deletions(-)

diff --git a/app/user/rest.py b/app/user/rest.py
index 444dac914..bede8d145 100644
--- a/app/user/rest.py
+++ b/app/user/rest.py
@@ -507,35 +507,10 @@ def get_orgs_and_services(user):
             {
                 'name': org.name,
                 'id': org.id,
-                'services': [
-                    {
-                        'id': service.id,
-                        'name': service.name,
-                        'restricted': service.restricted,
-                    }
-                    for service in org.services
-                    if service.active and service in user.services
-                ],
                 'count_of_live_services': len(org.live_services),
             }
             for org in user.organisations if org.active
         ],
-        'services_without_organisations': [
-            {
-                'id': service.id,
-                'name': service.name,
-                'restricted': service.restricted,
-            } for service in user.services
-            if (
-                service.active and
-                # include services that either aren't in an organisation, or are in an organisation,
-                # but not one that the user can see.
-                (
-                    not service.organisation or
-                    service.organisation not in user.organisations
-                )
-            )
-        ],
         'services': [
             {
                 'id': service.id,
diff --git a/tests/app/user/test_rest.py b/tests/app/user/test_rest.py
index 8a51d8968..801c9b6e3 100644
--- a/tests/app/user/test_rest.py
+++ b/tests/app/user/test_rest.py
@@ -837,41 +837,20 @@ def test_get_orgs_and_services_nests_services(admin_request, sample_user):
 
     assert set(resp.keys()) == {
         'organisations',
-        'services_without_organisations',
         'services',
     }
     assert resp['organisations'] == [
         {
             'name': org1.name,
             'id': str(org1.id),
-            'services': [
-                {
-                    'name': service1.name,
-                    'id': str(service1.id),
-                    'restricted': False,
-                },
-                {
-                    'name': service2.name,
-                    'id': str(service2.id),
-                    'restricted': False,
-                }
-            ],
             'count_of_live_services': 2,
         },
         {
             'name': org2.name,
             'id': str(org2.id),
-            'services': [],
             'count_of_live_services': 0,
         },
     ]
-    assert resp['services_without_organisations'] == [
-        {
-            'name': service3.name,
-            'id': str(service3.id),
-            'restricted': False,
-        }
-    ]
     assert resp['services'] == [
         {
             'name': service1.name,
@@ -917,30 +896,15 @@ def test_get_orgs_and_services_only_returns_active(admin_request, sample_user):
 
     assert set(resp.keys()) == {
         'organisations',
-        'services_without_organisations',
         'services',
     }
     assert resp['organisations'] == [
         {
             'name': org1.name,
             'id': str(org1.id),
-            'services': [
-                {
-                    'name': service1.name,
-                    'id': str(service1.id),
-                    'restricted': False,
-                }
-            ],
             'count_of_live_services': 1,
         }
     ]
-    assert resp['services_without_organisations'] == [
-        {
-            'name': service4.name,
-            'id': str(service4.id),
-            'restricted': False,
-        }
-    ]
     assert resp['services'] == [
         {
             'name': service1.name,
@@ -983,25 +947,15 @@ def test_get_orgs_and_services_only_shows_users_orgs_and_services(admin_request,
 
     assert set(resp.keys()) == {
         'organisations',
-        'services_without_organisations',
         'services',
     }
     assert resp['organisations'] == [
         {
             'name': org2.name,
             'id': str(org2.id),
-            'services': [],
             'count_of_live_services': 0,
         }
     ]
-    # service1 belongs to org1, but the user doesn't know about org1
-    assert resp['services_without_organisations'] == [
-        {
-            'name': service1.name,
-            'id': str(service1.id),
-            'restricted': False,
-        }
-    ]
     # 'services' always returns the org_id no matter whether the user
     # belongs to that org or not
     assert resp['services'] == [