mesh-sandbox 0.1.22__py3-none-any.whl → 0.1.23__py3-none-any.whl

mesh_sandbox/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.22"
+__version__ = "0.1.23"

mesh_sandbox/store/memory_store.py

@@ -23,6 +23,14 @@ class MemoryStore(CannedStore):
         self.outboxes[mailbox_id] = []
         self.local_ids[mailbox_id] = defaultdict(list)
 
+        # pylint: disable=attribute-defined-outside-init
+        # clear rich inbox for mailbox
+        self.messages = {
+            message_id: message
+            for message_id, message in self.messages.items()
+            if message.recipient.mailbox_id != mailbox_id
+        }
+
     async def send_message(self, message: Message, body: bytes):
 
         async with self.lock:

mesh_sandbox/tests/admin.py

@@ -5,6 +5,7 @@ import pytest
 from fastapi import status
 from fastapi.testclient import TestClient
 
+from mesh_sandbox.common import APP_V1_JSON
 from mesh_sandbox.tests import _CANNED_MAILBOX1, _CANNED_MAILBOX2
 from mesh_sandbox.tests.mesh_api_helpers import (
     mesh_api_get_inbox_size,
@@ -13,7 +14,8 @@ from mesh_sandbox.tests.mesh_api_helpers import (
     mesh_api_track_message_by_message_id_status,
 )
 
-from .helpers import temp_env_vars
+from ..common.constants import Headers
+from .helpers import generate_auth_token, temp_env_vars
 
 
 def test_reset_canned_store_should_return_bad_request(app: TestClient):
@@ -88,16 +90,52 @@ def test_reset_memory_store_should_clear_specified_mailbox_only(app: TestClient)
         res = mesh_api_track_message_by_message_id(app, _CANNED_MAILBOX2, msg_2to1_id)
         assert res.json()["messageId"] == msg_2to1_id
 
+        res = app.get(
+            f"/messageexchange/{_CANNED_MAILBOX1}/inbox/rich?max_results=10",
+            headers={Headers.Authorization: generate_auth_token(_CANNED_MAILBOX1), Headers.Accept: APP_V1_JSON},
+        )
+
+        assert res.status_code == status.HTTP_200_OK
+        response = res.json()
+        messages = [res["message_id"] for res in response.get("messages", [])]
+        assert len(messages) == 1
+
+        res = app.get(
+            f"/messageexchange/{_CANNED_MAILBOX2}/inbox/rich?max_results=10",
+            headers={Headers.Authorization: generate_auth_token(_CANNED_MAILBOX2), Headers.Accept: APP_V1_JSON},
+        )
+
+        assert res.status_code == status.HTTP_200_OK
+        response = res.json()
+        messages = [res["message_id"] for res in response.get("messages", [])]
+        assert len(messages) == 1
+
+        # RESET mailbox 2
         res = app.delete(f"/messageexchange/reset/{_CANNED_MAILBOX2}")
         assert res.status_code == status.HTTP_200_OK
 
+        assert mesh_api_get_inbox_size(app, _CANNED_MAILBOX1) == 1
         assert mesh_api_get_inbox_size(app, _CANNED_MAILBOX2) == 0
-        assert (
-            mesh_api_track_message_by_message_id_status(app, _CANNED_MAILBOX2, msg_2to1_id) == status.HTTP_404_NOT_FOUND
+
+        res = app.get(
+            f"/messageexchange/{_CANNED_MAILBOX1}/inbox/rich?max_results=10",
+            headers={Headers.Authorization: generate_auth_token(_CANNED_MAILBOX1), Headers.Accept: APP_V1_JSON},
         )
 
-        assert mesh_api_get_inbox_size(app, _CANNED_MAILBOX1) == 1
-        assert mesh_api_track_message_by_message_id_status(app, _CANNED_MAILBOX1, msg_1to2_id) == status.HTTP_200_OK
+        assert res.status_code == status.HTTP_200_OK
+        response = res.json()
+        mb1_rich_inbox_messages = [res["message_id"] for res in response.get("messages", [])]
+        assert len(mb1_rich_inbox_messages) == 1
+
+        res = app.get(
+            f"/messageexchange/{_CANNED_MAILBOX2}/inbox/rich?max_results=10",
+            headers={Headers.Authorization: generate_auth_token(_CANNED_MAILBOX2), Headers.Accept: APP_V1_JSON},
+        )
+
+        assert res.status_code == status.HTTP_200_OK
+        response = res.json()
+        mb2_rich_inbox_messages = [res["message_id"] for res in response.get("messages", [])]
+        assert len(mb2_rich_inbox_messages) == 0
 
 
 @pytest.mark.parametrize("clear_disk", ["tRue", "faLse", None])
@@ -173,12 +211,7 @@ def test_reset_file_store_should_clear_specified_mailbox_only_and_maybe_files(
         assert res.status_code == status.HTTP_200_OK
 
         assert mesh_api_get_inbox_size(app, _CANNED_MAILBOX1) == 1
-        assert mesh_api_track_message_by_message_id_status(app, _CANNED_MAILBOX1, msg_1to2_id) == status.HTTP_200_OK
-
         assert mesh_api_get_inbox_size(app, _CANNED_MAILBOX2) == 0
-        assert (
-            mesh_api_track_message_by_message_id_status(app, _CANNED_MAILBOX2, msg_2to1_id) == status.HTTP_404_NOT_FOUND
-        )
 
         # clear_disk should default to true if file mode is used
         if not clear_disk or clear_disk == "tRue":

mesh_sandbox/tests/helpers.py

@@ -69,7 +69,7 @@ def ensure_client_installed(java_path: str, base_dir: str, version: str):  # pyl
         version_dash = version.replace(".", "-")
 
         installer_uri = (
-            "https://nhs-prod.global.ssl.fastly.net/binaries/content/assets/website-assets/services"
+            "https://digital.nhs.uk/binaries/content/assets/website-assets/services"
             f"/message-exchange-for-social-care-and-health-mesh/mesh-installation-pack-client-{version_dash}.rar"
         )
 

{mesh_sandbox-0.1.22.dist-info → mesh_sandbox-0.1.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mesh-sandbox
-Version: 0.1.22
+Version: 0.1.23
 Summary: NHSDigital mesh sandbox, a locally testable version of the MESH api
 License: MIT
 Author: spinecore

{mesh_sandbox-0.1.22.dist-info → mesh_sandbox-0.1.23.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mesh_sandbox/__init__.py,sha256=zmP2TRnzKPjZJ1eiBcT-cRInsji6FW-OVD3FafQFCc4,23
+mesh_sandbox/__init__.py,sha256=0byemO6n6WCv41u9vBG2AIsOkVbxLvok7puvwy8EhfU,23
 mesh_sandbox/api.py,sha256=F2KUKENAsSe6NAGG0wzHA2jebGF6mWFgta1q55oqacU,3925
 mesh_sandbox/common/__init__.py,sha256=B0eGgN6SGCvNIsalhQOXhFJvxZaE4wJS_ratFOMMwvI,3071
 mesh_sandbox/common/constants.py,sha256=_hnaHDkAQGHWLF7n_WfC5ZHIY5D-fUbOdpSqLusUMNY,6504
@@ -37,14 +37,14 @@ mesh_sandbox/store/data/mailboxes.jsonl,sha256=ADXpImNo9UH6rY6T9bqgI-BvnbziFaGwc
 mesh_sandbox/store/data/messages.jsonl,sha256=ByqMoaoq_rZZgZFNhVkIVlL6OYnUpEBD4_jvvyEmIaI,2327
 mesh_sandbox/store/data/workflows.jsonl,sha256=RFvycuqVmEkImeXlFD2wjuJFjt6dw581D_raPWstxpU,292
 mesh_sandbox/store/file_store.py,sha256=ljWHpAJ0mab8gNRUXIHto6A5f0wUIaSh1BWk6wPxnJI,2223
-mesh_sandbox/store/memory_store.py,sha256=O0E-szdW7r4XknXOXWPhhqRUS6EYZ8fFObNsb6KKhW4,2523
+mesh_sandbox/store/memory_store.py,sha256=9co1coov8xhJhT68XC81MDMV1iRMFsOebwk2sqNo1lg,2807
 mesh_sandbox/store/serialisation.py,sha256=pMYZ704GP74aCDRX9Nu1r4B1XA4BPJXYY-RKLFJJfUg,3615
 mesh_sandbox/tests/__init__.py,sha256=wPjH0Ka1334a0OR9VMUfeYxsr03JqWjHTBnAH_1SB7I,106
-mesh_sandbox/tests/admin.py,sha256=KBcBvj-aqgfL5RQ6yFNWCM_bzlYh79_G9um4yCyIifY,8288
+mesh_sandbox/tests/admin.py,sha256=Y6qU2Cp528iZ2oiZ6ZmJzuuhpAe_Vnp37j0-oHewvNk,9634
 mesh_sandbox/tests/docker_tests.py,sha256=nxErB5EDDvewgrgI-YqofsOqo52uYWCPTsk-ggK5axQ,1292
 mesh_sandbox/tests/exceptions.py,sha256=j_jKskVzLAYpyu4qNAEY5ahkbk8Uh2Nc_CGpnpdXjnI,740
 mesh_sandbox/tests/handshake.py,sha256=X-fCbwaEAc8cAvvnniCvt4W4DAV9ItPq7tpIpZkfj6M,6259
-mesh_sandbox/tests/helpers.py,sha256=Cr4FtD3jLGf-jsnDBd39YCLW_6__VdWBTZ2gzySaqmc,6901
+mesh_sandbox/tests/helpers.py,sha256=wRC1t8mj4FKChebvwfcJWpxqK_nmE1NBUHgfCA2rBsk,6885
 mesh_sandbox/tests/inbox.py,sha256=GLqOC6qlivKpp7qEtcGqv_nECkf2MhP4XwRWbIPC_ks,10412
 mesh_sandbox/tests/java_client_tests.py,sha256=NYvNH1LxJc0SmHQ3q6mSvEd6Wuv2r_xMqAXW28sT2Pw,6547
 mesh_sandbox/tests/lookup.py,sha256=wY8x0F415y2um48Lw5kyD4ugMo1vBGKB7cqPdHEaVO4,2768
@@ -58,7 +58,7 @@ mesh_sandbox/views/inbox.py,sha256=gnaD9Csx5BqilVRefQQ_tXmeq80lwcLJfepW005GrkU,5
 mesh_sandbox/views/lookup.py,sha256=HHUqZ-Iy22ysC3qaO8Bl5GBQqf_7IiBbe5acyxqS78M,2775
 mesh_sandbox/views/outbox.py,sha256=jxYiHylEdpljZ6Wl45Ke3aaH5rEKb-kzUuCNEKDS3So,4932
 mesh_sandbox/views/tracking.py,sha256=FRjJgBI3WbTuuOw4Y6uWok0KIeOcjGl289eyyuTcwfo,8924
-mesh_sandbox-0.1.22.dist-info/LICENSE,sha256=usgzIvDUpVX5pYZepJTRXQJqIaz0mdd32GuS5a3PFlY,1051
-mesh_sandbox-0.1.22.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
-mesh_sandbox-0.1.22.dist-info/METADATA,sha256=JBzX_0v1jPB0h1Xtlwzkj4OZVVPvBYvvsWgfgKwT7qE,2232
-mesh_sandbox-0.1.22.dist-info/RECORD,,
+mesh_sandbox-0.1.23.dist-info/LICENSE,sha256=usgzIvDUpVX5pYZepJTRXQJqIaz0mdd32GuS5a3PFlY,1051
+mesh_sandbox-0.1.23.dist-info/WHEEL,sha256=vVCvjcmxuUltf8cYhJ0sJMRDLr1XsPuxEId8YDzbyCY,88
+mesh_sandbox-0.1.23.dist-info/METADATA,sha256=AKeVmQFBnGP6nPBDlYWZh13szVvTZ1zAI23La3UZAzg,2232
+mesh_sandbox-0.1.23.dist-info/RECORD,,