Skip to content

Commit a7c6264

Browse files
committed
reformat by pre-commit
1 parent 9914375 commit a7c6264

File tree

10 files changed

+124
-40
lines changed

10 files changed

+124
-40
lines changed

tmh_registry/registry/admin.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,12 @@ class PatientAdmin(ExportMixin, admin.ModelAdmin):
3939
class PatientHospitalMappingAdmin(ExportMixin, admin.ModelAdmin):
4040
model = PatientHospitalMapping
4141

42+
4243
@admin.register(PreferredHospital)
4344
class PreferredHospitalAdmin(ExportMixin, admin.ModelAdmin):
4445
model = PreferredHospital
4546

47+
4648
@admin.register(Episode)
4749
class EpisodeAdmin(ExportMixin, admin.ModelAdmin):
4850
model = Episode

tmh_registry/registry/api/serializers.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,6 +246,7 @@ def to_representation(self, instance):
246246

247247
return data
248248

249+
249250
class PreferredHospitalReadSerializer(ModelSerializer):
250251
hospital = SerializerMethodField()
251252

@@ -257,13 +258,16 @@ def get_hospital(self, obj):
257258
request = self.context.get("request")
258259
if request and request.user:
259260
try:
260-
medical_personnel = MedicalPersonnel.objects.get(user=request.user)
261+
medical_personnel = MedicalPersonnel.objects.get(
262+
user=request.user
263+
)
261264
if obj.medical_personnel == medical_personnel:
262265
return {"id": obj.hospital.id}
263266
except MedicalPersonnel.DoesNotExist:
264267
pass
265268
return None
266269

270+
267271
class PatientHospitalMappingWriteSerializer(ModelSerializer):
268272
patient_id = PrimaryKeyRelatedField(queryset=Patient.objects.all())
269273
hospital_id = PrimaryKeyRelatedField(queryset=Hospital.objects.all())

tmh_registry/registry/api/viewsets.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
from rest_framework.response import Response
2020
from rest_framework.viewsets import GenericViewSet
2121

22+
from ...users.models import MedicalPersonnel
2223
from ..models import (
2324
Discharge,
2425
Episode,
@@ -42,31 +43,34 @@
4243
PreferredHospitalReadSerializer,
4344
ReadPatientSerializer,
4445
)
45-
from ...users.models import MedicalPersonnel
4646

4747

4848
class HospitalViewSet(viewsets.ReadOnlyModelViewSet):
4949
queryset = Hospital.objects.all()
5050
serializer_class = HospitalSerializer
5151

52+
5253
class PreferredHospitalViewSet(viewsets.GenericViewSet):
5354
serializer_class = PreferredHospitalReadSerializer
5455
permission_classes = [IsAuthenticated]
5556

56-
@action(detail=False, methods=['get'])
57+
@action(detail=False, methods=["get"])
5758
def retrieve_for_current_user(self, request, *args, **kwargs):
5859
user = request.user
5960
try:
6061
medical_personnel = MedicalPersonnel.objects.get(user=user)
6162
except MedicalPersonnel.DoesNotExist:
6263
return Response({}, status=200)
6364
try:
64-
preferred_hospital = PreferredHospital.objects.get(medical_personnel=medical_personnel)
65+
preferred_hospital = PreferredHospital.objects.get(
66+
medical_personnel=medical_personnel
67+
)
6568
except PreferredHospital.DoesNotExist:
6669
return Response({}, status=200)
6770
serializer = self.get_serializer(preferred_hospital)
6871
return Response(serializer.data)
6972

73+
7074
class PatientFilterSet(FilterSet):
7175
hospital_id = NumberFilter(
7276
method="filter_hospital",

tmh_registry/registry/migrations/0036_followup_recurrence.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
('registry', '0035_episode_comments'),
9+
("registry", "0035_episode_comments"),
1010
]
1111

1212
operations = [
1313
migrations.AddField(
14-
model_name='followup',
15-
name='recurrence',
14+
model_name="followup",
15+
name="recurrence",
1616
field=models.BooleanField(null=True),
1717
),
1818
]

tmh_registry/registry/migrations/0037_preferredhospital.py

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,43 @@
77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
('users', '0008_auto_20210630_1407'),
11-
('registry', '0036_followup_recurrence'),
10+
("users", "0008_auto_20210630_1407"),
11+
("registry", "0036_followup_recurrence"),
1212
]
1313

