Fixing sonarcube issue

mepr1 · mepr1 · commit 39ea0b12de75 · 2025-07-02T17:28:12.000+01:00
diff --git a/tests/regression/notes/test_additional_care_notes.py b/tests/regression/notes/test_additional_care_notes.py
@@ -129,7 +129,7 @@ def test_add_an_additional_care_note_for_a_subject_without_a_note(
     )
 
     verify_note_content_matches_expected(
-        notes_df, note_title, note_text, nhs_no, type_id
+        notes_df, note_title, note_text, type_id
     )
 
     logging.info(
@@ -189,7 +189,7 @@ def test_add_additional_care_note_for_subject_with_existing_note(
     )
 
     verify_note_content_matches_expected(
-        notes_df, note_title, note_text, nhs_no, type_id
+        notes_df, note_title, note_text, type_id
     )
 
     logging.info(
@@ -325,7 +325,7 @@ def test_update_existing_additional_care_note(
 
     # Verify title and note match the provided values
     verify_note_content_matches_expected(
-        notes_df, note_title, note_text, nhs_no, type_id
+        notes_df, note_title, note_text, type_id
     )
 
     logging.info(
diff --git a/tests/regression/notes/test_episode_notes.py b/tests/regression/notes/test_episode_notes.py
@@ -123,7 +123,7 @@ def test_add_a_episode_note_for_a_subject_without_a_note(
 
     # Verify title and note match the provided values
     verify_note_content_matches_expected(
-        notes_df, note_title, note_text, nhs_no, type_id
+        notes_df, note_title, note_text,type_id
     )
 
     logging.info(
@@ -257,7 +257,7 @@ def test_update_existing_episode_note(
 
     # Verify title and note match the provided values
     verify_note_content_matches_expected(
-        notes_df, note_title, note_text, nhs_no, type_id
+        notes_df, note_title, note_text, type_id
     )
 
     logging.info(
diff --git a/tests/regression/notes/test_kit_notes.py b/tests/regression/notes/test_kit_notes.py
@@ -124,7 +124,7 @@ def test_add_a_kit_note_for_a_subject_without_a_note(
     )
     # Verify title and note match the provided values
     verify_note_content_matches_expected(
-        notes_df, note_title, note_text, nhs_no, type_id
+        notes_df, note_title, note_text,type_id
     )
 
     logging.info(
@@ -253,7 +253,7 @@ def test_update_existing_kit_note(
 
     # Verify title and note match the provided values
     verify_note_content_matches_expected(
-        notes_df, note_title, note_text, nhs_no, type_id
+        notes_df, note_title, note_text, type_id
     )
 
     logging.info(
diff --git a/tests/regression/notes/test_subject_notes.py b/tests/regression/notes/test_subject_notes.py
@@ -125,7 +125,7 @@ def test_add_a_subject_note_for_a_subject_without_a_note(
     )
     # Verify title and note match the provided values
     verify_note_content_matches_expected(
-        notes_df, note_title, note_text, nhs_no, type_id
+        notes_df, note_title, note_text,type_id
     )
     logging.info(
         f"Verification successful: subject note added for the subject with NHS Number: {nhs_no}. "
@@ -253,7 +253,7 @@ def test_update_existing_subject_note(
 
     # Verify title and note match the provided values
     verify_note_content_matches_expected(
-        notes_df, note_title, note_text, nhs_no, type_id
+        notes_df, note_title, note_text, type_id
     )
 
     logging.info(
diff --git a/utils/subject_notes.py b/utils/subject_notes.py
@@ -68,7 +68,6 @@ def verify_note_content_matches_expected(
     notes_df: pd.DataFrame,
     expected_title: str,
     expected_note: str,
-    nhs_no: str,
     type_id: int,
 ) -> None:
     """

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ def test_add_an_additional_care_note_for_a_subject_without_a_note(`
`129`	`129`	`)`
`130`	`130`
`131`	`131`	`verify_note_content_matches_expected(`
`132`		`- notes_df, note_title, note_text, nhs_no, type_id`
	`132`	`+ notes_df, note_title, note_text, type_id`
`133`	`133`	`)`
`134`	`134`
`135`	`135`	`logging.info(`
`@@ -189,7 +189,7 @@ def test_add_additional_care_note_for_subject_with_existing_note(`
`189`	`189`	`)`
`190`	`190`
`191`	`191`	`verify_note_content_matches_expected(`
`192`		`- notes_df, note_title, note_text, nhs_no, type_id`
	`192`	`+ notes_df, note_title, note_text, type_id`
`193`	`193`	`)`
`194`	`194`
`195`	`195`	`logging.info(`
`@@ -325,7 +325,7 @@ def test_update_existing_additional_care_note(`
`325`	`325`
`326`	`326`	`# Verify title and note match the provided values`
`327`	`327`	`verify_note_content_matches_expected(`
`328`		`- notes_df, note_title, note_text, nhs_no, type_id`
	`328`	`+ notes_df, note_title, note_text, type_id`
`329`	`329`	`)`
`330`	`330`
`331`	`331`	`logging.info(`
Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ def test_add_a_episode_note_for_a_subject_without_a_note(`
`123`	`123`
`124`	`124`	`# Verify title and note match the provided values`
`125`	`125`	`verify_note_content_matches_expected(`
`126`		`- notes_df, note_title, note_text, nhs_no, type_id`
	`126`	`+ notes_df, note_title, note_text,type_id`
`127`	`127`	`)`
`128`	`128`
`129`	`129`	`logging.info(`
`@@ -257,7 +257,7 @@ def test_update_existing_episode_note(`
`257`	`257`
`258`	`258`	`# Verify title and note match the provided values`
`259`	`259`	`verify_note_content_matches_expected(`
`260`		`- notes_df, note_title, note_text, nhs_no, type_id`
	`260`	`+ notes_df, note_title, note_text, type_id`
`261`	`261`	`)`
`262`	`262`
`263`	`263`	`logging.info(`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ def test_add_a_kit_note_for_a_subject_without_a_note(`
`124`	`124`	`)`
`125`	`125`	`# Verify title and note match the provided values`
`126`	`126`	`verify_note_content_matches_expected(`
`127`		`- notes_df, note_title, note_text, nhs_no, type_id`
	`127`	`+ notes_df, note_title, note_text,type_id`
`128`	`128`	`)`
`129`	`129`
`130`	`130`	`logging.info(`
`@@ -253,7 +253,7 @@ def test_update_existing_kit_note(`
`253`	`253`
`254`	`254`	`# Verify title and note match the provided values`
`255`	`255`	`verify_note_content_matches_expected(`
`256`		`- notes_df, note_title, note_text, nhs_no, type_id`
	`256`	`+ notes_df, note_title, note_text, type_id`
`257`	`257`	`)`
`258`	`258`
`259`	`259`	`logging.info(`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ def test_add_a_subject_note_for_a_subject_without_a_note(`
`125`	`125`	`)`
`126`	`126`	`# Verify title and note match the provided values`
`127`	`127`	`verify_note_content_matches_expected(`
`128`		`- notes_df, note_title, note_text, nhs_no, type_id`
	`128`	`+ notes_df, note_title, note_text,type_id`
`129`	`129`	`)`
`130`	`130`	`logging.info(`
`131`	`131`	`f"Verification successful: subject note added for the subject with NHS Number: {nhs_no}. "`
`@@ -253,7 +253,7 @@ def test_update_existing_subject_note(`
`253`	`253`
`254`	`254`	`# Verify title and note match the provided values`
`255`	`255`	`verify_note_content_matches_expected(`
`256`		`- notes_df, note_title, note_text, nhs_no, type_id`
	`256`	`+ notes_df, note_title, note_text, type_id`
`257`	`257`	`)`
`258`	`258`
`259`	`259`	`logging.info(`