Skip to content

Commit 6e3de21

Browse files
mattdean3-nhsmattdean3-nhs
committed
[NRL-829] Fixup smoketests. Fix remaining deprecated calls
1 parent 52d82f8 commit 6e3de21

File tree

27 files changed

+118
-118
lines changed

27 files changed

+118
-118
lines changed

‎api/consumer/readDocumentReference/tests/test_read_document_reference_consumer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def test_read_document_reference_happy_path(repository: DocumentPointerRepositor
3636
}
3737

3838
parsed_body = json.loads(body)
39-
assert parsed_body == doc_ref.dict(exclude_none=True)
39+
assert parsed_body == doc_ref.model_dump(exclude_none=True)
4040

4141

4242
@mock_aws

‎api/consumer/searchDocumentReference/tests/test_search_document_reference_consumer.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def test_search_document_reference_happy_path(repository: DocumentPointerReposit
4949
}
5050
],
5151
"total": 1,
52-
"entry": [{"resource": doc_ref.dict(exclude_none=True)}],
52+
"entry": [{"resource": doc_ref.model_dump(exclude_none=True)}],
5353
}
5454

5555

@@ -90,7 +90,7 @@ def test_search_document_reference_happy_path_with_custodian(
9090
}
9191
],
9292
"total": 1,
93-
"entry": [{"resource": doc_ref.dict(exclude_none=True)}],
93+
"entry": [{"resource": doc_ref.model_dump(exclude_none=True)}],
9494
}
9595

9696

@@ -131,7 +131,7 @@ def test_search_document_reference_happy_path_with_type(
131131
}
132132
],
133133
"total": 1,
134-
"entry": [{"resource": doc_ref.dict(exclude_none=True)}],
134+
"entry": [{"resource": doc_ref.model_dump(exclude_none=True)}],
135135
}
136136

137137

@@ -178,7 +178,7 @@ def test_search_document_reference_happy_path_with_nicip_type(
178178
}
179179
],
180180
"total": 1,
181-
"entry": [{"resource": doc_ref.dict(exclude_none=True)}],
181+
"entry": [{"resource": doc_ref.model_dump(exclude_none=True)}],
182182
}
183183

184184

‎api/consumer/searchPostDocumentReference/search_post_document_reference.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def handler(
9595
document_reference = DocumentReference.model_validate_json(result.document)
9696
bundle["total"] += 1
9797
bundle["entry"].append(
98-
{"resource": document_reference.dict(exclude_none=True)}
98+
{"resource": document_reference.model_dump(exclude_none=True)}
9999
)
100100
logger.log(
101101
LogReference.CONPOSTSEARCH004,

‎api/consumer/searchPostDocumentReference/tests/test_search_post_document_reference_consumer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def test_search_post_document_reference_happy_path(
5454
}
5555
],
5656
"total": 1,
57-
"entry": [{"resource": doc_ref.dict(exclude_none=True)}],
57+
"entry": [{"resource": doc_ref.model_dump(exclude_none=True)}],
5858
}
5959

6060

@@ -97,7 +97,7 @@ def test_search_post_document_reference_happy_path_with_custodian(
9797
}
9898
],
9999
"total": 1,
100-
"entry": [{"resource": doc_ref.dict(exclude_none=True)}],
100+
"entry": [{"resource": doc_ref.model_dump(exclude_none=True)}],
101101
}
102102

103103

@@ -140,7 +140,7 @@ def test_search_post_document_reference_happy_path_with_type(
140140
}
141141
],
142142
"total": 1,
143-
"entry": [{"resource": doc_ref.dict(exclude_none=True)}],
143+
"entry": [{"resource": doc_ref.model_dump(exclude_none=True)}],
144144
}
145145

146146

‎api/producer/createDocumentReference/tests/test_create_document_reference.py‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ def test_create_document_reference_invalid_resource():
263263

264264
event = create_test_api_gateway_event(
265265
headers=create_headers(),
266-
body=doc_ref.json(exclude_none=True),
266+
body=doc_ref.model_dump_json(exclude_none=True),
267267
)
268268

269269
result = handler(event, create_mock_context())
@@ -304,7 +304,7 @@ def test_create_document_reference_with_no_custodian():
304304

305305
event = create_test_api_gateway_event(
306306
headers=create_headers(),
307-
body=doc_ref.json(exclude_none=True),
307+
body=doc_ref.model_dump_json(exclude_none=True),
308308
)
309309

310310
result = handler(event, create_mock_context())
@@ -347,7 +347,7 @@ def test_create_document_reference_invalid_custodian_id():
347347

348348
event = create_test_api_gateway_event(
349349
headers=create_headers(),
350-
body=doc_ref.json(exclude_none=True),
350+
body=doc_ref.model_dump_json(exclude_none=True),
351351
)
352352

353353
result = handler(event, create_mock_context())
@@ -391,7 +391,7 @@ def test_create_document_reference_invalid_pointer_type():
391391

392392
event = create_test_api_gateway_event(
393393
headers=create_headers(),
394-
body=doc_ref.json(exclude_none=True),
394+
body=doc_ref.model_dump_json(exclude_none=True),
395395
)
396396

397397
result = handler(event, create_mock_context())
@@ -436,7 +436,7 @@ def test_create_document_reference_invalid_category_type():
436436

437437
event = create_test_api_gateway_event(
438438
headers=create_headers(),
439-
body=doc_ref.json(exclude_none=True),
439+
body=doc_ref.model_dump_json(exclude_none=True),
440440
)
441441

442442
result = handler(event, create_mock_context())
@@ -482,7 +482,7 @@ def test_create_document_reference_no_relatesto_target():
482482

483483
event = create_test_api_gateway_event(
484484
headers=create_headers(),
485-
body=doc_ref.json(exclude_none=True),
485+
body=doc_ref.model_dump_json(exclude_none=True),
486486
)
487487

488488
result = handler(event, create_mock_context())
@@ -531,7 +531,7 @@ def test_create_document_reference_invalid_relatesto_target_producer_id():
531531

532532
event = create_test_api_gateway_event(
533533
headers=create_headers(),
534-
body=doc_ref.json(exclude_none=True),
534+
body=doc_ref.model_dump_json(exclude_none=True),
535535
)
536536

537537
result = handler(event, create_mock_context())
@@ -583,7 +583,7 @@ def test_create_document_reference_invalid_relatesto_not_exists(repository):
583583

584584
event = create_test_api_gateway_event(
585585
headers=create_headers(),
586-
body=doc_ref.json(exclude_none=True),
586+
body=doc_ref.model_dump_json(exclude_none=True),
587587
)
588588

