fix conflict lint

Author: Akol125

delta_backend/output.csv

@@ -0,0 +1,2 @@
+NHS_NUMBER,PERSON_FORENAME,PERSON_SURNAME,PERSON_DOB,PERSON_GENDER_CODE,PERSON_POSTCODE,DATE_AND_TIME,SITE_CODE,SITE_CODE_TYPE_URI,UNIQUE_ID,UNIQUE_ID_URI,ACTION_FLAG,PERFORMING_PROFESSIONAL_FORENAME,PERFORMING_PROFESSIONAL_SURNAME,RECORDED_DATE,PRIMARY_SOURCE,VACCINATION_PROCEDURE_CODE,VACCINATION_PROCEDURE_TERM,DOSE_SEQUENCE,VACCINE_PRODUCT_CODE,VACCINE_PRODUCT_TERM,VACCINE_MANUFACTURER,BATCH_NUMBER,EXPIRY_DATE,SITE_OF_VACCINATION_CODE,SITE_OF_VACCINATION_TERM,ROUTE_OF_VACCINATION_CODE,ROUTE_OF_VACCINATION_TERM,DOSE_AMOUNT,DOSE_UNIT_CODE,DOSE_UNIT_TERM,INDICATION_CODE,LOCATION_CODE,LOCATION_CODE_TYPE_URI,CONVERSION_ERRORS
+9990548609,test13 test14 test15,test12,20260310,9,WF8 4ED,20250306T13281701,B0C4P,https://fhir.hl7.org.uk/Id/urn-school-number,ACME-vacc123456,https://supplierABC/identifiers/vacc,UPDATE,Darren Official,Furlong official,20250101,,956951000000104,Seasonal influenza vaccination (procedure),2,39114911000001104,"COVID-19 Vaccine Vaxzevria (ChAdOx1 S [recombinant]) not less than 2.5x100,000,000 infectious units/0.5ml dose suspension for injection multidose vials (AstraZeneca UK Ltd) (product)",AstraZeneca Ltd,4120Z001,20250702,368208006,Left upper arm structure (body structure),78421000,Intramuscular route (qualifier value),0.5,,milliliter,443684005,X99999,https://fhir.nhs.uk/Id/ods-organization-code,[]

delta_backend/output.json

@@ -0,0 +1,37 @@
+{
+  "NHS_NUMBER": "9990548609",
+  "PERSON_FORENAME": "test13 test14 test15",
+  "PERSON_SURNAME": "test12",
+  "PERSON_DOB": "20260310",
+  "PERSON_GENDER_CODE": "9",
+  "PERSON_POSTCODE": "WF8 4ED",
+  "DATE_AND_TIME": "20250306T13281701",
+  "SITE_CODE": "B0C4P",
+  "SITE_CODE_TYPE_URI": "https://fhir.hl7.org.uk/Id/urn-school-number",
+  "UNIQUE_ID": "ACME-vacc123456",
+  "UNIQUE_ID_URI": "https://supplierABC/identifiers/vacc",
+  "ACTION_FLAG": "UPDATE",
+  "PERFORMING_PROFESSIONAL_FORENAME": "Darren Official",
+  "PERFORMING_PROFESSIONAL_SURNAME": "Furlong official",
+  "RECORDED_DATE": "20250101",
+  "PRIMARY_SOURCE": "",
+  "VACCINATION_PROCEDURE_CODE": "956951000000104",
+  "VACCINATION_PROCEDURE_TERM": "Seasonal influenza vaccination (procedure)",
+  "DOSE_SEQUENCE": "2",
+  "VACCINE_PRODUCT_CODE": "39114911000001104",
+  "VACCINE_PRODUCT_TERM": "COVID-19 Vaccine Vaxzevria (ChAdOx1 S [recombinant]) not less than 2.5x100,000,000 infectious units/0.5ml dose suspension for injection multidose vials (AstraZeneca UK Ltd) (product)",
+  "VACCINE_MANUFACTURER": "AstraZeneca Ltd",
+  "BATCH_NUMBER": "4120Z001",
+  "EXPIRY_DATE": "20250702",
+  "SITE_OF_VACCINATION_CODE": "368208006",
+  "SITE_OF_VACCINATION_TERM": "Left upper arm structure (body structure)",
+  "ROUTE_OF_VACCINATION_CODE": "78421000",
+  "ROUTE_OF_VACCINATION_TERM": "Intramuscular route (qualifier value)",
+  "DOSE_AMOUNT": 0.5,
+  "DOSE_UNIT_CODE": "",
+  "DOSE_UNIT_TERM": "milliliter",
+  "INDICATION_CODE": "443684005",
+  "LOCATION_CODE": "X99999",
+  "LOCATION_CODE_TYPE_URI": "https://fhir.nhs.uk/Id/ods-organization-code",
+  "CONVERSION_ERRORS": []
+}

lambdas/shared/src/common/log_firehose.py

@@ -1,9 +1,7 @@
 import json
 
-from common.clients import (
-    firehose_client,
-    logger,
-)
+from common.clients import firehose_client
+from common.clients import logger
 
 
 def send_log_to_firehose(stream_name, log_data: dict) -> None:

lambdas/shared/tests/test_common/test_log_decorator.py

@@ -3,10 +3,8 @@
 from datetime import datetime
 from unittest.mock import patch
 
-from common.log_decorator import (
-    generate_and_send_logs,
-    logging_decorator,
-)
+from common.log_decorator import generate_and_send_logs
+from common.log_decorator import logging_decorator
 
 
 class TestLogDecorator(unittest.TestCase):