feat: expenses model, views and tests created and working

Author: mjsifri

Diff for: docker-compose.yml

@@ -12,8 +12,6 @@ services:
       - "5432:5432"
     networks:
       - app_network
-    environment:
-      POSTGRES_HOST_AUTH_METHOD: trust
 
   web:
     build:

Diff for: expenses/admin.py

@@ -4,5 +4,22 @@
 
 @admin.register(Expense)
 class ExpenseAdmin(admin.ModelAdmin):
-    list_display = ("username", "amount", "expense_type_id", "category_id", "bankcard_id", "created_at", "updated_at")
-    search_fields = ("username", "expense_type_id", "category_id")
+    list_display = (
+        "username",
+        "amount",
+        "user_expense_type_name",
+        "category_name",
+        "bankcard_id",
+        "created_at",
+        "updated_at",
+    )
+
+    def user_expense_type_name(self, obj):
+        return obj.user_expense_type.name
+
+    user_expense_type_name.short_description = "User Expense Type"
+
+    def category_name(self, obj):
+        return obj.category.name
+
+    category_name.short_description = "Category"

Diff for: expenses/migrations/0001_initial.py

@@ -1,26 +1,35 @@
-# Generated by Django 5.0.6 on 2024-06-10 23:28
+# Generated by Django 5.0.6 on 2024-06-17 13:41
 
+import django.db.models.deletion
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = []
+    dependencies = [
+        ("categories", "0001_initial"),
+        ("user_expense_type", "0001_initial"),
+    ]
 
     operations = [
         migrations.CreateModel(
             name="Expense",
             fields=[
                 ("id", models.AutoField(primary_key=True, serialize=False)),
                 ("username", models.UUIDField()),
-                ("expense_type_id", models.IntegerField()),
-                ("category_id", models.IntegerField()),
                 ("bankcard_id", models.IntegerField()),
                 ("amount", models.IntegerField()),
                 ("created_at", models.DateTimeField(auto_now_add=True)),
                 ("updated_at", models.DateTimeField(auto_now=True)),
+                ("category", models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to="categories.category")),
+                (
+                    "user_expense_type",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE, to="user_expense_type.userexpensetype"
+                    ),
+                ),
             ],
         ),
     ]

Diff for: expenses/models.py

@@ -1,11 +1,14 @@
 from django.db import models
+from user_expense_type.models import UserExpenseType
+from categories.models import Category
 
 
 class Expense(models.Model):
     id = models.AutoField(primary_key=True)
     username = models.UUIDField()
-    expense_type_id = models.IntegerField()
-    category_id = models.IntegerField()
+    user_expense_type = models.ForeignKey(UserExpenseType, on_delete=models.CASCADE)
+    category = models.ForeignKey(Category, on_delete=models.CASCADE)
+    # cambiar cuando exista el modelo de bankcard
     bankcard_id = models.IntegerField()
     amount = models.IntegerField()
     created_at = models.DateTimeField(auto_now_add=True)

Diff for: expenses/serializers.py

@@ -1,13 +1,15 @@
 from rest_framework import serializers
 from .models import Expense
+from user_expense_type.models import UserExpenseType
+from categories.models import Category
 
 
 class ExpenseSerializer(serializers.Serializer):
     id = serializers.IntegerField(read_only=True)
 
     username = serializers.UUIDField()
-    expense_type_id = serializers.IntegerField()
-    category_id = serializers.IntegerField()
+    user_expense_type = serializers.PrimaryKeyRelatedField(queryset=UserExpenseType.objects.all())
+    category = serializers.PrimaryKeyRelatedField(queryset=Category.objects.all())
     bankcard_id = serializers.IntegerField()
     amount = serializers.IntegerField()
 

Diff for: expenses/tests.py

@@ -12,8 +12,8 @@ def setUp(self):
         self.client = APIClient()
         self.view = ExpenseViewSet()
         self.expense = {
-            "expense_type_id": 1,
-            "category_id": 1,
+            "user_expense_type": 1,
+            "category": 1,
             "bankcard_id": 1,
             "amount": 100,
         }
@@ -50,6 +50,22 @@ def test_list(self, mock_login_user, mock_list):
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data["amount"], 100)
 
+    @patch.object(ExpenseViewSet, "retrieve")
+    @patch.object(CognitoService, "login_user")
+    def test_retrieve(self, mock_login_user, mock_retrieve):
+        mock_login_user.return_value = {
+            "AuthenticationResult": {"AccessToken": "mock_access_token", "IdToken": "mock_id_token"}
+        }
+        mock_retrieve.return_value = Response(status=status.HTTP_200_OK, data=self.expense)
+
+        request = self.client.get("/expenses/1/")
+        request.headers["Authorization"] = "Bearer mock_access_token"
+
+        response = self.client.get("/expenses/1/")
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data["amount"], 100)
+
     @patch.object(ExpenseViewSet, "destroy")
     @patch.object(CognitoService, "login_user")
     def test_destroy(self, mock_login_user, mock_destroy):
@@ -58,11 +74,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("/expenses/")
+        request = self.client.delete("/expenses/1/")
         request.headers["Authorization"] = "Bearer mock_access_token"
-        request.body = {"id": 1}
 
-        response = self.client.delete("/expenses/")
+        response = self.client.delete("/expenses/1/")
 
         self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
 
