Compare commits
No commits in common. "master" and "1.13.7" have entirely different histories.
@ -71,7 +71,7 @@ class APIV1CreateTestCase(BaseAPIV1TestCase):
|
||||
# Expect this first request to fail, since user has no shared access on the intervention, we want to create
|
||||
# a compensation for
|
||||
response = self._run_create_request(url, post_body)
|
||||
self.assertEqual(response.status_code, 400, msg=response.content)
|
||||
self.assertEqual(response.status_code, 500, msg=response.content)
|
||||
content = json.loads(response.content)
|
||||
self.assertGreater(len(content.get("errors", [])), 0, msg=response.content)
|
||||
|
||||
|
||||
@ -6,9 +6,7 @@ Created on: 21.01.22
|
||||
|
||||
"""
|
||||
import json
|
||||
from json import JSONDecodeError
|
||||
|
||||
from django.core.exceptions import ObjectDoesNotExist
|
||||
from django.http import JsonResponse, HttpRequest
|
||||
|
||||
from api.utils.serializer.v1.compensation import CompensationAPISerializerV1
|
||||
@ -68,12 +66,8 @@ class AbstractAPIViewV1(AbstractAPIView):
|
||||
body = request.body.decode("utf-8")
|
||||
body = json.loads(body)
|
||||
created_id = self.serializer.create_model_from_json(body, self.user)
|
||||
except (JSONDecodeError,
|
||||
AssertionError,
|
||||
ValueError,
|
||||
PermissionError,
|
||||
ObjectDoesNotExist) as e:
|
||||
return self._return_error_response(e, 400)
|
||||
except Exception as e:
|
||||
return self._return_error_response(e, 500)
|
||||
return JsonResponse({"id": created_id})
|
||||
|
||||
def put(self, request: HttpRequest, id=None):
|
||||
|
||||
@ -81,7 +81,9 @@ class AbstractAPIView(View):
|
||||
Returns:
|
||||
|
||||
"""
|
||||
content = [f"{error.__class__.__name__}: {str(error)}"]
|
||||
content = [error.__str__()]
|
||||
if hasattr(error, "messages"):
|
||||
content = error.messages
|
||||
return JsonResponse(
|
||||
{
|
||||
"errors": content
|
||||
|
||||
@ -407,10 +407,7 @@ class Geometry(BaseResource):
|
||||
"""
|
||||
output_geom = input_geom
|
||||
if not isinstance(input_geom, MultiPolygon):
|
||||
try:
|
||||
output_geom = MultiPolygon(input_geom, srid=DEFAULT_SRID_RLP)
|
||||
except TypeError as e:
|
||||
raise AssertionError(f"Only (Multi)Polygon allowed! Could not convert {input_geom.geom_type} to MultiPolygon")
|
||||
output_geom = MultiPolygon(input_geom, srid=DEFAULT_SRID_RLP)
|
||||
return output_geom
|
||||
|
||||
@staticmethod
|
||||
|
||||
@ -5,9 +5,6 @@ Contact: ksp-servicestelle@sgdnord.rlp.de
|
||||
Created on: 11.12.23
|
||||
|
||||
"""
|
||||
import json
|
||||
from json import JSONDecodeError
|
||||
|
||||
from django.views.debug import ExceptionReporter
|
||||
|
||||
|
||||
@ -33,7 +30,7 @@ class KonovaExceptionReporter(ExceptionReporter):
|
||||
"""
|
||||
whitelist = [
|
||||
"is_email",
|
||||
"unicode_hint",
|
||||
"unicdoe_hint",
|
||||
"frames",
|
||||
"request",
|
||||
"user_str",
|
||||
@ -42,8 +39,6 @@ class KonovaExceptionReporter(ExceptionReporter):
|
||||
"raising_view_name",
|
||||
"exception_type",
|
||||
"exception_value",
|
||||
"filtered_GET_items",
|
||||
"filtered_POST_items",
|
||||
]
|
||||
clean_data = dict()
|
||||
for entry in whitelist:
|
||||
@ -61,28 +56,7 @@ class KonovaExceptionReporter(ExceptionReporter):
|
||||
"""
|
||||
tb_data = super().get_traceback_data()
|
||||
|
||||
return_data = tb_data
|
||||
if self.is_email:
|
||||
filtered_data = dict()
|
||||
filtered_data.update(self._filter_traceback_data(tb_data))
|
||||
filtered_data.update(self._filter_POST_body(tb_data))
|
||||
return_data = filtered_data
|
||||
return return_data
|
||||
tb_data = self._filter_traceback_data(tb_data)
|
||||
|
||||
def _filter_POST_body(self, tb_data: dict):
|
||||
""" Filters POST body from traceback data
|
||||
|
||||
"""
|
||||
post_data = tb_data.get("request", None)
|
||||
if post_data:
|
||||
post_data = post_data.body
|
||||
try:
|
||||
post_data = json.loads(post_data)
|
||||
except JSONDecodeError:
|
||||
pass
|
||||
post_data = {
|
||||
"filtered_POST_items": [
|
||||
("body", post_data),
|
||||
]
|
||||
}
|
||||
return post_data
|
||||
return tb_data
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user