Merge pull request #44 from Kalgoc/develop

Develop

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)

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/tests.py

@@ -1,135 +1,118 @@
-from django.test import TestCase
-from unittest.mock import patch
-from rest_framework.test import APIClient
+from rest_framework.test import APITestCase, APIClient
 from rest_framework import status
+from unittest.mock import patch
+from authentication.models import User
+from user_expense_type.models import UserExpenseType
+from bankcard.models import BankCard
 from authentication.services.cognito_service import CognitoService
-from rest_framework.response import Response
-from .views import ExpenseViewSet, ExpenseGroupedByTypeAndCategoryViewSet
 
 
-class ExpenseViewSetTestCase(TestCase):
+class ExpenseViewSetTestCase(APITestCase):
     def setUp(self):
         self.client = APIClient()
-        self.view = ExpenseViewSet()
-        self.expense = {
-            "user_expense_type": 1,
+        self.user = User.objects.create_user(
+            username="test@email.com",
+            email="test@email.com",
+            password="TestPassword1",
+            first_name="Test User",
+            user_id="389704ef-1e4f-4000-a801-bf887a1c88f2",
+        )
+        self.user_expense_type = UserExpenseType.objects.create(
+            username="389704ef-1e4f-4000-a801-bf887a1c88f2", set_by_user=False, name="Personal"
+        )
+        self.bankcard = BankCard.objects.create(
+            user_id=self.user, account_number=123456, bank_name="Test Bank", card_type="debit"
+        )
+        self.expense_data = {
+            "user_expense_type": self.user_expense_type.id,
             "category": 1,
-            "bankcard_id": 1,
+            "bankcard_id": self.bankcard.id,
             "amount": 100,
+            "description": "Test description",
+            "username": "389704ef-1e4f-4000-a801-bf887a1c88f2",
         }
 
-    @patch.object(ExpenseViewSet, "create")
-    @patch.object(CognitoService, "login_user")
-    def test_create(self, mock_login_user, mock_create):
-        mock_login_user.return_value = {
-            "AuthenticationResult": {"AccessToken": "mock_access_token", "IdToken": "mock_id_token"}
-        }
-        mock_create.return_value = Response(status=status.HTTP_201_CREATED, data=self.expense)
-
-        request = self.client.post("/expenses/", self.expense)
-        request.headers["Authorization"] = "Bearer mock_access_token"
+    @patch("authentication.decorators.get_user_id_from_token")
+    @patch("expenses.views.categorize_expense_description")
+    @patch("expenses.views.get_user_id_from_token")
+    def test_create(self, mock_get_user_id, mock_categorize, mock_auth_get_user_id):
+        mock_get_user_id.return_value = "389704ef-1e4f-4000-a801-bf887a1c88f2"
+        mock_categorize.return_value = self.expense_data, None
+        mock_auth_get_user_id.return_value = "389704ef-1e4f-4000-a801-bf887a1c88f2"
 
-        response = self.client.post("/expenses/", self.expense)
+        response = self.client.post("/expenses/", self.expense_data)
 
         self.assertEqual(response.status_code, status.HTTP_201_CREATED)
         self.assertEqual(response.data["amount"], 100)
 
-    @patch.object(ExpenseViewSet, "list")
-    @patch.object(CognitoService, "login_user")
-    def test_list(self, mock_login_user, mock_list):
-        mock_login_user.return_value = {
-            "AuthenticationResult": {"AccessToken": "mock_access_token", "IdToken": "mock_id_token"}
-        }
-        mock_list.return_value = Response(status=status.HTTP_200_OK, data=self.expense)
-
-        request = self.client.get("/expenses/")
-        request.headers["Authorization"] = "Bearer mock_access_token"
+    @patch("authentication.decorators.get_user_id_from_token")
+    @patch("expenses.views.categorize_expense_description")
+    @patch("expenses.views.get_user_id_from_token")
+    def test_list(self, mock_get_user_id, mock_categorize, mock_auth_get_user_id):
+        mock_get_user_id.return_value = "389704ef-1e4f-4000-a801-bf887a1c88f2"
+        mock_categorize.return_value = self.expense_data, None
+        mock_auth_get_user_id.return_value = "389704ef-1e4f-4000-a801-bf887a1c88f2"
 
+        response = self.client.post("/expenses/", self.expense_data)
+        response = self.client.post("/expenses/", self.expense_data)
         response = self.client.get("/expenses/")
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data["amount"], 100)
+        self.assertEqual(len(response.data), 2)
 
-    @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"
+    @patch("authentication.decorators.get_user_id_from_token")
+    @patch("expenses.views.categorize_expense_description")
+    @patch("expenses.views.get_user_id_from_token")
+    def test_retrieve(self, mock_get_user_id, mock_categorize, mock_auth_get_user_id):
+        mock_get_user_id.return_value = "389704ef-1e4f-4000-a801-bf887a1c88f2"
+        mock_categorize.return_value = self.expense_data, None
+        mock_auth_get_user_id.return_value = "389704ef-1e4f-4000-a801-bf887a1c88f2"
 
