Skip to content

Commit c6ee2ea

Browse files
sandyforresternhssandyforresternhs
committed
Merge branch 'develop' into feature/SAFO6-NRL-1949-assign-pointer-type-perms-via-new-model
2 parents 2caf29a + 940a090 commit c6ee2ea

File tree

6 files changed

+33
-33
lines changed

6 files changed

+33
-33
lines changed

‎api/consumer/swagger.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ paths:
7474
subject:
7575
identifier:
7676
system: https://fhir.nhs.uk/Id/nhs-number
77-
value: "4409815415"
77+
value: "9000000017"
7878
date: "2022-12-20T09:45:41+11:00"
7979
author:
8080
- identifier:
@@ -200,7 +200,7 @@ paths:
200200
subject:
201201
identifier:
202202
system: https://fhir.nhs.uk/Id/nhs-number
203-
value: "4409815415"
203+
value: "9000000017"
204204
date: "2022-12-21T10:45:41+11:00"
205205
author:
206206
- identifier:
@@ -315,7 +315,7 @@ paths:
315315
subject:
316316
identifier:
317317
system: https://fhir.nhs.uk/Id/nhs-number
318-
value: "4409815415"
318+
value: "9000000017"
319319
date: "2022-12-22T11:45:41+11:00"
320320
author:
321321
- identifier:
@@ -1308,7 +1308,7 @@ components:
13081308
RequestQuerySubject:
13091309
type: string
13101310
pattern: ^https\:\/\/fhir\.nhs\.uk\/Id\/nhs-number\|(\d+)$
1311-
example: "https://fhir.nhs.uk/Id/nhs-number|4409815415"
1311+
example: "https://fhir.nhs.uk/Id/nhs-number|9000000017"
13121312
RequestQueryCustodian:
13131313
type: string
13141314
pattern: ^https\:\/\/fhir\.nhs\.uk\/Id\/ods-organization-code\|(\w+)$
@@ -1362,13 +1362,13 @@ components:
13621362
value: ""
13631363
valid_1:
13641364
summary: "Valid #1"
1365-
value: https://fhir.nhs.uk/Id/nhs-number|4409815415
1365+
value: https://fhir.nhs.uk/Id/nhs-number|9000000017
13661366
valid_2:
13671367
summary: "Valid #2"
1368-
value: https://fhir.nhs.uk/Id/nhs-number|3495456481
1368+
value: https://fhir.nhs.uk/Id/nhs-number|9999999999
13691369
invalid:
13701370
summary: Unknown
1371-
value: https://fhir.nhs.uk/Id/nhs-number|3495456001
1371+
value: https://fhir.nhs.uk/Id/nhs-number|9000000001
13721372
custodian:
13731373
name: custodian:identifier
13741374
in: query

‎api/producer/swagger.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ paths:
7272
"subject": {
7373
"identifier": {
7474
"system": "https://fhir.nhs.uk/Id/nhs-number",
75-
"value": "3495456481"
75+
"value": "9999999999"
7676
}
7777
},
7878
```
@@ -231,7 +231,7 @@ paths:
231231
subject:
232232
identifier:
233233
system: https://fhir.nhs.uk/Id/nhs-number
234-
value: "3495456481"
234+
value: "9999999999"
235235
date: "2022-12-22T11:45:41+11:00"
236236
author:
237237
- identifier:
@@ -308,7 +308,7 @@ paths:
308308
subject:
309309
identifier:
310310
system: https://fhir.nhs.uk/Id/nhs-number
311-
value: "3495456481"
311+
value: "9999999999"
312312
date: "2022-12-21T10:45:41+11:00"
313313
author:
314314
- identifier:
@@ -513,7 +513,7 @@ paths:
513513
subject:
514514
identifier:
515515
system: https://fhir.nhs.uk/Id/nhs-number
516-
value: "3495456481"
516+
value: "9999999999"
517517
date: "2022-12-22T11:45:41+11:00"
518518
author:
519519
- identifier:
@@ -590,7 +590,7 @@ paths:
590590
subject:
591591
identifier:
592592
system: https://fhir.nhs.uk/Id/nhs-number
593-
value: "3495456481"
593+
value: "9999999999"
594594
date: "2022-12-21T10:45:41+11:00"
595595
author:
596596
- identifier:
@@ -708,7 +708,7 @@ paths:
708708
subject:
709709
identifier:
710710
system: https://fhir.nhs.uk/Id/nhs-number
711-
value: "4409815415"
711+
value: "9000000017"
712712
date: "2022-12-22T11:45:41+11:00"
713713
author:
714714
- identifier:
@@ -1951,7 +1951,7 @@ components:
19511951
RequestQuerySubject:
19521952
type: string
19531953
pattern: ^https\:\/\/fhir\.nhs\.uk\/Id\/nhs-number\|(\d+)$
1954-
example: "https://fhir.nhs.uk/Id/nhs-number|4409815415"
1954+
example: "https://fhir.nhs.uk/Id/nhs-number|9000000017"
19551955
RequestQueryType:
19561956
type: string
19571957
example: "http://snomed.info/sct|736253002"
@@ -1997,13 +1997,13 @@ components:
19971997
value: ""
19981998
valid_1:
19991999
summary: "Valid #1"
2000-
value: https://fhir.nhs.uk/Id/nhs-number|4409815415
2000+
value: https://fhir.nhs.uk/Id/nhs-number|9000000017
20012001
valid_2:
20022002
summary: "Valid #2"
2003-
value: https://fhir.nhs.uk/Id/nhs-number|3495456481
2003+
value: https://fhir.nhs.uk/Id/nhs-number|9999999999
20042004
invalid:
20052005
summary: Unknown
2006-
value: https://fhir.nhs.uk/Id/nhs-number|3495456001
2006+
value: https://fhir.nhs.uk/Id/nhs-number|9000000001
20072007
type:
20082008
name: type
20092009
in: query

‎layer/nrlf/consumer/fhir/r4/model.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ class RequestQuerySubject(RootModel[str]):
423423
root: Annotated[
424424
str,
425425
Field(
426-
examples=["https://fhir.nhs.uk/Id/nhs-number|4409815415"],
426+
examples=["https://fhir.nhs.uk/Id/nhs-number|9000000017"],
427427
pattern="^https\\:\\/\\/fhir\\.nhs\\.uk\\/Id\\/nhs-number\\|(\\d+)$",
428428
),
429429
]

‎layer/nrlf/producer/fhir/r4/model.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ class RequestQuerySubject(RootModel[str]):
467467
root: Annotated[
468468
str,
469469
Field(
470-
examples=["https://fhir.nhs.uk/Id/nhs-number|4409815415"],
470+
examples=["https://fhir.nhs.uk/Id/nhs-number|9000000017"],
471471
pattern="^https\\:\\/\\/fhir\\.nhs\\.uk\\/Id\\/nhs-number\\|(\\d+)$",
472472
),
473473
]

‎layer/nrlf/producer/fhir/r4/strict_model.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ class RequestPathParams(Parent):
417417

418418
class RequestQuerySubject(RootModel[StrictStr]):
419419
root: Annotated[
420-
StrictStr, Field(examples=["https://fhir.nhs.uk/Id/nhs-number|4409815415"])
420+
StrictStr, Field(examples=["https://fhir.nhs.uk/Id/nhs-number|9000000017"])
421421
]
422422

423423

0 commit comments

Comments
 (0)