Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing list asset bed preset and list bed preset #2650

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion care/facility/api/viewsets/camera_preset.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def get_serializer_context(self):

class CameraPresetViewSet(GenericViewSet, ListModelMixin):
serializer_class = CameraPresetSerializer
queryset = CameraPreset.objects.all().select_related(
queryset = CameraPreset.objects.filter(asset_bed__deleted=False).select_related(
"asset_bed", "created_by", "updated_by"
)
DraKen0009 marked this conversation as resolved.
Show resolved Hide resolved
lookup_field = "external_id"
Expand Down
36 changes: 36 additions & 0 deletions care/facility/tests/test_assetbed_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -425,6 +425,42 @@ def setUpTestData(cls):
def get_base_url(self, asset_bed_id=None):
return f"/api/v1/assetbed/{asset_bed_id or self.asset_bed1.external_id}/camera_presets/"

def test_list_bed_with_deleted_assetbed(self):
res = self.client.post(
self.get_base_url(self.asset_bed1.external_id),
{
"name": "Preset with proper position",
"position": {
"x": 1.0,
"y": 1.0,
"zoom": 1.0,
},
},
format="json",
)
self.assertEqual(res.status_code, status.HTTP_201_CREATED)
res = self.client.post(
self.get_base_url(self.asset_bed2.external_id),
{
"name": "Preset with proper position 2",
"position": {
"x": 1.0,
"y": 1.0,
"zoom": 1.0,
},
},
format="json",
)
self.assertEqual(res.status_code, status.HTTP_201_CREATED)

res = self.client.get(f"/api/v1/bed/{self.bed.external_id}/camera_presets/")
self.assertEqual(len(res.json()["results"]), 2)

self.asset_bed1.delete()
self.asset_bed1.refresh_from_db()
res = self.client.get(f"/api/v1/bed/{self.bed.external_id}/camera_presets/")
self.assertEqual(len(res.json()["results"]), 1)

def test_create_camera_preset_without_position(self):
res = self.client.post(
self.get_base_url(),
Expand Down