@@ -73,18 +88,17 @@ def test_partial_update(self, mock_login_user, mock_partial_update):
             "AuthenticationResult": {"AccessToken": "mock_access_token", "IdToken": "mock_id_token"}
         }
         new_expense = {
-            "expense_type_id": 1,
-            "category_id": 1,
+            "expense_type": 1,
+            "category": 1,
             "bankcard_id": 1,
             "amount": 200,
         }
         mock_partial_update.return_value = Response(status=status.HTTP_200_OK, data=new_expense)
 
-        request = self.client.put("/expenses/", {"amount": 200})
+        request = self.client.put("/expenses/1/", {"amount": 200})
         request.headers["Authorization"] = "Bearer mock_access_token"
-        request.body = {"id": 1}
 
-        response = self.client.put("/expenses/", {"amount": 200})
+        response = self.client.put("/expenses/1/", {"amount": 200})
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data["amount"], 200)
@@ -95,8 +109,8 @@ def setUp(self):
         self.client = APIClient()
         self.view = ExpenseGroupedByTypeAndCategoryViewSet()
         self.expense = {
-            "expense_type_id": 1,
-            "category_id": 1,
+            "expense_type": 1,
+            "category": 1,
             "bankcard_id": 1,
             "amount": 100,
         }

Diff for: expenses/urls.py

@@ -4,9 +4,14 @@
 urlpatterns = [
     path(
         "",
-        ExpenseViewSet.as_view({"get": "list", "post": "create", "delete": "destroy", "put": "partial_update"}),
+        ExpenseViewSet.as_view({"get": "list", "post": "create"}),
         name="expenses",
     ),
+    path(
+        "<int:pk>/",
+        ExpenseViewSet.as_view({"get": "retrieve", "put": "partial_update", "delete": "destroy"}),
+        name="expense-detail",
+    ),
     path(
         "grouped/",
         ExpenseGroupedByTypeAndCategoryViewSet.as_view({"get": "list"}),

Diff for: expenses/views.py

@@ -1,5 +1,7 @@
 from rest_framework import viewsets, status
 from rest_framework.response import Response
+
+# from .models import Expense
 from .models import Expense
 from user_expense_type.models import UserExpenseType
 from categories.models import Category
@@ -36,12 +38,32 @@ def list(self, request):
             username = self.get_user_id_from_token(request)
             expenses = Expense.objects.filter(username=username)
             serializer = ExpenseSerializer(expenses, many=True)
+            for ser in serializer.data:
+                ser.pop("username")
             return Response(serializer.data)
         except Expense.DoesNotExist:
             return Response({"error": "Expenses 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)
+            expense = Expense.objects.get(id=pk, username=username)
+            serializer = ExpenseSerializer(expense)
+            response = {
+                "user_expense_type": serializer.data["user_expense_type"],
+                "category": serializer.data["category"],
+                "bankcard_id": serializer.data["bankcard_id"],
+                "amount": serializer.data["amount"],
+            }
+            return Response(data=response)
+        except Expense.DoesNotExist:
+            return Response({"error": "Expense 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):
         try:
@@ -52,17 +74,22 @@ def create(self, request):
             serializer = ExpenseSerializer(data=data)
             if serializer.is_valid():
                 serializer.save()
-                return Response(serializer.data, status=status.HTTP_201_CREATED)
+                response = {
+                    "user_expense_type": serializer.data["user_expense_type"],
+                    "category": serializer.data["category"],
+                    "bankcard_id": serializer.data["bankcard_id"],
+                    "amount": serializer.data["amount"],
+                }
+                return Response(data=response, status=status.HTTP_201_CREATED)
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
         except Exception as e:
             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")
-            expense = Expense.objects.get(id=id, username=username)
+            expense = Expense.objects.get(id=pk, username=username)
             expense.delete()
             return Response(status=status.HTTP_204_NO_CONTENT)
         except Expense.DoesNotExist:
@@ -71,15 +98,20 @@ 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")
-            expense = Expense.objects.get(id=id, username=username)
+            expense = Expense.objects.get(id=pk, username=username)
             serializer = ExpenseSerializer(expense, data=request.data, partial=True)
             if serializer.is_valid():
                 serializer.save()
-                return Response(serializer.data)
+                response = {
+                    "user_expense_type": serializer.data["user_expense_type"],
+                    "category": serializer.data["category"],
+                    "bankcard_id": serializer.data["bankcard_id"],
+                    "amount": serializer.data["amount"],
+                }
+                return Response(data=response)
             return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
         except Expense.DoesNotExist:
             return Response({"error": "Expense not found"}, status=status.HTTP_404_NOT_FOUND)
@@ -115,19 +147,19 @@ def list(self, request):
             today = now()
             expenses = (
                 Expense.objects.filter(username=username, created_at__year=today.year, created_at__month=today.month)
-                .values("expense_type_id", "category_id")
+                .values("user_expense_type_id", "category_id")
                 .annotate(total_amount=Sum("amount"))
             )
 
             for expense in expenses:
-                expense_type_name = UserExpenseType.objects.get(id=expense["expense_type_id"]).name
-                category_name = Category.objects.get(id=expense["category_id"]).name
+                user_expense_type = UserExpenseType.objects.get(id=expense["user_expense_type_id"])
+                category = Category.objects.get(id=expense["category_id"])
                 total_amount = expense["total_amount"]
 
-                if expense_type_name not in expenses_grouped:
-                    expenses_grouped[expense_type_name] = {}
+                if user_expense_type.name not in expenses_grouped:
+                    expenses_grouped[user_expense_type.name] = {}
 
-                expenses_grouped[expense_type_name][category_name] = total_amount
+                expenses_grouped[user_expense_type.name][category.name] = total_amount
 
             return Response(expenses_grouped)
         except Exception as e: