[PRMP-783] Add User count per practice for upload feature access in statistical report

lambdas/handlers/document_status_check_handler.py

@@ -58,6 +58,7 @@ def lambda_handler(event, context):
         document_ids=documents_id_list, nhs_number=nhs_number_query_string
     )
     if results:
+        logger.info("All documents processed successfully")
         return ApiGatewayResponse(
             status_code=200, body=json.dumps(results), methods="GET"
         ).create_api_gateway_response()

lambdas/models/report/statistics.py

@@ -52,11 +52,14 @@ class RecordStoreData(StatisticData):
 class OrganisationData(StatisticData):
     number_of_patients: int = 0
     average_records_per_patient: Decimal = Decimal(0)
-    daily_count_stored: int = 0
+    daily_count_uploaded: int = 0
     daily_count_viewed: int = 0
     daily_count_downloaded: int = 0
     daily_count_deleted: int = 0
     daily_count_searched: int = 0
+    daily_count_users_uploaded: int = 0
+    daily_count_users_reviewed: int = 0
+    daily_count_users_reassigned: int = 0
     daily_count_users_accessing_deceased: int = 0
     daily_count_ods_report_requested: int = 0
     daily_count_ods_report_created: int = 0

lambdas/services/data_collection_service.py

@@ -19,10 +19,13 @@
 from utils.cloudwatch_logs_query import (
     CloudwatchLogsQueryParams,
     CountUsersAccessedDeceasedPatient,
+    CountUsersLloydGeorgeRecordsUploaded,
+    CountUsersLloydGeorgeRecordsReassigned,
+    CountUsersLloydGeorgeRecordsReviewed,
     LloydGeorgeRecordsDeleted,
     LloydGeorgeRecordsDownloaded,
     LloydGeorgeRecordsSearched,
-    LloydGeorgeRecordsStored,
+    LloydGeorgeRecordsUploaded,
     LloydGeorgeRecordsViewed,
     OdsReportsCreated,
     OdsReportsRequested,
@@ -191,8 +194,17 @@ def get_organisation_data(
         daily_count_deleted = self.get_cloud_watch_query_result(
             LloydGeorgeRecordsDeleted, start_date, end_date
         )
-        daily_count_stored = self.get_cloud_watch_query_result(
-            LloydGeorgeRecordsStored, start_date, end_date
+        daily_count_uploaded = self.get_cloud_watch_query_result(
+            LloydGeorgeRecordsUploaded, start_date, end_date
+        )
+        daily_count_users_uploaded = self.get_cloud_watch_query_result(
+            CountUsersLloydGeorgeRecordsUploaded, start_date, end_date
+        )
+        daily_count_users_reviewed = self.get_cloud_watch_query_result(
+            CountUsersLloydGeorgeRecordsReviewed, start_date, end_date
+        )
+        daily_count_users_reassigned = self.get_cloud_watch_query_result(
+            CountUsersLloydGeorgeRecordsReassigned, start_date, end_date
         )
         daily_count_searched = self.get_cloud_watch_query_result(
             LloydGeorgeRecordsSearched, start_date, end_date
@@ -213,7 +225,10 @@ def get_organisation_data(
                 daily_count_viewed,
                 daily_count_downloaded,
                 daily_count_deleted,
-                daily_count_stored,
+                daily_count_uploaded,
+                daily_count_users_uploaded,
+                daily_count_users_reviewed,
+                daily_count_users_reassigned,
                 daily_count_searched,
                 daily_count_deceased,
                 daily_count_ods_report_requested,

lambdas/services/mock_login_redirect_service.py

@@ -25,7 +25,7 @@ def prepare_redirect_response(self, event):
 
         state = "".join(random.choices(string.ascii_letters + string.digits, k=30))
         self.save_state_in_dynamo_db(state)
-        if os.getenv("WORKSPACE") == "pre-prod":
+        if os.getenv("WORKSPACE") in ["pre-prod", "ndr-test"]:
             clean_url = re.sub(r"^api.", "", host)
         else:
             clean_url = re.sub(r"^api-", "", host)

lambdas/services/statistical_report_service.py

@@ -213,7 +213,10 @@ def reorder_columns(self, joined_data: pl.DataFrame) -> pl.DataFrame:
             "weekly_count_users_accessing_deceased",
             "weekly_count_viewed",
             "weekly_count_downloaded",
-            "weekly_count_stored",
+            "weekly_count_uploaded",
+            "weekly_count_users_uploaded",
+            "weekly_count_users_reviewed",
+            "weekly_count_users_reassigned",
             "weekly_count_deleted",
             "weekly_count_ods_report_requested",
             "weekly_count_ods_report_created",

lambdas/tests/unit/helpers/data/statistic/mock_collected_data.py

@@ -51,11 +51,14 @@
         ods_code="H81109",
         number_of_patients=2,
         average_records_per_patient=3,
-        daily_count_stored=4,
+        daily_count_uploaded=4,
         daily_count_viewed=40,
         daily_count_downloaded=20,
         daily_count_deleted=2,
         daily_count_searched=30,
+        daily_count_users_uploaded=4,
+        daily_count_users_reviewed=2,
+        daily_count_users_reassigned=2,
         daily_count_users_accessing_deceased=13,
         daily_count_ods_report_created=13,
         daily_count_ods_report_requested=20,
@@ -66,11 +69,14 @@
         ods_code="Y12345",
         number_of_patients=1,
         average_records_per_patient=2,
-        daily_count_stored=2,
+        daily_count_uploaded=2,
         daily_count_viewed=20,
         daily_count_downloaded=10,
         daily_count_deleted=1,
         daily_count_searched=50,
+        daily_count_users_uploaded=2,
+        daily_count_users_reviewed=1,
+        daily_count_users_reassigned=1,
         daily_count_users_accessing_deceased=2,
         daily_count_ods_report_created=0,
         daily_count_ods_report_requested=10,

lambdas/tests/unit/helpers/data/statistic/mock_logs_query_results.py

@@ -57,17 +57,38 @@
     },
 ]
 
-MOCK_LG_STORED = [
+MOCK_LG_UPLOADED = [
     {
         "ods_code": "Y12345",
-        "daily_count_stored": "2",
+        "daily_count_uploaded": "2",
     },
     {
         "ods_code": "H81109",
-        "daily_count_stored": "4",
+        "daily_count_uploaded": "4",
     },
 ]
 
+MOCK_USERS_LG_UPLOADED = [
+    {
+        "ods_code": "Y12345",
+        "daily_count_users_uploaded": "2",
+    },
+    {
+        "ods_code": "H81109",
+        "daily_count_users_uploaded": "4",
+    },
+]
+
+MOCK_USERS_LG_REVIEWED = [
+    {"ods_code": "Y12345", "daily_count_users_reviewed": "1"},
+    {"ods_code": "H81109", "daily_count_users_reviewed": "2"},
+]
+
+MOCK_USERS_LG_REASSIGNED = [
+    {"ods_code": "Y12345", "daily_count_users_reassigned": "1"},
+    {"ods_code": "H81109", "daily_count_users_reassigned": "2"},
+]
+
 MOCK_PATIENT_SEARCHED = [
     {
         "ods_code": "Y12345",

lambdas/tests/unit/helpers/data/statistic/mock_statistic_data.py

@@ -88,10 +88,12 @@
     ods_code="Z56789",
     number_of_patients=4,
     average_records_per_patient=Decimal("4.5"),
-    daily_count_stored=0,
+    daily_count_uploaded=0,
     daily_count_viewed=35,
     daily_count_downloaded=4,
     daily_count_deleted=1,
+    daily_count_users_reviewed=0,
+    daily_count_users_reassigned=0,
     daily_count_users_accessing_deceased=12,
     daily_count_ods_report_requested=10,
     daily_count_ods_report_created=0,
@@ -102,10 +104,12 @@
     ods_code="Y12345",
     number_of_patients=9,
     average_records_per_patient=Decimal("2.78"),
-    daily_count_stored=0,
+    daily_count_uploaded=0,
     daily_count_viewed=15,
     daily_count_downloaded=1,
     daily_count_deleted=1,
+    daily_count_users_reviewed=0,
+    daily_count_users_reassigned=0,
     daily_count_users_accessing_deceased=22,
     daily_count_ods_report_requested=2,
     daily_count_ods_report_created=2,
@@ -116,10 +120,13 @@
     ods_code="Y12345",
     number_of_patients=10,
     average_records_per_patient=Decimal("3.51"),
-    daily_count_stored=2,
+    daily_count_uploaded=2,
     daily_count_viewed=30,
     daily_count_downloaded=5,
     daily_count_deleted=1,
+    daily_count_users_uploaded=2,
+    daily_count_users_reviewed=2,
+    daily_count_users_reassigned=2,
     daily_count_users_accessing_deceased=9,
     daily_count_ods_report_requested=2,
     daily_count_ods_report_created=2,
@@ -129,11 +136,14 @@
     [
         {
             "ods_code": "Z56789",
-            "weekly_count_stored": 0,
+            "weekly_count_uploaded": 0,
             "weekly_count_viewed": 35,
             "weekly_count_downloaded": 4,
             "weekly_count_deleted": 1,
             "weekly_count_searched": 0,
+            "weekly_count_users_uploaded": 0,
+            "weekly_count_users_reviewed": 0,
+            "weekly_count_users_reassigned": 0,
             "weekly_count_users_accessing_deceased": 12,
             "weekly_count_ods_report_requested": 10,
             "weekly_count_ods_report_created": 0,
@@ -142,11 +152,14 @@
         },
         {
             "ods_code": "Y12345",
-            "weekly_count_stored": 0 + 2,
+            "weekly_count_uploaded": 0 + 2,
             "weekly_count_viewed": 15 + 30,
             "weekly_count_downloaded": 1 + 5,
             "weekly_count_deleted": 1 + 1,
             "weekly_count_searched": 0,
+            "weekly_count_users_uploaded": 0 + 2,
+            "weekly_count_users_reviewed": 2,
+            "weekly_count_users_reassigned": 2,
             "weekly_count_users_accessing_deceased": 31,
             "weekly_count_ods_report_requested": 4,
             "weekly_count_ods_report_created": 4,
@@ -163,10 +176,13 @@
         "OdsCode": "Z56789",
         "NumberOfPatients": 4,
         "AverageRecordsPerPatient": Decimal("4.5"),
-        "DailyCountStored": 0,
+        "DailyCountUploaded": 0,
         "DailyCountViewed": 35,
         "DailyCountDownloaded": 4,
         "DailyCountDeleted": 1,
+        "DailyCountUsersUploaded": 0,
+        "DailyCountUsersReviewed": 0,
+        "DailyCountUsersReassigned": 0,
         "DailyCountUsersAccessingDeceased": 12,
         "DailyCountOdsReportRequested": 10,
         "StatisticID": "OrganisationData#5acda4bf-8b93-4ba0-8410-789aac4fcbae",
@@ -176,10 +192,13 @@
         "OdsCode": "Y12345",
         "NumberOfPatients": 9,
         "AverageRecordsPerPatient": Decimal("2.78"),
-        "DailyCountStored": 0,
+        "DailyCountUploaded": 0,
         "DailyCountViewed": 15,
         "DailyCountDownloaded": 1,
         "DailyCountDeleted": 1,
+        "DailyCountUsersUploaded": 0,
+        "DailyCountUsersReviewed": 0,
+        "DailyCountUsersReassigned": 0,
         "DailyCountUsersAccessingDeceased": 22,
         "DailyCountOdsReportRequested": 2,
         "DailyCountOdsReportCreated": 2,
@@ -190,10 +209,13 @@
         "OdsCode": "Y12345",
         "NumberOfPatients": 10,
         "AverageRecordsPerPatient": Decimal("3.51"),
-        "DailyCountStored": 2,
+        "DailyCountUploaded": 2,
         "DailyCountViewed": 30,
         "DailyCountDownloaded": 5,
         "DailyCountDeleted": 1,
+        "DailyCountUsersUploaded": 2,
+        "DailyCountUsersReviewed": 2,
+        "DailyCountUsersReassigned": 2,
         "DailyCountUsersAccessingDeceased": 9,
         "DailyCountOdsReportRequested": 2,
         "DailyCountOdsReportCreated": 2,
@@ -314,7 +336,10 @@
             "Weekly count users accessing deceased": 12,
             "Weekly count viewed": 35,
             "Weekly count downloaded": 4,
-            "Weekly count stored": 0,
+            "Weekly count uploaded": 0,
+            "Weekly count users uploaded": 0,
+            "Weekly count users reviewed": 0,
+            "Weekly count users reassigned": 0,
             "Weekly count deleted": 1,
             "Weekly count ods report requested": 10,
             "Weekly count ods report created": 0,
@@ -336,7 +361,10 @@
             "Weekly count users accessing deceased": 31,
             "Weekly count viewed": 15 + 30,
             "Weekly count downloaded": 1 + 5,
-            "Weekly count stored": 0 + 2,
+            "Weekly count uploaded": 0 + 2,
+            "Weekly count users uploaded": 0 + 2,
+            "Weekly count users reviewed": 2,
+            "Weekly count users reassigned": 2,
             "Weekly count deleted": 1 + 1,
             "Weekly count ods report requested": 4,
             "Weekly count ods report created": 4,

lambdas/tests/unit/services/test_data_collection_service.py

@@ -39,20 +39,26 @@
     MOCK_DECEASED_ACCESS,
     MOCK_LG_DELETED,
     MOCK_LG_DOWNLOADED,
-    MOCK_LG_STORED,
+    MOCK_LG_UPLOADED,
     MOCK_LG_VIEWED,
     MOCK_ODS_REPORT_CREATED,
     MOCK_ODS_REPORT_REQUESTED,
     MOCK_PATIENT_SEARCHED,
     MOCK_UNIQUE_ACTIVE_USER_IDS,
+    MOCK_USERS_LG_UPLOADED,
+    MOCK_USERS_LG_REASSIGNED,
+    MOCK_USERS_LG_REVIEWED,
 )
 from utils.cloudwatch_logs_query import (
     CloudwatchLogsQueryParams,
     CountUsersAccessedDeceasedPatient,
+    CountUsersLloydGeorgeRecordsUploaded,
+    CountUsersLloydGeorgeRecordsReassigned,
+    CountUsersLloydGeorgeRecordsReviewed,
     LloydGeorgeRecordsDeleted,
     LloydGeorgeRecordsDownloaded,
     LloydGeorgeRecordsSearched,
-    LloydGeorgeRecordsStored,
+    LloydGeorgeRecordsUploaded,
     LloydGeorgeRecordsViewed,
     OdsReportsCreated,
     OdsReportsRequested,
@@ -102,8 +108,14 @@ def mock_implementation(query_params: CloudwatchLogsQueryParams, **_kwargs):
             return MOCK_LG_DOWNLOADED
         elif query_params == LloydGeorgeRecordsDeleted:
             return MOCK_LG_DELETED
-        elif query_params == LloydGeorgeRecordsStored:
-            return MOCK_LG_STORED
+        elif query_params == LloydGeorgeRecordsUploaded:
+            return MOCK_LG_UPLOADED
+        elif query_params == CountUsersLloydGeorgeRecordsUploaded:
+            return MOCK_USERS_LG_UPLOADED
+        elif query_params == CountUsersLloydGeorgeRecordsReviewed:
+            return MOCK_USERS_LG_REVIEWED
+        elif query_params == CountUsersLloydGeorgeRecordsReassigned:
+            return MOCK_USERS_LG_REASSIGNED
         elif query_params == UniqueActiveUserIds:
             return MOCK_UNIQUE_ACTIVE_USER_IDS
         elif query_params == LloydGeorgeRecordsSearched:

lambdas/tests/unit/services/test_statistical_report_service.py

@@ -211,7 +211,7 @@ def test_summarise_organisation_data_larger_mock_data(mock_service):
 
 
 def assert_weekly_counts_match_sum_of_daily_counts(mock_data, row_in_actual_data):
-    for count_type in ["viewed", "downloaded", "stored", "deleted"]:
+    for count_type in ["viewed", "downloaded", "uploaded", "deleted"]:
         expected_weekly_count = sum(
             getattr(data, f"daily_count_{count_type}") for data in mock_data
         )

lambdas/tests/unit/services/test_upload_document_reference_service.py

@@ -6,10 +6,7 @@
 from models.document_reference import DocumentReference
 from services.mock_virus_scan_service import MockVirusScanService
 from services.upload_document_reference_service import UploadDocumentReferenceService
-from tests.unit.conftest import (
-    MOCK_LG_BUCKET,
-    MOCK_STAGING_STORE_BUCKET,
-)
+from tests.unit.conftest import MOCK_LG_BUCKET, MOCK_STAGING_STORE_BUCKET
 from utils.common_query_filters import (
     FinalOrPreliminaryAndNotSuperseded,
     PreliminaryStatus,