[NDR-160] Remove the list of requested fields when querying a table (#680)

Author: NogaNHS

lambdas/enums/metadata_field_names.py

@@ -15,6 +15,10 @@ class DocumentReferenceMetadataFields(Enum):
     UPLOADED = "Uploaded"
     UPLOADING = "Uploading"
     LAST_UPDATED = "LastUpdated"
+    FILE_SIZE = "FileSize"
+    DOC_STATUS = "DocStatus"
+    CUSTODIAN = "Custodian"
+    DOCUMENT_SCAN_CREATION = "DocumentScanCreation"
 
     @staticmethod
     def list() -> list[str]:

lambdas/services/document_service.py

@@ -67,7 +67,6 @@ def fetch_documents_from_table(
                 index_name=index_name,
                 search_key=search_key,
                 search_condition=search_condition,
-                requested_fields=DocumentReferenceMetadataFields.list(),
                 query_filter=query_filter,
                 exclusive_start_key=exclusive_start_key,
             )

lambdas/tests/unit/enums/test_metadata_field_names.py

@@ -8,7 +8,7 @@ def test_can_get_one_field_name():
 
 def test_returns_all_as_list():
     subject = DocumentReferenceMetadataFields.list()
-    assert len(subject) == 12
+    assert len(subject) == 16
     assert DocumentReferenceMetadataFields.ID.value in subject
     assert DocumentReferenceMetadataFields.CONTENT_TYPE.value in subject
     assert DocumentReferenceMetadataFields.CREATED.value in subject
@@ -21,3 +21,7 @@ def test_returns_all_as_list():
     assert DocumentReferenceMetadataFields.UPLOADED.value in subject
     assert DocumentReferenceMetadataFields.UPLOADING.value in subject
     assert DocumentReferenceMetadataFields.LAST_UPDATED.value in subject
+    assert DocumentReferenceMetadataFields.DOC_STATUS.value in subject
+    assert DocumentReferenceMetadataFields.DOCUMENT_SCAN_CREATION.value in subject
+    assert DocumentReferenceMetadataFields.CUSTODIAN.value in subject
+    assert DocumentReferenceMetadataFields.FILE_SIZE.value in subject

lambdas/tests/unit/services/test_document_service.py

@@ -27,20 +27,6 @@
 from utils.exceptions import DocumentServiceException
 
 MOCK_DOCUMENT = MOCK_SEARCH_RESPONSE["Items"][0]
-EXPECTED_REQUESTED_FIELDS = [
-    "ID",
-    "ContentType",
-    "Created",
-    "Deleted",
-    "FileName",
-    "FileLocation",
-    "NhsNumber",
-    "VirusScannerResult",
-    "CurrentGpOds",
-    "Uploaded",
-    "Uploading",
-    "LastUpdated",
-]
 
 
 @pytest.fixture
@@ -96,7 +82,6 @@ def test_fetch_available_document_references_by_type_lg_returns_list_of_doc_refe
         search_condition=TEST_NHS_NUMBER,
         query_filter=mock_filter_expression,
         exclusive_start_key=None,
-        requested_fields=EXPECTED_REQUESTED_FIELDS,
     )
 
 
@@ -120,7 +105,6 @@ def test_fetch_available_document_references_by_type_arf_returns_list_of_doc_ref
         search_condition=TEST_NHS_NUMBER,
         query_filter=mock_filter_expression,
         exclusive_start_key=None,
-        requested_fields=EXPECTED_REQUESTED_FIELDS,
     )
 
 
@@ -140,7 +124,6 @@ def test_fetch_available_document_references_by_type_lg_returns_empty_list_of_do
         search_condition=TEST_NHS_NUMBER,
         query_filter=mock_filter_expression,
         exclusive_start_key=None,
-        requested_fields=EXPECTED_REQUESTED_FIELDS,
     )
 
 
@@ -155,7 +138,6 @@ def test_fetch_documents_from_table_with_filter_returns_list_of_doc_references(
             search_condition=TEST_NHS_NUMBER,
             query_filter=mock_filter_expression,
             exclusive_start_key=None,
-            requested_fields=EXPECTED_REQUESTED_FIELDS,
         )
     ]
 
@@ -187,7 +169,6 @@ def test_fetch_documents_from_table_with_filter_returns_empty_list_of_doc_refere
             search_condition=TEST_NHS_NUMBER,
             query_filter=mock_filter_expression,
             exclusive_start_key=None,
-            requested_fields=EXPECTED_REQUESTED_FIELDS,
         )
     ]
     mock_dynamo_service.query_table_by_index.return_value = MOCK_EMPTY_RESPONSE