Merge pull request #34 from Kalgoc/feat/shared-expenses

Feat - Filter for expenses list implemented

Author: anibalcontreras

expenses/migrations/0004_alter_expense_username.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.0.6 on 2024-07-02 01:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("expenses", "0003_merge_20240701_2317"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="expense",
+            name="username",
+            field=models.UUIDField(),
+        ),
+    ]

expenses/models.py

@@ -8,7 +8,7 @@
 
 class Expense(models.Model):
     id = models.AutoField(primary_key=True)
-    username = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, to_field="user_id")
+    username = models.UUIDField()
     description = models.CharField(max_length=255, blank=True, null=True)
     user_expense_type = models.ForeignKey(UserExpenseType, on_delete=models.CASCADE)
     category = models.ForeignKey(Category, on_delete=models.CASCADE)

expenses/serializers.py

@@ -8,12 +8,13 @@
 
 class ExpenseSerializer(serializers.Serializer):
     id = serializers.IntegerField(read_only=True)
-    username = serializers.PrimaryKeyRelatedField(queryset=get_user_model().objects.all())
+    username = serializers.UUIDField()
     user_expense_type = serializers.PrimaryKeyRelatedField(queryset=UserExpenseType.objects.all(), required=False)
     category = serializers.PrimaryKeyRelatedField(queryset=Category.objects.all())
     bankcard_id = serializers.PrimaryKeyRelatedField(queryset=BankCard.objects.all())
     amount = serializers.IntegerField()
     description = serializers.CharField(max_length=255, allow_blank=True, allow_null=True)
+    created_at = serializers.DateTimeField(read_only=True)
 
     def validate(self, data):
         user_expense_type = data.get("user_expense_type")

expenses/views.py

@@ -37,6 +37,16 @@ def list(self, request):
         try:
             username = get_user_id_from_token(request)
             expenses = Expense.objects.filter(username=username)
+
+            start_date = request.query_params.get("start_date")
+            end_date = request.query_params.get("end_date")
+
+            if start_date and end_date:
+                expenses = expenses.filter(created_at__range=[start_date, end_date])
+            elif start_date:
+                expenses = expenses.filter(created_at__gte=start_date)
+            elif end_date:
+                expenses = expenses.filter(created_at__lte=end_date)
             serializer = ExpenseSerializer(expenses, many=True)
             return Response(serializer.data)
         except Expense.DoesNotExist: