replaced Responses to Raise Exception

Author: pietro convalle

answerking_app/utils/mixins/CategoryItemMixins.py

@@ -1,13 +1,13 @@
 from django.shortcuts import get_object_or_404
 from rest_framework import status
-from rest_framework.exceptions import APIException
 from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.utils.serializer_helpers import ReturnDict
 
 from answerking_app.models.models import Category, Item
 from answerking_app.models.serializers import CategorySerializer
 from answerking_app.utils.ErrorType import ErrorMessage
+from answerking_app.utils.mixins.ApiExceptions import Http400BadRequest
 
 
 class CategoryItemUpdateMixin:
@@ -19,16 +19,7 @@ def update(
         item: Item = get_object_or_404(Item, pk=item_id)
 
         if item in category.items.all():
-            error_msg: ErrorMessage = {
-                "error": {
-                    "message": "Resource update failure",
-                    "details": "Item already in category",
-                }
-            }
-            return Response(
-                error_msg,
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+            raise Http400BadRequest
 
         category.items.add(item)
         response: ReturnDict = CategorySerializer(category).data

answerking_app/utils/mixins/GenericMixins.py

@@ -31,4 +31,4 @@ def handle_IntegrityError(exc: IntegrityError) -> NoReturn:
     if exc.args[0] == DUP_ENTRY:
         raise Http400BadRequest
     else:
-        raise ServiceUnavailable()
+        raise ServiceUnavailable

answerking_app/utils/mixins/ItemMixins.py

@@ -3,7 +3,8 @@
 from rest_framework.request import Request
 from rest_framework.response import Response
 
-from answerking_app.models.models import OrderLine, Item
+from answerking_app.models.models import Item, OrderLine
+from answerking_app.utils.mixins.ApiExceptions import Http400BadRequest
 from answerking_app.utils.model_types import OrderItemType
 
 
@@ -14,10 +15,7 @@ def destroy(self, request: Request, *args, **kwargs) -> Response:
             item=instance.id
         )
         if existing_orderitems:
-            return Response(
-                {"detail": "Cannot delete, item is in an order."},
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+            raise Http400BadRequest
         self.perform_destroy(instance)
         return Response(status=status.HTTP_204_NO_CONTENT)
 

answerking_app/utils/mixins/OrderItemMixins.py

@@ -1,16 +1,13 @@
+from django.shortcuts import get_object_or_404
 from rest_framework import status
-from rest_framework.response import Response
 from rest_framework.request import Request
+from rest_framework.response import Response
 from rest_framework.utils.serializer_helpers import ReturnDict
 
-from answerking_app.models.models import Order, Item
-from answerking_app.models.serializers import (
-    OrderSerializer,
-    OrderLineSerializer,
-)
-from answerking_app.utils.ErrorType import ErrorMessage
-
-from django.shortcuts import get_object_or_404
+from answerking_app.models.models import Item, Order
+from answerking_app.models.serializers import (OrderLineSerializer,
+                                               OrderSerializer)
+from answerking_app.utils.mixins.ApiExceptions import Http400BadRequest
 
 
 class OrderItemUpdateMixin:
@@ -59,16 +56,7 @@ def remove(
         item: Item = get_object_or_404(Item, pk=item_id)
 
         if item not in order.order_items.all():
-            error_msg: ErrorMessage = {
-                "error": {
-                    "message": "Resource update failure",
-                    "details": "Item not in order",
-                }
-            }
-            return Response(
-                error_msg,
-                status=status.HTTP_400_BAD_REQUEST,
-            )
+            raise Http400BadRequest
 
         updated_order: Order | None = self.remove_item(order, item)