Skip to content

Commit 47e8ed9

Browse files
MatMooreMatMoore
authored
Merge pull request #79 from NHSDigital/dtoss-9203-uuuid-primary-keys
Add uuid fields to all the models
2 parents 87164ec + 11d798c commit 47e8ed9

13 files changed

Lines changed: 357 additions & 64 deletions

File tree

‎manage_breast_screening/clinics/admin.py‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,21 @@
22

33
from .models import Appointment, Clinic, ClinicSlot, Provider, ScreeningEpisode, Setting
44

5-
admin.site.register(Appointment)
5+
6+
class AppointmentAdmin(admin.ModelAdmin):
7+
list_display = [
8+
"name",
9+
"clinic_slot__starts_at",
10+
"clinic_slot__duration_in_minutes",
11+
"status",
12+
]
13+
14+
@admin.display()
15+
def name(self, obj):
16+
return obj.screening_episode.participant.full_name
17+
18+
19+
admin.site.register(Appointment, AppointmentAdmin)
620
admin.site.register(Clinic)
721
admin.site.register(ClinicSlot)
822
admin.site.register(Provider)

‎manage_breast_screening/clinics/fixtures/clinics.json‎

Lines changed: 41 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"model": "clinics.provider",
4-
"pk": 1,
4+
"pk": "5d832870-c741-41f7-ae63-c970151a4e3a",
55
"fields": {
66
"created_at": "2025-04-04T09:19:24.083Z",
77
"updated_at": "2025-04-04T09:19:24.083Z",
@@ -10,21 +10,21 @@
1010
},
1111
{
1212
"model": "clinics.setting",
13-
"pk": 1,
13+
"pk": "4665ee3d-21b3-414f-a689-3e58f416d68c",
1414
"fields": {
1515
"created_at": "2025-04-04T09:19:54.619Z",
1616
"updated_at": "2025-04-04T09:19:54.619Z",
1717
"name": "West Sussex BSS",
18-
"provider": 1
18+
"provider": "5d832870-c741-41f7-ae63-c970151a4e3a"
1919
}
2020
},
2121
{
2222
"model": "clinics.clinic",
23-
"pk": 1,
23+
"pk": "ce662c8b-92dc-4c82-9d5d-1ddcb201e2b6",
2424
"fields": {
2525
"created_at": "2025-04-04T09:20:35.518Z",
2626
"updated_at": "2025-04-04T09:20:35.518Z",
27-
"setting": 1,
27+
"setting": "4665ee3d-21b3-414f-a689-3e58f416d68c",
2828
"starts_at": "2025-04-01T09:00:00Z",
2929
"ends_at": "2025-04-04T17:00:00Z",
3030
"type": "SCREENING",
@@ -34,165 +34,165 @@
3434
},
3535
{
3636
"model": "clinics.clinicslot",
37-
"pk": 1,
37+
"pk": "d1df208b-955a-4b2f-a908-2728aea6b29f",
3838
"fields": {
3939
"created_at": "2025-04-04T09:20:35.518Z",
4040
"updated_at": "2025-04-04T09:20:35.518Z",
41-
"clinic": 1,
41+
"clinic": "ce662c8b-92dc-4c82-9d5d-1ddcb201e2b6",
4242
"starts_at": "2025-05-01T09:00:00Z",
4343
"duration_in_minutes": 30
4444
}
4545
},
4646
{
4747
"model": "clinics.clinicslot",
48-
"pk": 2,
48+
"pk": "cc428100-3397-4263-b863-cee4326212b7",
4949
"fields": {
5050
"created_at": "2025-04-04T09:20:35.518Z",
5151
"updated_at": "2025-04-04T09:20:35.518Z",
52-
"clinic": 1,
52+
"clinic": "ce662c8b-92dc-4c82-9d5d-1ddcb201e2b6",
5353
"starts_at": "2025-05-01T10:00:00Z",
5454
"duration_in_minutes": 30
5555
}
5656
},
5757
{
5858
"model": "clinics.clinicslot",
59-
"pk": 3,
59+
"pk": "f657f049-a52f-4a23-ada4-834ea557336c",
6060
"fields": {
6161
"created_at": "2025-04-04T09:20:35.518Z",
6262
"updated_at": "2025-04-04T09:20:35.518Z",
63-
"clinic": 1,
63+
"clinic": "ce662c8b-92dc-4c82-9d5d-1ddcb201e2b6",
6464
"starts_at": "2025-05-01T11:00:00Z",
6565
"duration_in_minutes": 30
6666
}
6767
},
6868
{
6969
"model": "clinics.clinicslot",
70-
"pk": 4,
70+
"pk": "48bc626c-e8b1-44e7-a747-915c65fc2360",
7171
"fields": {
7272
"created_at": "2025-04-04T09:20:35.518Z",
7373
"updated_at": "2025-04-04T09:20:35.518Z",
74-
"clinic": 1,
74+
"clinic": "ce662c8b-92dc-4c82-9d5d-1ddcb201e2b6",
7575
"starts_at": "2025-05-01T12:00:00Z",
7676
"duration_in_minutes": 30
7777
}
7878
},
7979
{
8080
"model": "clinics.clinicslot",
81-
"pk": 5,
81+
"pk": "1c0009ed-8cee-422b-965d-4934b77c5294",
8282
"fields": {
8383
"created_at": "2025-04-04T09:20:35.518Z",
8484
"updated_at": "2025-04-04T09:20:35.518Z",
85-
"clinic": 1,
85+
"clinic": "ce662c8b-92dc-4c82-9d5d-1ddcb201e2b6",
8686
"starts_at": "2025-05-01T13:00:00Z",
8787
"duration_in_minutes": 30
8888
}
8989
},
9090
{
9191
"model": "clinics.screeningepisode",
92-
"pk": 1,
92+
"pk": "1c0009ed-8cee-422b-965d-4934b77c5294",
9393
"fields": {
9494
"created_at": "2022-04-25T11:15:00Z",
9595
"updated_at": "2025-04-25T11:15:00Z",
96-
"participant": 1
96+
"participant": "913bb98a-c31f-4c2b-9b81-73a8eb994c20"
9797
}
9898
},
9999
{
100100
"model": "clinics.screeningepisode",
101-
"pk": 2,
101+
"pk": "3888ca4a-2b6c-43a3-bde2-4a92649c6648",
102102
"fields": {
103103
"created_at": "2025-04-25T11:15:00Z",
104104
"updated_at": "2025-04-25T11:15:00Z",
105-
"participant": 2
105+
"participant": "6ffdc8dd-8f78-4fda-82a1-890f20eda7fd"
106106
}
107107
},
108108
{
109109
"model": "clinics.screeningepisode",
110-
"pk": 3,
110+
"pk": "64cf6722-19f2-4519-89a3-cb127447c72a",
111111
"fields": {
112112
"created_at": "2025-04-25T11:15:00Z",
113113
"updated_at": "2025-04-25T11:15:00Z",
114-
"participant": 3
114+
"participant": "7c9d087a-63ce-4459-a3bf-8379837eb35d"
115115
}
116116
},
117117
{
118118
"model": "clinics.screeningepisode",
119-
"pk": 4,
119+
"pk": "519593ee-6e44-41db-962a-862a09f807ad",
120120
"fields": {
121121
"created_at": "2025-04-25T11:15:00Z",
122122
"updated_at": "2025-04-25T11:15:00Z",
123-
"participant": 4
123+
"participant": "6f947d99-3f1f-42f4-b21c-ad7987c05d6d"
124124
}
125125
},
126126
{
127127
"model": "clinics.screeningepisode",
128-
"pk": 5,
128+
"pk": "522fe2cb-1c41-40d5-a65d-c36695bf11b5",
129129
"fields": {
130130
"created_at": "2025-04-25T11:15:00Z",
131131
"updated_at": "2025-04-25T11:15:00Z",
132-
"participant": 5
132+
"participant": "2b87d44f-637b-44a7-9dfd-1e57f37d04ea"
133133
}
134134
},
135135
{
136136
"model": "clinics.screeningepisode",
137-
"pk": 6,
137+
"pk": "ccad34c1-8e26-4c9e-a134-a0de8f997d89",
138138
"fields": {
139139
"created_at": "2025-04-25T11:15:00Z",
140140
"updated_at": "2025-04-25T11:15:00Z",
141-
"participant": 1
141+
"participant": "913bb98a-c31f-4c2b-9b81-73a8eb994c20"
142142
}
143143
},
144144
{
145145
"model": "clinics.appointment",
146-
"pk": 1,
146+
"pk": "e7be35a3-8b7f-4522-9e9b-7b8e6829c1b8",
147147
"fields": {
148148
"created_at": "2025-04-25T11:20:00Z",
149149
"updated_at": "2025-04-25T11:20:00Z",
150150
"screening_episode": 6,
151-
"clinic_slot": 1,
151+
"clinic_slot": "d1df208b-955a-4b2f-a908-2728aea6b29f",
152152
"status": "CONFIRMED"
153153
}
154154
},
155155
{
156156
"model": "clinics.appointment",
157-
"pk": 2,
157+
"pk": "522fe2cb-1c41-40d5-a65d-c36695bf11b5",
158158
"fields": {
159159
"created_at": "2025-04-25T11:20:00Z",
160160
"updated_at": "2025-04-25T11:20:00Z",
161-
"screening_episode": 2,
162-
"clinic_slot": 2,
161+
"screening_episode": "1c0009ed-8cee-422b-965d-4934b77c5294",
162+
"clinic_slot": "cc428100-3397-4263-b863-cee4326212b7",
163163
"status": "CHECKED_IN"
164164
}
165165
},
166166
{
167167
"model": "clinics.appointment",
168-
"pk": 3,
168+
"pk": "ccad34c1-8e26-4c9e-a134-a0de8f997d89",
169169
"fields": {
170170
"created_at": "2025-04-25T11:20:00Z",
171171
"updated_at": "2025-04-25T11:20:00Z",
172-
"screening_episode": 3,
173-
"clinic_slot": 3,
172+
"screening_episode": "3888ca4a-2b6c-43a3-bde2-4a92649c6648",
173+
"clinic_slot": "f657f049-a52f-4a23-ada4-834ea557336c",
174174
"status": "SCREENED"
175175
}
176176
},
177177
{
178178
"model": "clinics.appointment",
179-
"pk": 4,
179+
"pk": "a3ad3cb1-d67a-499c-805c-845455deb60f",
180180
"fields": {
181181
"created_at": "2025-04-25T11:20:00Z",
182182
"updated_at": "2025-04-25T11:20:00Z",
183-
"screening_episode": 4,
184-
"clinic_slot": 4,
183+
"screening_episode": "64cf6722-19f2-4519-89a3-cb127447c72a",
184+
"clinic_slot": "48bc626c-e8b1-44e7-a747-915c65fc2360",
185185
"status": "DID_NOT_ATTEND"
186186
}
187187
},
188188
{
189189
"model": "clinics.appointment",
190-
"pk": 5,
190+
"pk": "e7be35a3-8b7f-4522-9e9b-7b8e6829c1b8",
191191
"fields": {
192192
"created_at": "2025-04-25T11:20:00Z",
193193
"updated_at": "2025-04-25T11:20:00Z",
194-
"screening_episode": 5,
195-
"clinic_slot": 5,
194+
"screening_episode": "519593ee-6e44-41db-962a-862a09f807ad",
195+
"clinic_slot": "1c0009ed-8cee-422b-965d-4934b77c5294",
196196
"status": "CANCELLED"
197197
}
198198
}

0 commit comments

Comments
 (0)