589589
result = handler(event, create_mock_context())
@@ -644,7 +644,7 @@ def test_create_document_reference_invalid_relatesto_nhs_number(
644644

645645
event = create_test_api_gateway_event(
646646
headers=create_headers(),
647-
body=doc_ref.json(exclude_none=True),
647+
body=doc_ref.model_dump_json(exclude_none=True),
648648
)
649649

650650
result = handler(event, create_mock_context())
@@ -707,7 +707,7 @@ def test_create_document_reference_invalid_relatesto_type(
707707
headers=create_headers(
708708
app_id="123456",
709709
),
710-
body=doc_ref.json(exclude_none=True),
710+
body=doc_ref.model_dump_json(exclude_none=True),
711711
)
712712

713713
result = handler(event, create_mock_context())
@@ -754,7 +754,7 @@ def test_create_document_reference_with_no_context_related_for_ssp_url(
754754

755755
event = create_test_api_gateway_event(
756756
headers=create_headers(),
757-
body=doc_ref.json(exclude_none=True),
757+
body=doc_ref.model_dump_json(exclude_none=True),
758758
)
759759

760760
result = handler(event, create_mock_context())
@@ -808,7 +808,7 @@ def test_create_document_reference_with_no_asid_in_for_ssp_url(
808808

809809
event = create_test_api_gateway_event(
810810
headers=create_headers(),
811-
body=doc_ref.json(exclude_none=True),
811+
body=doc_ref.model_dump_json(exclude_none=True),
812812
)
813813

814814
result = handler(event, create_mock_context())
@@ -862,7 +862,7 @@ def test_create_document_reference_with_invalid_asid_for_ssp_url(
862862

863863
event = create_test_api_gateway_event(
864864
headers=create_headers(),
865-
body=doc_ref.json(exclude_none=True),
865+
body=doc_ref.model_dump_json(exclude_none=True),
866866
)
867867

868868
result = handler(event, create_mock_context())
@@ -921,7 +921,7 @@ def test_create_document_reference_supersede_deletes_old_pointers_replace(
921921

922922
event = create_test_api_gateway_event(
923923
headers=create_headers(),
924-
body=doc_ref.json(exclude_none=True),
924+
body=doc_ref.model_dump_json(exclude_none=True),
925925
)
926926

927927
result = handler(event, create_mock_context())
@@ -982,7 +982,7 @@ def test_create_document_reference_supersede_succeeds_with_toggle(
982982

983983
event = create_test_api_gateway_event(
984984
headers=create_headers(nrl_permissions=["supersede-ignore-delete-fail"]),
985-
body=doc_ref.json(exclude_none=True),
985+
body=doc_ref.model_dump_json(exclude_none=True),
986986
)
987987

988988
result = handler(event, create_mock_context())
@@ -1042,7 +1042,7 @@ def test_create_document_reference_supersede_fails_without_toggle(
10421042

10431043
event = create_test_api_gateway_event(
10441044
headers=create_headers(),
1045-
body=doc_ref.json(exclude_none=True),
1045+
body=doc_ref.model_dump_json(exclude_none=True),
10461046
)
10471047

10481048
result = handler(event, create_mock_context())
@@ -1101,7 +1101,7 @@ def test_create_document_reference_create_relatesto_not_replaces(
11011101

11021102
event = create_test_api_gateway_event(
11031103
headers=create_headers(),
1104-
body=doc_ref.json(exclude_none=True),
1104+
body=doc_ref.model_dump_json(exclude_none=True),
11051105
)
11061106

11071107
result = handler(event, create_mock_context())
@@ -1352,8 +1352,8 @@ def test__set_create_time_fields(doc_ref_name: str):
13521352

13531353
response = _set_create_time_fields(test_time, test_doc_ref, test_perms)
13541354

1355-
assert response.dict(exclude_none=True) == {
1356-
**test_doc_ref.dict(exclude_none=True),
1355+
assert response.model_dump(exclude_none=True) == {
1356+
**test_doc_ref.model_dump(exclude_none=True),
13571357
"meta": {
13581358
"lastUpdated": "2024-03-24T12:34:56.789Z",
13591359
},
@@ -1376,8 +1376,8 @@ def test__set_create_time_fields_when_doc_has_date_and_perms(doc_ref_name: str):
13761376

13771377
response = _set_create_time_fields(test_time, test_doc_ref, test_perms)
13781378

1379-
assert response.dict(exclude_none=True) == {
1380-
**test_doc_ref.dict(exclude_none=True),
1379+
assert response.model_dump(exclude_none=True) == {
1380+
**test_doc_ref.model_dump(exclude_none=True),
13811381
"meta": {
13821382
"lastUpdated": test_time,
13831383
},
@@ -1393,8 +1393,8 @@ def test__set_create_time_fields_when_no_date_but_perms():
13931393

13941394
response = _set_create_time_fields(test_time, test_doc_ref, test_perms)
13951395

1396-
assert response.dict(exclude_none=True) == {
1397-
**test_doc_ref.dict(exclude_none=True),
1396+
assert response.model_dump(exclude_none=True) == {
1397+
**test_doc_ref.model_dump(exclude_none=True),
13981398
"meta": {
13991399
"lastUpdated": test_time,
14001400
},

‎api/producer/readDocumentReference/tests/test_read_document_reference_producer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def test_read_document_reference_happy_path(repository: DocumentPointerRepositor
3636
}
3737

3838
parsed_body = json.loads(body)
39-
assert parsed_body == doc_ref.dict(exclude_none=True)
39+
assert parsed_body == doc_ref.model_dump(exclude_none=True)
4040

4141

4242
@mock_aws

‎api/producer/searchDocumentReference/search_document_reference.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def handler(
8080
document_reference = DocumentReference.model_validate_json(result.document)
8181
bundle["total"] += 1
8282
bundle["entry"].append(
83-
{"resource": document_reference.dict(exclude_none=True)}
83+
{"resource": document_reference.model_dump(exclude_none=True)}
8484
)
8585
logger.log(
8686
LogReference.PROSEARCH004,

‎api/producer/searchDocumentReference/tests/test_search_document_reference_producer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def test_search_document_reference_happy_path(repository: DocumentPointerReposit
4343
"resourceType": "Bundle",
4444
"type": "searchset",
4545
"total": 1,
46-
"entry": [{"resource": doc_ref.dict(exclude_none=True)}],
46+
"entry": [{"resource": doc_ref.model_dump(exclude_none=True)}],
4747
}
4848

4949

@@ -268,7 +268,7 @@ def test_search_document_reference_filters_by_type(
268268
"resourceType": "Bundle",
269269
"type": "searchset",
270270
"total": 1,
271-
"entry": [{"resource": doc_ref.dict(exclude_none=True)}],
271+
"entry": [{"resource": doc_ref.model_dump(exclude_none=True)}],
272272
}
273273

274274

‎api/producer/searchPostDocumentReference/search_post_document_reference.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def handler(
7474
document_reference = DocumentReference.model_validate_json(result.document)
7575
bundle["total"] += 1
7676
bundle["entry"].append(
77-
{"resource": document_reference.dict(exclude_none=True)}
77+
{"resource": document_reference.model_dump(exclude_none=True)}
7878
)
7979
logger.log(
8080
LogReference.PROPOSTSEARCH004,

‎api/producer/searchPostDocumentReference/tests/test_search_post_document_reference_producer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ def test_search_document_reference_happy_path(repository: DocumentPointerReposit
4747
"resourceType": "Bundle",
4848
"type": "searchset",
4949
"total": 1,
50-
"entry": [{"resource": doc_ref.dict(exclude_none=True)}],
50+
"entry": [{"resource": doc_ref.model_dump(exclude_none=True)}],
5151
}
5252

5353

@@ -277,7 +277,7 @@ def test_search_document_reference_filters_by_type(
277277
"resourceType": "Bundle",
278278
"type": "searchset",
279279
"total": 1,
280-
"entry": [{"resource": doc_ref.dict(exclude_none=True)}],
280+
"entry": [{"resource": doc_ref.model_dump(exclude_none=True)}],
281281
}
282282

283283

0 commit comments

Comments
 (0)