add organisation and branding to GET /service response dict

app/schemas.py

@@ -103,6 +103,8 @@ class ProviderDetailsSchema(BaseSchema):
 class ServiceSchema(BaseSchema):
 
     created_by = field_for(models.Service, 'created_by', required=True)
+    organisation = field_for(models.Service, 'organisation_id', dump_only=True)
+    branding = field_for(models.Service, 'branding')
 
     class Meta:
         model = models.Service
@@ -114,8 +116,7 @@ class ServiceSchema(BaseSchema):
                    'old_id',
                    'template_statistics',
                    'service_provider_stats',
-                   'service_notification_stats',
-                   'organisation')
+                   'service_notification_stats')
         strict = True
 
     @validates('sms_sender')

tests/app/service/test_rest.py

@@ -108,6 +108,8 @@ def test_get_service_by_id(notify_api, sample_service):
             assert json_resp['data']['name'] == sample_service.name
             assert json_resp['data']['id'] == str(sample_service.id)
             assert not json_resp['data']['research_mode']
+            assert json_resp['data']['organisation'] is None
+            assert json_resp['data']['branding'] == 'govuk'
 
 
 def test_get_service_by_id_should_404_if_no_service(notify_api, notify_db):