Merge pull request #43 from Kalgoc/fix/expense-in-order

Fix/expense in order

Author: anibalcontreras

AI/AI.py

@@ -4,6 +4,7 @@
 from textwrap import dedent
 from dotenv import load_dotenv
 from categories.models import Category
+from categories.exceptions import InvalidCategoryError
 
 
 GPT_MODEL = "gpt-4-turbo"
@@ -77,5 +78,5 @@ def category_matched_with_id(category):
         "Inversión",
     ]
     if category not in categories_allowed:
-        raise ValueError(f"Categoría no permitida: {category}")
+        raise InvalidCategoryError(category)
     return category

AI/tests.py

@@ -3,6 +3,7 @@
 from unittest.mock import patch
 from AI import classify_text, category_matched_with_id
 from textwrap import dedent
+from categories.exceptions import InvalidCategoryError
 
 
 class TestGastosClassifier(unittest.TestCase):
@@ -54,7 +55,7 @@ def test_clean_category(self):
         self.assertEqual(category_matched_with_id("vivienda."), "Vivienda")
 
         # Prueba de una categoría no permitida
-        with self.assertRaises(ValueError):
+        with self.assertRaises(InvalidCategoryError):
             category_matched_with_id("Categoría: Viajes.")
 
 

categories/exceptions.py

@@ -0,0 +1,9 @@
+class InvalidCategoryError(Exception):
+    def __init__(self, category):
+        self.category = category
+        self.message = (
+            "El texto proporcionado no proporciona información suficiente para "
+            "clasificar el gasto en una categoría. Por favor, se un poco mas descriptivo."
+        )
+        self.code = 400
+        super().__init__(self.message)

docker-compose.yml

@@ -20,7 +20,7 @@ services:
   web:
     build:
       context: .
-      dockerfile: Dockerfile
+      dockerfile: Dev.Dockerfile
     container_name: web
     volumes:
       - .:/app
@@ -37,7 +37,7 @@ services:
       POSTGRES_PORT: ${DB_PORT}
       POSTGRES_HOST: ${DB_HOST}
       OPENAI_API_KEY: ${OPENAI_API_KEY}
-      DJANGO_SETTINGS_MODULE: piggywallet.settings.prod
+      DJANGO_SETTINGS_MODULE: piggywallet.settings.dev
 
 networks:
   app_network:

expenses/services/categorize_expense.py

@@ -2,6 +2,7 @@
 from rest_framework import status
 from categories.models import Category
 from AI.AI import get_category_name_from_description
+from categories.exceptions import InvalidCategoryError
 
 
 def categorize_expense_description(data):
@@ -13,5 +14,7 @@ def categorize_expense_description(data):
             return data, None
         except ValueError as e:
             return None, Response({"error": str(e)}, status=status.HTTP_400_BAD_REQUEST)
+        except InvalidCategoryError as e:
+            return None, Response({"error": str(e)}, status=e.code)
     else:
         return None, Response({"error": "Description is required"}, status=status.HTTP_400_BAD_REQUEST)

expenses/views.py

@@ -36,7 +36,7 @@ def get_user_id_from_token(self, request):
     def list(self, request):
         try:
             username = get_user_id_from_token(request)
-            expenses = Expense.objects.filter(username=username)
+            expenses = Expense.objects.filter(username=username).order_by("-created_at")
 
             start_date = request.query_params.get("start_date")
             end_date = request.query_params.get("end_date")