1414
operations = [
1515
migrations.CreateModel(
16-
name='PreferredHospital',
16+
name="PreferredHospital",
1717
fields=[
18-
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
19-
('hospital', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='preferred_by_medical_personnel', to='registry.hospital')),
20-
('medical_personnel', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='preferred_hospital', to='users.medicalpersonnel')),
18+
(
19+
"id",
20+
models.AutoField(
21+
auto_created=True,
22+
primary_key=True,
23+
serialize=False,
24+
verbose_name="ID",
25+
),
26+
),
27+
(
28+
"hospital",
29+
models.ForeignKey(
30+
on_delete=django.db.models.deletion.CASCADE,
31+
related_name="preferred_by_medical_personnel",
32+
to="registry.hospital",
33+
),
34+
),
35+
(
36+
"medical_personnel",
37+
models.OneToOneField(
38+
on_delete=django.db.models.deletion.CASCADE,
39+
related_name="preferred_hospital",
40+
to="users.medicalpersonnel",
41+
),
42+
),
2143
],
2244
options={
23-
'verbose_name_plural': 'Medical Personnel Preferred Hospitals',
24-
'unique_together': {('medical_personnel', 'hospital')},
45+
"verbose_name_plural": "Medical Personnel Preferred Hospitals",
46+
"unique_together": {("medical_personnel", "hospital")},
2547
},
2648
),
2749
]

tmh_registry/registry/migrations/0038_auto_20240915_1210.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
('registry', '0037_preferredhospital'),
9+
("registry", "0037_preferredhospital"),
1010
]
1111

1212
operations = [
1313
migrations.AlterModelOptions(
14-
name='patienthospitalmapping',
15-
options={'verbose_name_plural': 'Patient-Hospital Mappings'},
14+
name="patienthospitalmapping",
15+
options={"verbose_name_plural": "Patient-Hospital Mappings"},
1616
),
1717
]

tmh_registry/registry/migrations/0039_episode_primary_surgeon.py

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,45 @@
77
class Migration(migrations.Migration):
88

99
dependencies = [
10-
('users', '0008_auto_20210630_1407'),
11-
('registry', '0038_auto_20240915_1210'),
10+
("users", "0008_auto_20210630_1407"),
11+
("registry", "0038_auto_20240915_1210"),
1212
]
1313

1414
operations = [
1515
migrations.AddField(
16-
model_name='episode',
17-
name='primary_surgeon',
18-
field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, related_name='primary_surgeon', to='users.medicalpersonnel'),
16+
model_name="episode",
17+
name="primary_surgeon",
18+
field=models.ForeignKey(
19+
blank=True,
20+
default=None,
21+
null=True,
22+
on_delete=django.db.models.deletion.SET_DEFAULT,
23+
related_name="primary_surgeon",
24+
to="users.medicalpersonnel",
25+
),
1926
),
2027
migrations.AddField(
21-
model_name='episode',
22-
name='secondary_surgeon',
23-
field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, related_name='secondary_surgeon', to='users.medicalpersonnel'),
28+
model_name="episode",
29+
name="secondary_surgeon",
30+
field=models.ForeignKey(
31+
blank=True,
32+
default=None,
33+
null=True,
34+
on_delete=django.db.models.deletion.SET_DEFAULT,
35+
related_name="secondary_surgeon",
36+
to="users.medicalpersonnel",
37+
),
2438
),
2539
migrations.AddField(
26-
model_name='episode',
27-
name='tertiary_surgeon',
28-
field=models.ForeignKey(blank=True, default=None, null=True, on_delete=django.db.models.deletion.SET_DEFAULT, related_name='tertiary_surgeon', to='users.medicalpersonnel'),
40+
model_name="episode",
41+
name="tertiary_surgeon",
42+
field=models.ForeignKey(
43+
blank=True,
44+
default=None,
45+
null=True,
46+
on_delete=django.db.models.deletion.SET_DEFAULT,
47+
related_name="tertiary_surgeon",
48+
to="users.medicalpersonnel",
49+
),
2950
),
3051
]

tmh_registry/registry/migrations/0040_populate_primary_surgeon_20240916_1320.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from django.db import migrations
22

3+
34
def get_primary_surgeon_from_episode_surgeons(apps, schema_editor):
45
Episode = apps.get_model("registry", "episode")
56

@@ -16,11 +17,13 @@ def get_primary_surgeon_from_episode_surgeons(apps, schema_editor):
1617
episode.tertiary_surgeon = surgeons[2]
1718
episode.save()
1819

20+
1921
class Migration(migrations.Migration):
2022

