Merge pull request #513 from NHSDigital/mav-691

Mav 691

Author: chinmaymudholkar1

mavis/test/data/__init__.py

@@ -8,7 +8,7 @@
 import pandas as pd
 from faker import Faker
 
-from mavis.test.models import Child, Organisation, Programme, School, User
+from mavis.test.models import Child, Clinic, Organisation, Programme, School, Team, User
 from mavis.test.wrappers import (
     get_current_datetime,
     get_current_time,
@@ -52,6 +52,7 @@ class VaccsFileMapping(FileMapping):
     SYSTMONE_WHITESPACE = "systmone_whitespace"
     HIST_FLU_NIVS = "hist_flu_nivs"
     HIST_FLU_SYSTMONE = "hist_flu_systmone"
+    CLINIC_NAME_CASE = "clinic_name_case"
 
     @property
     def folder(self) -> Path:
@@ -108,17 +109,21 @@ class TestData:
 
     def __init__(
         self,
+        team: Team,
         organisation: Organisation,
         schools: dict[str, list[School]],
         nurse: User,
         children: dict[str, list[Child]],
+        clinics: list[Clinic],
         year_groups: dict[str, str],
     ):
         self.organisation = organisation
         self.schools = schools
         self.nurse = nurse
         self.children = children
+        self.clinics = clinics
         self.year_groups = year_groups
+        self.team = team
 
         self.faker = Faker(locale="en_GB")
 
@@ -160,6 +165,12 @@ def create_file_from_template(
         if self.nurse:
             static_replacements["<<NURSE_EMAIL>>"] = self.nurse.username
 
+        if self.clinics:
+            clinics = self.clinics
+            for index, clinic in enumerate(clinics):
+                static_replacements[f"<<CLINIC_{index}_LOWER>>"] = clinic.name.lower()
+                static_replacements[f"<<CLINIC_{index}>>"] = clinic.name
+
         if self.children:
             children = self.children[programme_group]
             for index, child in enumerate(children):

mavis/test/data/vaccs/i_clinic_name_case.csv

@@ -0,0 +1,4 @@
+TEST_DESC_IGNORED,ORGANISATION_CODE,SCHOOL_URN,SCHOOL_NAME,NHS_NUMBER,PERSON_FORENAME,PERSON_SURNAME,PERSON_DOB,PERSON_GENDER_CODE,PERSON_POSTCODE,DATE_OF_VACCINATION,VACCINE_GIVEN,BATCH_NUMBER,BATCH_EXPIRY_DATE,ANATOMICAL_SITE,DOSE_SEQUENCE,VACCINATED,CARE_SETTING,PERFORMING_PROFESSIONAL_FORENAME,PERFORMING_PROFESSIONAL_SURNAME,PERFORMING_PROFESSIONAL_EMAIL,CLINIC_NAME,TIME_OF_VACCINATION,REASON_NOT_VACCINATED,SESSION_ID,PROGRAMME
+IncorrectSpelling,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,20100812,Male,DN9 1PB,<<VACCS_DATE>>,Gardasil9,AutoBatch1,20320730,right arm (lower position),1,Y,2,,,<<NURSE_EMAIL>>,Royal Arsenal Med Centre,00:01,,<<SESSION_ID>>,HPV
+IncorrectCase,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,20100811,Male,DN9 1PB,<<VACCS_DATE>>,Gardasil9,AutoBatch1,20320730,right arm (lower position),1,Y,2,,,<<NURSE_EMAIL>>,<<CLINIC_0_LOWER>>,00:01,,<<SESSION_ID>>,HPV
+CorrectCase,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,20100813,Male,DN9 1PB,<<VACCS_DATE>>,Gardasil9,AutoBatch1,20320730,right arm (lower position),1,Y,2,,,<<NURSE_EMAIL>>,<<CLINIC_0>>,00:01,,<<SESSION_ID>>,HPV

mavis/test/data/vaccs/o_clinic_name_case.txt

@@ -0,0 +1,3 @@
+Row 2 CLINIC_NAME: is not recognised
+!Row 3
+!Row 4

mavis/test/fixtures/helpers.py

@@ -1,7 +1,7 @@
+import os
 from datetime import date, timedelta
 
 import pytest
-import os
 
 from mavis.test.data import TestData
 from mavis.test.models import Vaccine
@@ -102,8 +102,8 @@ def log_in_as_nurse(set_feature_flags, nurse, team, log_in_page):
 
 
 @pytest.fixture
-def test_data(organisation, schools, nurse, children, year_groups):
-    return TestData(organisation, schools, nurse, children, year_groups)
+def test_data(team, organisation, schools, nurse, children, clinics, year_groups):
+    return TestData(team, organisation, schools, nurse, children, clinics, year_groups)
 
 
 @pytest.fixture

mavis/test/fixtures/models.py

@@ -16,14 +16,14 @@
 from mavis.test.models import (
     Child,
     Clinic,
-    Team,
+    Organisation,
     Parent,
+    Programme,
     Relationship,
     School,
     Subteam,
+    Team,
     User,
-    Programme,
-    Organisation,
 )
 from mavis.test.wrappers import get_date_of_birth_for_year_group, normalize_whitespace
 

tests/test_import_records.py

@@ -65,6 +65,44 @@ def setup_vaccs(
         sessions_page.delete_all_sessions(school)
 
 
+@pytest.fixture
+def setup_vaccs_clinic(
+    log_in_as_nurse,
+    schools,
+    dashboard_page,
+    sessions_page,
+    import_records_page,
+):
+    school = schools[Programme.HPV][0]
+    try:
+        dashboard_page.click_sessions()
+        sessions_page.schedule_a_valid_session(
+            "Community clinic", Programme.HPV, for_today=True
+        )
+        dashboard_page.click_mavis()
+        dashboard_page.click_sessions()
+        sessions_page.schedule_a_valid_session(school, Programme.HPV, for_today=True)
+        sessions_page.click_import_class_lists()
+        sessions_page.select_year_groups_for_programme(Programme.HPV)
+        import_records_page.upload_and_verify_output(
+            ClassFileMapping.RANDOM_CHILD_YEAR_9
+        )
+        dashboard_page.click_mavis()
+        dashboard_page.click_sessions()
+        sessions_page.click_session_for_programme_group(
+            "Community clinic", Programme.HPV
+        )
+        session_id = sessions_page.get_session_id_from_offline_excel()
+        dashboard_page.click_mavis()
+        dashboard_page.click_import_records()
+        import_records_page.navigate_to_vaccination_records_import()
+        yield session_id
+    finally:
+        dashboard_page.click_mavis()
+        dashboard_page.click_sessions()
+        sessions_page.delete_all_sessions("Community clinic")
+
+
 @pytest.fixture
 def setup_vaccs_systmone(
     log_in_as_nurse,
@@ -365,3 +403,13 @@ def test_vaccs_systmone_disallow_flu_for_previous_years(
     import_records_page.upload_and_verify_output(
         VaccsFileMapping.HIST_FLU_SYSTMONE, session_id=setup_vaccs_systmone
     )
+
+
+@issue("MAV-691")
+@pytest.mark.vaccinations
+@pytest.mark.bug
+def test_vaccs_community_clinic_name_case(setup_vaccs_clinic, import_records_page):
+    import_records_page.upload_and_verify_output(
+        VaccsFileMapping.CLINIC_NAME_CASE,
+        session_id=setup_vaccs_clinic,
+    )

utils/001_cleanup.py

@@ -1,7 +1,7 @@
 import os
 
 #  This script is designed to be run manually to clear down the 'working', 'reports' and 'screenshots' directories.
-folders_to_clean = ["working"]  # "reports"
+folders_to_clean = ["working", "allure-results"]  # "reports"
 
 
 def cleanup() -> None: