Add tests for ANATOMICAL_SITEs for vaccs imports

This tests the changes in [MAV-4631](https://nhsd-jira.digital.nhs.uk/browse/MAV-4631)

Author: alistair-white-horne-tng

mavis/test/data/import_format_details/vaccs.txt

@@ -13,7 +13,7 @@ VACCINATED	Required, must be Y or N. Can be omitted if VACCINE_GIVEN is provided
 BATCH_NUMBER	Required if BATCH_EXPIRY_DATE is provided.
 BATCH_EXPIRY_DATE	Required if BATCH_NUMBER is provided, must use either YYYYMMDD or DD/MM/YYYY format.
 PROGRAMME	Required, must be Flu, HPV, ACWYX4, MenACWY, MMR, MMRV, 3-in-1 or Td/IPV.
-ANATOMICAL_SITE	Optional, if provided must be appropriate for the vaccine delivery method and be one of: left arm (lower position), left arm (upper position), left buttock, left deltoid, left thigh, left upper arm, nasal, right arm (lower position), right arm (upper position), right buttock, right deltoid, right thigh or right upper arm.
+ANATOMICAL_SITE	Optional, if provided must be appropriate for the vaccine delivery method and be one of: left arm (lower position), left arm (upper position), left buttock, left deltoid, left lower, left lower arm, left thigh, left upper arm, nasal, right arm (lower position), right arm (upper position), right buttock, right deltoid, right lower, right lower arm, right thigh or right upper arm.
 REASON_NOT_VACCINATED	Required if VACCINATED is N, must be already had elsewhere, refused, unwell or vaccination contraindicated.
 NOTES	Optional
 DOSE_SEQUENCE	Optional, must be a number or 1B, 1P, 1st Scheduled Booster, 2B, 2P, 2nd Scheduled Booster or 3P.

mavis/test/data/vaccs/i_hist_positive.csv

@@ -35,4 +35,12 @@ MMR_DoseSeq1,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<
 MMR_DoseSeq2,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,20231114,Priorix,AutoBatch1,20300730,left upper arm,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,MMR
 HPV_PostcodeNFA,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,ZZ99 3VZ,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20300730,left upper arm,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
 HPV_PostcodeAddressNotKnown,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,ZZ99 3WZ,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20300730,left upper arm,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
-HPV_PostcodeAddressNotSpecified,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,ZZ99 3CZ,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20300730,left upper arm,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
+HPV_PostcodeAddressNotSpecified,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,ZZ99 3CZ,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20300730,left upper arm,,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
+HPV_SiteLDeltoid,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,left deltoid,1,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
+HPV_SiteLLower,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,left lower,1,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
+HPV_SiteLLowerArm,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,left lower arm,1,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
+HPV_SiteRDeltoid,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,right deltoid,1,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
+HPV_SiteRLower,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,right lower,1,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
+HPV_SiteRLowerArm,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,right lower arm,1,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
+HPV_SiteLButtock,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,left buttock,1,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV
+HPV_SiteRButtock,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<SCHOOL_0_NAME>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<HIST_VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,right buttock,1,Y,1,,,<<NURSE_EMAIL>>,Clinic,00:01,,,HPV

mavis/test/data/vaccs/i_national_reporting_positive.csv

@@ -19,3 +19,11 @@ Flu_SiteRAU,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<R
 Flu_SiteRAL,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<VACCS_DATE>>,Sequirus Cell-based Trivalent,AutoBatch1,20320730,right arm (lower position),1,Y,Nurse,Nurse,00:01,,Flu,MAVIS-123,www.mavis.com/MAVIS-123
 Flu_NotVaccinated,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<VACCS_DATE>>,Sanofi Vaxigrip,,,,,N,Nurse,Nurse,00:01,Refused,Flu,MAVIS-123,www.mavis.com/MAVIS-123
 Flu_BatchName100Chars,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<VACCS_DATE>>,AstraZeneca Fluenz,1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890,2030-12-31,nasal,1,Y,Nurse,Nurse,00:01,,Flu,MAVIS-123,www.mavis.com/MAVIS-123
+HPV_SiteLDeltoid,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,left deltoid,1,Y,Nurse,Nurse,00:01,,HPV,MAVIS-123,www.mavis.com/MAVIS-123
+HPV_SiteLLower,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,left lower,1,Y,Nurse,Nurse,00:01,,HPV,MAVIS-123,www.mavis.com/MAVIS-123
+HPV_SiteLLowerArm,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,left lower arm,1,Y,Nurse,Nurse,00:01,,HPV,MAVIS-123,www.mavis.com/MAVIS-123
+HPV_SiteRDeltoid,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,right deltoid,1,Y,Nurse,Nurse,00:01,,HPV,MAVIS-123,www.mavis.com/MAVIS-123
+HPV_SiteRLower,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,right lower,1,Y,Nurse,Nurse,00:01,,HPV,MAVIS-123,www.mavis.com/MAVIS-123
+HPV_SiteRLowerArm,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,right lower arm,1,Y,Nurse,Nurse,00:01,,HPV,MAVIS-123,www.mavis.com/MAVIS-123
+HPV_SiteLButtock,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,left buttock,1,Y,Nurse,Nurse,00:01,,HPV,MAVIS-123,www.mavis.com/MAVIS-123
+HPV_SiteRButtock,<<ORG_CODE>>,<<SCHOOL_0_URN>>,<<RANDOM_NHS_NO>>,<<RANDOM_FNAME>>,<<RANDOM_LNAME>>,<<FIXED_YEAR_GROUP_DOB>>,Male,<<RANDOM_POSTCODE>>,<<VACCS_DATE>>,Gardasil9,AutoBatch1,20301231,right buttock,1,Y,Nurse,Nurse,00:01,,HPV,MAVIS-123,www.mavis.com/MAVIS-123

mavis/test/data/vaccs/o_hist_positive.txt

@@ -1 +1 @@
-37 imported records
+45 imported records

mavis/test/data/vaccs/o_national_reporting_positive.txt

@@ -1,3 +1,3 @@
-18 new records imported
+26 new records imported
 0 duplicates not imported
 2 ‘not vaccinated’ records not imported

tests/test_import_historical_vaccinations.py

@@ -1,5 +1,6 @@
 import pytest
 
+from mavis.test.annotations import issue
 from mavis.test.constants import Programme
 from mavis.test.data import VaccsFileMapping
 from mavis.test.pages import (
@@ -27,6 +28,7 @@ def setup_hist_vaccs(
 
 
 @pytest.mark.vaccinations
+@issue("MAV-4631")
 def test_vaccination_file_upload_historic_valid_data(
     setup_hist_vaccs,
     page,

tests/test_national_reporting.py

@@ -1,5 +1,6 @@
 import pytest
 
+from mavis.test.annotations import issue
 from mavis.test.constants import Programme
 from mavis.test.data import VaccsFileMapping
 from mavis.test.fixtures.helpers import setup_national_reporting_import
@@ -16,6 +17,7 @@
 __fixtures__ = (setup_national_reporting_import,)
 
 
+@issue("MAV-4631")
 def test_national_reporting_valid_data(
     setup_national_reporting_import,
     page,