Skip to content

Commit 73d5145

Browse files
dee077dee077
committed
[tests] Show failing tests
1 parent dd5c232 commit 73d5145

File tree

8 files changed

+78
-52
lines changed

8 files changed

+78
-52
lines changed

‎openwisp_controller/config/api/serializers.py‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -382,29 +382,29 @@ def update(self, instance, validated_data):
382382
class ReversionSerializer(BaseSerializer):
383383
user_id = serializers.SerializerMethodField()
384384
date_created = serializers.DateTimeField(
385-
source="revision.date_created", read_only=True
385+
source='revision.date_created', read_only=True
386386
)
387-
comment = serializers.CharField(source="revision.comment", read_only=True)
387+
comment = serializers.CharField(source='revision.comment', read_only=True)
388388
content_type = serializers.SerializerMethodField()
389389

390390
class Meta:
391391
model = Version
392392
fields = [
393-
"id",
394-
"revision_id",
395-
"object_id",
396-
"content_type",
397-
"db",
398-
"format",
399-
"serialized_data",
400-
"object_repr",
401-
"user_id",
402-
"date_created",
403-
"comment",
393+
'id',
394+
'revision_id',
395+
'object_id',
396+
'content_type',
397+
'db',
398+
'format',
399+
'serialized_data',
400+
'object_repr',
401+
'user_id',
402+
'date_created',
403+
'comment',
404404
]
405405

406406
def get_user_id(self, obj):
407-
return getattr(obj.revision, "user_id", None)
407+
return getattr(obj.revision, 'user_id', None)
408408

409409
def get_content_type(self, obj):
410-
return getattr(obj.content_type, "model", None)
410+
return getattr(obj.content_type, 'model', None)