-        response = self.client.get("/expenses/1/")
+        response = self.client.post("/expenses/", self.expense_data)
+        response = self.client.get(f"/expenses/{response.data['id']}/")
 
         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):
-        mock_login_user.return_value = {
-            "AuthenticationResult": {"AccessToken": "mock_access_token", "IdToken": "mock_id_token"}
-        }
-        mock_destroy.return_value = Response(status=status.HTTP_204_NO_CONTENT)
-
-        request = self.client.delete("/expenses/1/")
-        request.headers["Authorization"] = "Bearer mock_access_token"
-
-        response = self.client.delete("/expenses/1/")
-
-        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+    @patch("authentication.decorators.get_user_id_from_token")
+    @patch("expenses.views.categorize_expense_description")
+    @patch("expenses.views.get_user_id_from_token")
+    def test_update(self, mock_get_user_id, mock_categorize, mock_auth_get_user_id):
+        mock_get_user_id.return_value = "389704ef-1e4f-4000-a801-bf887a1c88f2"
+        mock_categorize.return_value = self.expense_data, None
+        mock_auth_get_user_id.return_value = "389704ef-1e4f-4000-a801-bf887a1c88f2"
 
-    @patch.object(ExpenseViewSet, "partial_update")
-    @patch.object(CognitoService, "login_user")
-    def test_partial_update(self, mock_login_user, mock_partial_update):
-        mock_login_user.return_value = {
-            "AuthenticationResult": {"AccessToken": "mock_access_token", "IdToken": "mock_id_token"}
-        }
-        new_expense = {
-            "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/1/", {"amount": 200})
-        request.headers["Authorization"] = "Bearer mock_access_token"
-
-        response = self.client.put("/expenses/1/", {"amount": 200})
+        response = self.client.post("/expenses/", self.expense_data)
+        response = self.client.put(f"/expenses/{response.data['id']}/", {"amount": 200})
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
         self.assertEqual(response.data["amount"], 200)
 
+    @patch("authentication.decorators.get_user_id_from_token")
+    @patch("expenses.views.categorize_expense_description")
+    @patch("expenses.views.get_user_id_from_token")
+    def test_delete(self, mock_get_user_id, mock_categorize, mock_auth_get_user_id):
+        mock_get_user_id.return_value = "389704ef-1e4f-4000-a801-bf887a1c88f2"
+        mock_categorize.return_value = self.expense_data, None
+        mock_auth_get_user_id.return_value = "389704ef-1e4f-4000-a801-bf887a1c88f2"
 
-class ExpenseGroupedByTypeAndCategoryViewSetTestCase(TestCase):
-    def setUp(self):
-        self.client = APIClient()
-        self.view = ExpenseGroupedByTypeAndCategoryViewSet()
-        self.expense = {
-            "expense_type": 1,
-            "category": 1,
-            "bankcard_id": 1,
-            "amount": 100,
-        }
-        self.expenses_grouped = {"Personal": {"Comida": 100}}
+        response = self.client.post("/expenses/", self.expense_data)
+        response = self.client.delete(f"/expenses/{response.data['id']}/")
 
-    @patch.object(ExpenseGroupedByTypeAndCategoryViewSet, "list")
-    @patch.object(CognitoService, "login_user")
-    def test_list(self, mock_login_user, mock_list):
-        mock_login_user.return_value = {
-            "AuthenticationResult": {"AccessToken": "mock_access_token", "IdToken": "mock_id_token"}
-        }
-        mock_list.return_value = Response(status=status.HTTP_200_OK, data=self.expenses_grouped)
+        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
 
-        request = self.client.get("/expenses/grouped/")
-        request.headers["Authorization"] = "Bearer mock_access_token"
+    @patch("authentication.decorators.get_user_id_from_token")
+    @patch("expenses.views.categorize_expense_description")
+    @patch("expenses.views.get_user_id_from_token")
+    def test_grouped(self, mock_get_user_id, mock_categorize, mock_auth_get_user_id):
+        mock_get_user_id.return_value = "389704ef-1e4f-4000-a801-bf887a1c88f2"
+        mock_categorize.return_value = self.expense_data, None
+        mock_auth_get_user_id.return_value = "389704ef-1e4f-4000-a801-bf887a1c88f2"
 
+        response = self.client.post("/expenses/", self.expense_data)
+        response = self.client.post("/expenses/", self.expense_data)
         response = self.client.get("/expenses/grouped/")
 
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertIn("Personal", response.data)
-        self.assertIn("Comida", response.data["Personal"])
-        self.assertEqual(response.data["Personal"]["Comida"], 100)
+        self.assertEqual(len(response.data), 1)
+        self.assertEqual(response.data["Personal"]["Comida"], 200)

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")