Merge branch 'master' into feature/version-two-endpoints-removing-actor

* master:
  Feature/support multiple internal users (#140)

# Conflicts:
#	secure_message/api_mocks/internal_user_service_mock.py
#	secure_message/application.py
#	secure_message/repository/retriever.py
#	secure_message/resources/drafts.py
#	secure_message/validation/domain.py
#	tests/app/test_app.py
#	tests/app/test_retriever.py
#	tests/behavioural/features/draft_post.feature
#	tests/behavioural/features/drafts_get.feature
#	tests/behavioural/features/message_post.feature
#	tests/behavioural/features/messages_get.feature
#	tests/behavioural/features/steps/from_field.py
#	tests/behavioural/features/steps/secure_messaging_context_helper.py

Author: Andrew Torrance

secure_message/api_mocks/internal_user_service_mock.py

@@ -33,12 +33,10 @@ def __init__(self):
                 "emailAddress": "mock@email.com"
             },
             "BRES": {
-                "id": 'BRES',
+                "id": "BRES",
                 "firstName": "BRES",
                 "lastName": "",
-                "emailAddress": "",
-                "telephone": "", "status": "",
-                "sampleUnitType": "BI"
+                "emailAddress": "mock@email.com"
             },
             "SomeStringUntilWeGetIds": {
                 "id": "SomeStringUntilWeGetIds",

secure_message/application.py

@@ -19,7 +19,6 @@
 from secure_message.v2.resources.messages import MessageSendV2, MessageCounterV2
 from secure_message.resources.threads import ThreadById, ThreadList
 
-
 logger_initial_config(service_name='ras-secure-message')
 logger = wrap_logger(logging.getLogger(__name__))
 

tests/app/test_app.py

@@ -374,6 +374,8 @@ def test_case_service_not_called_on_sent_if_NotifyCaseService_is_not_set(self, c
     @patch.object(case_service, 'store_case_event')
     def test_case_service_called_on_sent_if_NotifyCaseService_is_set(self, case):
         """Test case service called if set to do so in config """
+
+        self.app.config["NOTIFY_VIA_GOV_NOTIFY"] = '0'
         self.app.config['NOTIFY_CASE_SERVICE'] = '1'
         self.app.config['NOTIFY_VIA_GOV_NOTIFY'] = '0'
         url = "http://localhost:5050/message/send"

tests/app/test_mock_party.py

@@ -162,10 +162,7 @@ def test_message_by_id_replaces_uuids(self):
         self.assertEqual(message['@msg_to'], [{"id": "BRES",
                                                "firstName": "BRES",
                                                "lastName": "",
-                                               "emailAddress": "",
-                                               "telephone": "",
-                                               "status": "",
-                                               "sampleUnitType": "BI"
+                                               "emailAddress": "mock@email.com"
                                                }])
 
     def test_messages_get_replaces_uuids_with_user_details(self):
@@ -269,9 +266,7 @@ def test_drafts_get_return_user_details_in_to_and_from(self):
             self.assertEqual(draft['@msg_to'][0], {"id": constants.BRES_USER,
                                                    "firstName": "BRES",
                                                    "lastName": "",
-                                                   "emailAddress": "",
-                                                   "telephone": "", "status": "",
-                                                   "sampleUnitType": "BI"})
+                                                   "emailAddress": "mock@email.com"})
 
     def test_get_business_details_by_ru(self):
         """Test get details for one business using ru_id"""

tests/behavioural/features/message_get.feature

@@ -64,21 +64,6 @@ Feature: Message get by ID Endpoint
     Then a success status code (200) is returned
       And  retrieved message additional from data matches that from party service
 
-
-  Scenario: Internal user saves and retrieves a message verify the message from additional data  (@msg_from) is as expected
-    Given sending from internal bres user to respondent
-      And   the message is sent
-    When  the message is read
-    Then a success status code (200) is returned
-      And  retrieved message additional from data matches that from party service
-
-  Scenario: Respondent saves and retrieves a message verify the message to additional data  (@msg_to) is as expected
-    Given sending from respondent to internal bres user
-      And   the message is sent
-    When  the message is read
-    Then a success status code (200) is returned
-      And  retrieved message additional to data matches that from party service
-
   Scenario: Internal user saves and retrieves a message verify the message to additional data  (@msg_to) is as expected
     Given sending from internal bres user to respondent
       And   the message is sent