2123
dependencies = [
2224
("registry", "0039_episode_primary_surgeon"),
2325
]
2426

25-
operations = [migrations.RunPython(get_primary_surgeon_from_episode_surgeons)]
26-
27+
operations = [
28+
migrations.RunPython(get_primary_surgeon_from_episode_surgeons)
29+
]

tmh_registry/registry/models.py

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
from django.db.models import (
44
CASCADE,
5+
SET_DEFAULT,
56
BooleanField,
67
CharField,
78
DateField,
@@ -12,7 +13,7 @@
1213
OneToOneField,
1314
PositiveIntegerField,
1415
TextChoices,
15-
TextField, SET_DEFAULT,
16+
TextField,
1617
)
1718

1819
from tmh_registry.common.models import TimeStampMixin
@@ -78,23 +79,25 @@ class Meta:
7879
def __str__(self):
7980
return f"Patient {self.patient.full_name} ({self.patient_hospital_id}) - Hospital {self.hospital.name}"
8081

82+
8183
class PreferredHospital(Model):
8284
medical_personnel = OneToOneField(
8385
MedicalPersonnel, on_delete=CASCADE, related_name="preferred_hospital"
8486
)
8587
hospital = ForeignKey(
86-
Hospital, on_delete=CASCADE, related_name="preferred_by_medical_personnel"
88+
Hospital,
89+
on_delete=CASCADE,
90+
related_name="preferred_by_medical_personnel",
8791
)
8892

8993
class Meta:
90-
unique_together = (
91-
("medical_personnel", "hospital"),
92-
)
94+
unique_together = (("medical_personnel", "hospital"),)
9395
verbose_name_plural = "Medical Personnel Preferred Hospitals"
9496

9597
def __str__(self):
9698
return f"{self.medical_personnel.user.first_name} {self.medical_personnel.user.last_name} ({self.medical_personnel.user.username}) - Hospital {self.hospital.name}"
9799

100+
98101
class Episode(Model):
99102
class EpisodeChoices(TextChoices):
100103
INGUINAL = ("INGUINAL", "Inguinal Mesh Hernia Repair")
@@ -157,9 +160,30 @@ class AnaestheticChoices(TextChoices):
157160
created = DateTimeField(auto_now_add=True)
158161
surgery_date = DateField(null=True, blank=True)
159162
episode_type = CharField(max_length=128, choices=EpisodeChoices.choices)
160-
primary_surgeon = ForeignKey(MedicalPersonnel, on_delete=SET_DEFAULT, blank=True, null=True, default=None, related_name="primary_surgeon")
161-
secondary_surgeon = ForeignKey(MedicalPersonnel, on_delete=SET_DEFAULT, blank=True, null=True, default=None, related_name="secondary_surgeon")
162-
tertiary_surgeon = ForeignKey(MedicalPersonnel, on_delete=SET_DEFAULT, blank=True, null=True, default=None, related_name="tertiary_surgeon")
163+
primary_surgeon = ForeignKey(
164+
MedicalPersonnel,
165+
on_delete=SET_DEFAULT,
166+
blank=True,
167+
null=True,
168+
default=None,
169+
related_name="primary_surgeon",
170+
)
171+
secondary_surgeon = ForeignKey(
172+
MedicalPersonnel,
173+
on_delete=SET_DEFAULT,
174+
blank=True,
175+
null=True,
176+
default=None,
177+
related_name="secondary_surgeon",
178+
)
179+
tertiary_surgeon = ForeignKey(
180+
MedicalPersonnel,
181+
on_delete=SET_DEFAULT,
182+
blank=True,
183+
null=True,
184+
default=None,
185+
related_name="tertiary_surgeon",
186+
)
163187
surgeons = ManyToManyField(MedicalPersonnel)
164188
cepod = CharField(max_length=16, choices=CepodChoices.choices)
165189
side = CharField(max_length=16, choices=SideChoices.choices)

tmh_registry/registry/urls.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@
1818
router.register(r"episodes", EpisodeViewset)
1919
router.register(r"discharges", DischargeViewset)
2020
router.register(r"follow-ups", FollowUpViewset)
21-
router.register(r"preferred-hospital", PreferredHospitalViewSet, basename='preferred-hospital')
21+
router.register(
22+
r"preferred-hospital",
23+
PreferredHospitalViewSet,
24+
basename="preferred-hospital",
25+
)
2226

2327
urlpatterns = [
2428
path("", include(router.urls)),

0 commit comments

Comments
 (0)