fix: change user_expense_type url and added new endpoint retrieve by id

Author: mjsifri

Diff for: piggywallet/urls.py

@@ -23,5 +23,5 @@
     path("auth/", include("authentication.urls")),
     path("playground/", include("playground.urls")),
     path("budget/", include("budget.urls")),
-    path("expense-types/", include("user_expense_type.urls")),
+    path("user_expense_type/", include("user_expense_type.urls")),
 ]

Diff for: user_expense_type/tests.py

@@ -25,10 +25,10 @@ def test_create(self, mock_login_user, mock_create):
         }
         mock_create.return_value = Response(status=status.HTTP_201_CREATED, data=self.user_expense_type_data)
 
-        request = self.client.post("/expense-types/", self.user_expense_type_data)
+        request = self.client.post("/user_expense_type/", self.user_expense_type_data)
         request.headers["Authorization"] = "Bearer mock_access_token"
 
-        response = self.client.post("/expense-types/", self.user_expense_type_data)
+        response = self.client.post("/user_expense_type/", self.user_expense_type_data)
 
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(response.data["name"], "Viajes")
@@ -41,10 +41,10 @@ def test_list(self, mock_login_user, mock_list):
         }
         mock_list.return_value = Response(status=status.HTTP_200_OK, data=self.user_expense_type_data)
 
-        request = self.client.get("/expense-types/")
+        request = self.client.get("/user_expense_type/")
         request.headers["Authorization"] = "Bearer mock_access_token"
 
-        response = self.client.get("/expense-types/")
+        response = self.client.get("/user_expense_type/")
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data["name"], "Viajes")
@@ -57,11 +57,10 @@ def test_destroy(self, mock_login_user, mock_destroy):
         }
         mock_destroy.return_value = Response(status=status.HTTP_204_NO_CONTENT)
 
-        request = self.client.delete("/expense-types/")
+        request = self.client.delete("/user_expense_type/1/")
         request.headers["Authorization"] = "Bearer mock_access_token"
-        request.body = {"id": 1}
 
-        response = self.client.delete("/expense-types/")
+        response = self.client.delete("/user_expense_type/1/")
 
         self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
 
@@ -78,11 +77,10 @@ def test_partial_update(self, mock_login_user, mock_partial_update):
         }
         mock_partial_update.return_value = Response(status=status.HTTP_200_OK, data=new_user_expense_type_data)
 
-        request = self.client.put("/expense-type/", {"description": "Gastos incurridos en viajes por placer"})
+        request = self.client.put("/user_expense_type/1/", {"description": "Gastos incurridos en viajes por placer"})
         request.headers["Authorization"] = "Bearer mock_access_token"
-        request.body = {"id": 1}
 
-        response = self.client.put("/expense-types/", {"description": "Gastos incurridos en viajes por placer"})
+        response = self.client.put("/user_expense_type/1/", {"description": "Gastos incurridos en viajes por placer"})
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data["description"], "Gastos incurridos en viajes por placer")

Diff for: user_expense_type/urls.py

@@ -5,7 +5,14 @@
 urlpatterns = [
     path(
         "",
-        UserExpenseTypeViewSet.as_view({"get": "list", "post": "create", "delete": "destroy", "put": "partial_update"}),
+        UserExpenseTypeViewSet.as_view({"get": "list", "post": "create"}),
         name="user_expense_type",
     ),
+    path(
+        "<int:pk>/",
+        UserExpenseTypeViewSet.as_view(
+            {"get": "retrieve", "delete": "destroy", "put": "partial_update"}
+        ),
+        name="user_expense_type_detail",
+    ),
 ]

Diff for: user_expense_type/views.py

@@ -41,6 +41,23 @@ def list(self, request):
             return Response({"error": "UserExpenseType not found"}, status=status.HTTP_404_NOT_FOUND)
         except Exception as e:
             return Response({"error": str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+        
+    @cognito_authenticated
+    def retrieve(self, request, pk=None):
+        try:
+            username = self.get_user_id_from_token(request)
+            user_expense_type = UserExpenseType.objects.get(id=pk, username=username)
+            serializer = UserExpenseTypeSerializer(user_expense_type)
+            response = {
+                "name": serializer.data["name"],
+                "description": serializer.data["description"],
+                "set_by_user": serializer.data["set_by_user"],
+            }
+            return Response(data=response)
+        except UserExpenseType.DoesNotExist:
+            return Response({"error": "UserExpenseType not found"}, status=status.HTTP_404_NOT_FOUND)
+        except Exception as e:
+            return Response({"error": str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
     @cognito_authenticated
     def create(self, request):
@@ -63,11 +80,10 @@ def create(self, request):
             return Response({"error": str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
     @cognito_authenticated
-    def destroy(self, request):
+    def destroy(self, request, pk=None ):
         try:
             username = self.get_user_id_from_token(request)
-            id = request.data.get("id")
-            user_expense_type = UserExpenseType.objects.get(id=id, username=username)
+            user_expense_type = UserExpenseType.objects.get(id=pk, username=username)
             user_expense_type.delete()
             return Response(status=status.HTTP_204_NO_CONTENT)
         except UserExpenseType.DoesNotExist:
@@ -76,11 +92,10 @@ def destroy(self, request):
             return Response({"error": str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
 
     @cognito_authenticated
-    def partial_update(self, request):
+    def partial_update(self, request, pk=None):
         try:
             username = self.get_user_id_from_token(request)
-            id = request.data.get("id")
-            user_expense_type = UserExpenseType.objects.get(id=id, username=username)
+            user_expense_type = UserExpenseType.objects.get(id=pk, username=username)
             serializer = UserExpenseTypeSerializer(user_expense_type, data=request.data, partial=True)
             if serializer.is_valid():
                 serializer.save()