fixed rebase error

Author: pietro convalle

answerking_app/tests/test_categories.py

@@ -387,8 +387,7 @@ def test_put_not_existing_item_returns_not_found(self):
             "items": [item],
         }
         expected: DetailError = {
-            "detail": "Object was not Found",
-            "errors": ["Item matching query does not exist."],
+            "detail": "Not Found",
             "status": 404,
             "title": "Resource not found",
             "type": "http://testserver/problems/error/",

answerking_app/tests/test_orderlines.py

@@ -1,11 +1,8 @@
 from django.test import Client, TestCase
 
 from answerking_app.models.models import Item, Order, Status
-from answerking_app.utils.model_types import (
-    DetailError,
-    OrderItemType,
-    OrderType,
-)
+from answerking_app.utils.model_types import (DetailError, OrderItemType,
+                                              OrderType)
 
 client = Client()
 
@@ -329,40 +326,3 @@ def test_delete_nonexistant_id_returns_not_found(self):
         self.assertIsInstance(actual.pop("traceId"), str)
         self.assertEqual(expected, actual)
         self.assertEqual(response.status_code, 404)
-
-    def test_delete_invalid_id_returns_not_found(self):
-        # Arrange
-        expected: DetailError = {
-            "detail": "Not found.",
-            "status": 404,
-            "title": "Not found.",
-            "type": "http://testserver/problems/not_found/",
-        }
-
-        # Act
-        response = client.delete(
-            f"/api/orders/{self.test_order_1.id}/orderline/100000"
-        )
-        actual = response.json()
-
-        # Assert
-        self.assertEqual(expected, actual)
-        self.assertEqual(response.status_code, 404)
-
-    def test_delete_item_when_in_order_returns_bad_request(self):
-        # Arrange
-        expected: DetailError = {
-            "detail": "A server error occurred.",
-            "status": 400,
-            "title": "A server error occurred.",
-            "type": "http://testserver/problems/error/",
-        }
-
-        # Act
-        response = client.delete(f"/api/items/{self.test_item_1.id}")
-        actual = response.json()
-
-        # Assert
-        self.assertIsInstance(actual.pop("traceId"), str)
-        self.assertEqual(expected, actual)
-        self.assertEqual(response.status_code, 400)

answerking_app/utils/mixins/SerializeErrorDetailRFCMixins.py

@@ -11,14 +11,14 @@
 def ValidationErrorDetailed(exc: ValidationError | ParseError):
     if isinstance(exc, ValidationError):
         return HttpErrorResponse(
-            status=status.HTTP_404_NOT_FOUND,
+            status=status.HTTP_400_BAD_REQUEST,
             detail="Validation Error",
             title="Invalid input.",
             extensions={"errors": exc.detail},
         )
     elif isinstance(exc, ParseError):
         return HttpErrorResponse(
-            status=status.HTTP_404_NOT_FOUND,
+            status=status.HTTP_400_BAD_REQUEST,
             detail="Parsing JSON Error",
             title="Invalid input json.",
             extensions={"errors": exc.detail},