‎openwisp_controller/config/api/urls.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ def get_api_urls(api_views):
1414
if getattr(settings, "OPENWISP_CONTROLLER_API", True):
1515
return [
1616
path(
17-
"controller/<str:model_slug>/revision/",
17+
"controller/<str:model>/revision/",
1818
api_views.revision_list,
1919
name="revision_list",
2020
),
2121
path(
22-
"controller/<str:model_slug>/revision/<str:pk>/",
22+
"controller/<str:model>/revision/<str:pk>/",
2323
api_views.revision_detail,
2424
name="revision_detail",
2525
),
2626
path(
27-
"controller/<str:model_slug>/revision/<str:pk>/restore/",
27+
"controller/<str:model>/revision/<str:pk>/restore/",
2828
api_views.revision_restore,
2929
name="revision_restore",
3030
),

‎openwisp_controller/config/api/views.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ class RevisionListView(ProtectedAPIMixin, AutoRevisionMixin, ListAPIView):
306306
serializer_class = ReversionSerializer
307307

308308
def get_queryset(self):
309-
model_slug = self.kwargs.get('model_slug').lower()
309+
model_slug = self.kwargs.get('model').lower()
310310
return (
311311
Version.objects.select_related('revision')
312312
.filter(content_type__model=model_slug)
@@ -318,7 +318,7 @@ class RevisionDetailView(ProtectedAPIMixin, RetrieveAPIView):
318318
serializer_class = ReversionSerializer
319319

320320
def get_queryset(self):
321-
model_slug = self.kwargs.get('model_slug').lower()
321+
model_slug = self.kwargs.get('model').lower()
322322
return (
323323
Version.objects.select_related('revision')
324324
.filter(content_type__model=model_slug)
@@ -330,7 +330,7 @@ class RevisionRestoreView(ProtectedAPIMixin, GenericAPIView):
330330
serializer_class = serializers.Serializer
331331

332332
def get_queryset(self):
333-
model_slug = self.kwargs.get('model_slug').lower()
333+
model_slug = self.kwargs.get('model').lower()
334334
return (
335335
Version.objects.select_related('revision')
336336
.filter(content_type__model=model_slug)

‎openwisp_controller/config/tests/test_api.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1650,25 +1650,25 @@ def test_revision_list_and_restore_api(self):
16501650
self.assertEqual(response.status_code, 200)
16511651
self.assertEqual(response.data['name'], 'change-test-device')
16521652

1653-
path = reverse("config_api:revision_list", args=[model_slug])
1653+
path = reverse('config_api:revision_list', args=[model_slug])
16541654
response = self.client.get(path)
16551655
response_json = response.json()
16561656
version_id = response_json[1]["id"]
16571657
self.assertEqual(response.status_code, 200)
16581658
self.assertEqual(len(response_json), 2)
16591659

1660-
with self.subTest("Test revision detail"):
1661-
path = reverse("config_api:revision_detail", args=[model_slug, version_id])
1660+
with self.subTest('Test revision detail'):
1661+
path = reverse('config_api:revision_detail', args=[model_slug, version_id])
16621662
response = self.client.get(path)
16631663
self.assertEqual(response.status_code, 200)
1664-
self.assertEqual(response.json()["id"], version_id)
1665-
self.assertEqual(response.json()["object_id"], str(device.pk))
1664+
self.assertEqual(response.json()['id'], version_id)
1665+
self.assertEqual(response.json()['object_id'], str(device.pk))
16661666

1667-
with self.subTest("Test revision restore view"):
1668-
revision_id = response_json[1]["revision_id"]
1667+
with self.subTest('Test revision restore view'):
1668+
revision_id = response_json[1]['revision_id']
16691669
path = reverse(
1670-
"config_api:revision_restore", args=[model_slug, revision_id]
1670+
'config_api:revision_restore', args=[model_slug, revision_id]
16711671
)
16721672
response = self.client.post(path)
16731673
self.assertEqual(response.status_code, 200)
1674-
self.assertEqual(Device.objects.get(name="test").pk, device.pk)
1674+
self.assertEqual(Device.objects.get(name='test').pk, device.pk)

‎openwisp_controller/connection/api/views.py‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from openwisp_users.api.mixins import ProtectedAPIMixin as BaseProtectedAPIMixin
1515

1616
from ...mixins import (
17+
AutoRevisionMixin,
1718
ProtectedAPIMixin,
1819
RelatedDeviceModelPermission,
1920
RelatedDeviceProtectedAPIMixin,
@@ -61,7 +62,7 @@ def get_serializer_context(self):
6162
return context
6263

6364

64-
class CommandListCreateView(BaseCommandView, ListCreateAPIView):
65+
class CommandListCreateView(BaseCommandView, AutoRevisionMixin, ListCreateAPIView):
6566
pagination_class = ListViewPagination
6667

6768
def create(self, request, *args, **kwargs):
@@ -81,13 +82,15 @@ def get_object(self):
8182
return obj
8283

8384

84-
class CredentialListCreateView(ProtectedAPIMixin, ListCreateAPIView):
85+
class CredentialListCreateView(ProtectedAPIMixin, AutoRevisionMixin, ListCreateAPIView):
8586
queryset = Credentials.objects.order_by("-created")
8687
serializer_class = CredentialSerializer
8788
pagination_class = ListViewPagination
8889

8990

90-
class CredentialDetailView(ProtectedAPIMixin, RetrieveUpdateDestroyAPIView):
91+
class CredentialDetailView(
92+
ProtectedAPIMixin, AutoRevisionMixin, RetrieveUpdateDestroyAPIView
93+
):
9194
queryset = Credentials.objects.all()
9295
serializer_class = CredentialSerializer
9396

@@ -119,7 +122,9 @@ def get_parent_queryset(self):
119122
return Device.objects.filter(pk=self.kwargs["device_id"])
120123

121124

122-
class DeviceConnenctionListCreateView(BaseDeviceConnection, ListCreateAPIView):
125+
class DeviceConnenctionListCreateView(
126+
BaseDeviceConnection, AutoRevisionMixin, ListCreateAPIView
127+
):
123128
pagination_class = ListViewPagination
124129

125130
def get_queryset(self):
@@ -131,7 +136,9 @@ def get_queryset(self):
131136
)
132137

133138

134-
class DeviceConnectionDetailView(BaseDeviceConnection, RetrieveUpdateDestroyAPIView):
139+
class DeviceConnectionDetailView(
140+
BaseDeviceConnection, AutoRevisionMixin, RetrieveUpdateDestroyAPIView
141+
):
135142
def get_object(self):
136143
queryset = self.filter_queryset(self.get_queryset())
137144
filter_kwargs = {

‎openwisp_controller/geo/api/views.py‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,11 @@
1414
from openwisp_users.api.filters import OrganizationManagedFilter
1515
from openwisp_users.api.mixins import FilterByOrganizationManaged, FilterByParentManaged
1616

17-
from ...mixins import ProtectedAPIMixin, RelatedDeviceProtectedAPIMixin
17+
from ...mixins import (
18+
AutoRevisionMixin,
19+
ProtectedAPIMixin,
20+
RelatedDeviceProtectedAPIMixin,
21+
)
1822
from .filters import DeviceListFilter
1923
from .serializers import (
2024
DeviceCoordinatesSerializer,
@@ -57,7 +61,9 @@ class ListViewPagination(pagination.PageNumberPagination):
5761
max_page_size = 100
5862

5963

60-
class DeviceCoordinatesView(ProtectedAPIMixin, generics.RetrieveUpdateAPIView):
64+
class DeviceCoordinatesView(
65+
ProtectedAPIMixin, AutoRevisionMixin, generics.RetrieveUpdateAPIView
66+
):
6167
serializer_class = DeviceCoordinatesSerializer
6268
permission_classes = (DevicePermission,)
6369
queryset = Device.objects.select_related(
@@ -105,6 +111,7 @@ def create_location(self, device):
105111

106112
class DeviceLocationView(
107113
RelatedDeviceProtectedAPIMixin,
114+
AutoRevisionMixin,
108115
FilterByParentManaged,
109116
generics.RetrieveUpdateDestroyAPIView,
110117
):
@@ -203,7 +210,9 @@ def get_queryset(self):
203210
return qs
204211

205212

206-
class FloorPlanListCreateView(ProtectedAPIMixin, generics.ListCreateAPIView):
213+
class FloorPlanListCreateView(
214+
ProtectedAPIMixin, AutoRevisionMixin, generics.ListCreateAPIView
215+
):
207216
serializer_class = FloorPlanSerializer
208217
queryset = FloorPlan.objects.select_related().order_by("-created")
209218
pagination_class = ListViewPagination
@@ -213,13 +222,16 @@ class FloorPlanListCreateView(ProtectedAPIMixin, generics.ListCreateAPIView):
213222

214223
class FloorPlanDetailView(
215224
ProtectedAPIMixin,
225+
AutoRevisionMixin,
216226
generics.RetrieveUpdateDestroyAPIView,
217227
):
218228
serializer_class = FloorPlanSerializer
219229
queryset = FloorPlan.objects.select_related()
220230

221231

222-
class LocationListCreateView(ProtectedAPIMixin, generics.ListCreateAPIView):
232+
class LocationListCreateView(
233+
ProtectedAPIMixin, AutoRevisionMixin, generics.ListCreateAPIView
234+
):
223235
serializer_class = LocationSerializer
224236
queryset = Location.objects.order_by("-created")
225237
pagination_class = ListViewPagination
@@ -229,6 +241,7 @@ class LocationListCreateView(ProtectedAPIMixin, generics.ListCreateAPIView):
229241

230242
class LocationDetailView(
231243
ProtectedAPIMixin,
244+
AutoRevisionMixin,
232245
generics.RetrieveUpdateDestroyAPIView,
233246
):
234247
serializer_class = LocationSerializer

‎openwisp_controller/mixins.py‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,15 @@ class ProtectedAPIMixin(BaseProtectedAPIMixin, FilterByOrganizationManaged):
4141

4242

4343
class AutoRevisionMixin(RevisionMixin):
44+
revision_atomic = False
45+
4446
def dispatch(self, request, *args, **kwargs):
45-
if request.method in ('GET', 'HEAD', 'OPTIONS'):
46-
return super().dispatch(request, *args, **kwargs)
47-
with reversion.create_revision():
48-
response = super().dispatch(request, *args, **kwargs)
49-
reversion.set_user(request.user)
50-
reversion.set_comment(f'API request: {request.method} {request.path}')
47+
if request.method in ('POST', 'PUT', 'PATCH') and request.user.is_authenticated:
48+
with reversion.create_revision(atomic=self.revision_atomic):
49+
response = super().dispatch(request, *args, **kwargs)
50+
reversion.set_user(request.user)
51+
reversion.set_comment(
52+
f'API request: {request.method} {request.get_full_path()}'
53+
)
5154
return response
55+
return super().dispatch(request, *args, **kwargs)

‎openwisp_controller/pki/api/views.py‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
from rest_framework.response import Response
1111
from swapper import load_model
1212

13-
from ...mixins import ProtectedAPIMixin
13+
from ...mixins import AutoRevisionMixin, ProtectedAPIMixin
1414
from .serializers import (
1515
CaDetailSerializer,
1616
CaListSerializer,
@@ -30,18 +30,18 @@ class ListViewPagination(pagination.PageNumberPagination):
3030
max_page_size = 100
3131

3232

33-
class CaListCreateView(ProtectedAPIMixin, ListCreateAPIView):
33+
class CaListCreateView(ProtectedAPIMixin, AutoRevisionMixin, ListCreateAPIView):
3434
serializer_class = CaListSerializer
3535
queryset = Ca.objects.order_by("-created")
3636
pagination_class = ListViewPagination
3737

3838

39-
class CaDetailView(ProtectedAPIMixin, RetrieveUpdateDestroyAPIView):
39+
class CaDetailView(ProtectedAPIMixin, AutoRevisionMixin, RetrieveUpdateDestroyAPIView):
4040
serializer_class = CaDetailSerializer
4141
queryset = Ca.objects.all()
4242

4343

44-
class CaRenewView(ProtectedAPIMixin, GenericAPIView):
44+
class CaRenewView(ProtectedAPIMixin, AutoRevisionMixin, GenericAPIView):
4545
serializer_class = serializers.Serializer
4646
queryset = Ca.objects.all()
4747

@@ -66,18 +66,20 @@ def retrieve(self, request, *args, **kwargs):
6666
)
6767

6868

69-
class CertListCreateView(ProtectedAPIMixin, ListCreateAPIView):
69+
class CertListCreateView(ProtectedAPIMixin, AutoRevisionMixin, ListCreateAPIView):
7070
serializer_class = CertListSerializer
7171
queryset = Cert.objects.order_by("-created")
7272
pagination_class = ListViewPagination
7373

7474

75-
class CertDetailView(ProtectedAPIMixin, RetrieveUpdateDestroyAPIView):
75+
class CertDetailView(
76+
ProtectedAPIMixin, AutoRevisionMixin, RetrieveUpdateDestroyAPIView
77+
):
7678
serializer_class = CertDetailSerializer
7779
queryset = Cert.objects.select_related("ca")
7880

7981

80-
class CertRevokeRenewBaseView(ProtectedAPIMixin, GenericAPIView):
82+
class CertRevokeRenewBaseView(ProtectedAPIMixin, AutoRevisionMixin, GenericAPIView):
8183
serializer_class = serializers.Serializer
8284
queryset = Cert.objects.select_related("ca")
8385

0 commit comments

Comments
 (0)