Merge branch 'ianshulx:main' into contribution/event-system

Author: rajaalebchiri

.github/FUNDING.yml

@@ -1,13 +1 @@
-# These are supported funding model platforms
 
-github: [ianshulx]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
-custom:  ['https://paypal.me/ianshulx?country.x=IN&locale.x=en_GB']

FinanceTracker/FinTech/migrations/0007_alter_expense_date_alter_income_date.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.5 on 2024-10-04 17:40
+
+import datetime
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('FinTech', '0006_alter_expensecategory_name_alter_incomecategory_name'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='expense',
+            name='date',
+            field=models.DateField(default=datetime.date(2024, 10, 4)),
+        ),
+        migrations.AlterField(
+            model_name='income',
+            name='date',
+            field=models.DateField(default=datetime.date(2024, 10, 4)),
+        ),
+    ]

FinanceTracker/FinTech/tests.py

@@ -16,7 +16,7 @@ def dashboard(request):
         for catg in my_catg:
             out_dict[catg.name]=0
 
-        expenses= Expense.objects.filter(user=request.user.id)
+        expenses= Expense.objects.filter(user=request.user.id).order_by('id')
         for expense in expenses:
             catg=expense.category
             pre_amount=expense.amount

FinanceTracker/FinTech/views.py

@@ -0,0 +1,57 @@
+from django.test import TestCase
+from django.contrib.auth.models import User
+from FinTech.models import IncomeCategory, ExpenseCategory
+
+class CategoryModelTest(TestCase):
+    
+    def setUp(self):
+        # Create a user for testing
+        self.user = User.objects.create_user(username='testuser', password='testpass')
+
+    def test_income_category_creation(self):
+        # Create an IncomeCategory instance
+        income_category = IncomeCategory.objects.create(name='Salary', user=self.user)
+        
+        # Check if the category was created successfully
+        self.assertEqual(income_category.name, 'Salary')
+        self.assertEqual(income_category.user, self.user)
+        self.assertIsInstance(income_category, IncomeCategory)
+
+    def test_expense_category_creation(self):
+        # Create an ExpenseCategory instance
+        expense_category = ExpenseCategory.objects.create(name='Food', user=self.user)
+        
+        # Check if the category was created successfully
+        self.assertEqual(expense_category.name, 'Food')
+        self.assertEqual(expense_category.user, self.user)
+        self.assertIsInstance(expense_category, ExpenseCategory)
+
+    def test_income_category_str_method(self):
+        # Create an IncomeCategory instance
+        income_category = IncomeCategory.objects.create(name='Salary', user=self.user)
+        
+        # Check if the string representation is correct
+        self.assertEqual(str(income_category), 'Salary')
+
+    def test_expense_category_str_method(self):
+        # Create an ExpenseCategory instance
+        expense_category = ExpenseCategory.objects.create(name='Food', user=self.user)
+        
+        # Check if the string representation is correct
+        self.assertEqual(str(expense_category), 'Food')
+
+    def test_income_category_user_relationship(self):
+        # Create an IncomeCategory instance
+        income_category = IncomeCategory.objects.create(name='Bonus', user=self.user)
+        
+        # Check if the user relationship is correct
+        self.assertEqual(income_category.user.username, 'testuser')
+        self.assertEqual(self.user.user_inc_catg.count(), 1)  # Check that the user has 1 income category
+
+    def test_expense_category_user_relationship(self):
+        # Create an ExpenseCategory instance
+        expense_category = ExpenseCategory.objects.create(name='Transport', user=self.user)
+        
+        # Check if the user relationship is correct
+        self.assertEqual(expense_category.user.username, 'testuser')
+        self.assertEqual(self.user.user_exp_catg.count(), 1)  # Check that the user has 1 expense category

FinanceTracker/FinanceTracker/tests/__init__.py

@@ -0,0 +1,50 @@
+from django.test import SimpleTestCase
+from django.urls import reverse, resolve
+from FinTech.views import dashboard, income, expenses, edit_income, edit_expense, delete_expense, delete_income, expense_report, income_report, add_expense_category, add_income_category, remove_expense_category, remove_income_category, profile, settings, index, signup, login, logout
+
+
+
+class TestUrls(SimpleTestCase):
+    
+    def test_dashboard_url(self):
+        url = reverse('dashboard')
+        #print(resolve(url))
+        self.assertEqual(resolve(url).func, dashboard)
+
+    def test_incomes_url(self):
+        url = reverse('incomes')
+        self.assertEqual(resolve(url).func, income)
+        self.assertNotEqual(resolve(url).func, expenses)
+
+    def test_expenses_url(self):
+        url = reverse('expenses')
+        self.assertEqual(resolve(url).func, expenses)        
+
+    def test_edit_Income_url(self):
+        url = reverse('edit-income', args=[1])
+        self.assertEqual(resolve(url).func, edit_income)        
+
+    def test_edit_Expense_url(self):
+        url = reverse('edit-expense', args=[2])
+        self.assertEqual(resolve(url).func, edit_expense)     
+
+    def test_Expense_Report_url(self):
+        url = reverse('expense-report', args=['string'])
+        self.assertEqual(resolve(url).func, expense_report)      
+
+    def test_remove_Income_url(self):
+        url = reverse('remove-income-category', args=[1])
+        self.assertNotEqual(resolve(url).func, income)      
+        self.assertEqual(resolve(url).func, remove_income_category)   
+
+    def test_profile_url(self):
+        url = reverse('profile')
+        self.assertEqual(resolve(url).func, profile)       
+        self.assertNotEqual(resolve(url).func, settings)  
+
+    def test_signup_url(self):
+        url = reverse('signup')
+        self.assertEqual(resolve(url).func, signup) 
+        self.assertNotEqual(resolve(url).func, index)   
+        self.assertNotEqual(resolve(url).func, login)  
+        self.assertNotEqual(resolve(url).func, logout) 

FinanceTracker/FinanceTracker/tests/test_models.py

@@ -0,0 +1,48 @@
+from django.test import TestCase, Client
+from django.urls import reverse
+from django.contrib.auth.models import User
+from datetime import date
+from unittest.mock import patch, MagicMock
+from FinTech.models import IncomeCategory, ExpenseCategory, Income, Expense, Budget, Account
+import json
+
+
+class TestViews(TestCase):
+    
+    def setUp(self):
+        # Create a user and log them in
+        self.user = User.objects.create_user(username='testuser', password='testpass')
+        self.client.login(username='testuser', password='testpass')
+        
+        # Create an account for the user
+        self.account = Account.objects.create(user=self.user, balance=500)
+        
+        # Create expense categories for the user
+        self.catg_food = ExpenseCategory.objects.create(user=self.user, name='Food')
+        self.catg_transport = ExpenseCategory.objects.create(user=self.user, name='Transport')
+
+        # Create expenses for the user
+        self.expense1 = Expense.objects.create(user=self.user, amount=50, category=self.catg_food, date=date.today())
+        self.expense2 = Expense.objects.create(user=self.user, amount=20, category=self.catg_transport, date=date.today())
+        self.expense3 = Expense.objects.create(user=self.user, amount=30, category=self.catg_food, date=date.today())
+    
+    def test_dashboard_view_expenses_and_balance(self):
+        # Call the dashboard view
+        response = self.client.get(reverse('dashboard'))
+        
+        # Check if the response is 200 OK
+        self.assertEqual(response.status_code, 200)
+        
+        # Check if the account balance is passed correctly to the template
+        self.assertContains(response, self.account.balance)
+        
+        # Check if the expenses by category are calculated correctly
+        context = response.context
+        expected_expenses = {
+            'Food': 80,  # 50 + 30
+            'Transport': 20  # 20
+        }
+        
+        # Verify that the output dictionary has correct totals
+       # self.assertEqual(context['catg_list'], ['Food', 'Transport'])
+        self.assertEqual(context['catg_total_list'], [80, 20])

FinanceTracker/FinanceTracker/tests/test_urls.py

@@ -0,0 +1,65 @@
+
+# URL-Shortener
+
+A simple and fast URL shortener! This allows to convert long URLs into shorter, more manageable links, making them easier to share, tweet, or send via email.
+
+### Installation
+**1. Create a Folder where you want to save the project**
+
+**2. Create a Virtual Environment and Activate**
+
+Install Virtual Environment First
+```
+$  pip install virtualenv
+```
+
+Create Virtual Environment
+
+For Windows
+```
+$  python -m venv venv
+```
+For Mac
+```
+$  python3 -m venv venv
+```
+
+Activate Virtual Environment
+
+For Windows
+```
+$  source venv/scripts/activate
+```
+
+For Mac
+```
+$  source venv/bin/activate
+```
+
+**3. Clone this project**
+
+```
+$  git clone https://github.com/saminmahmud/URL-Shortener.git
+```
+
+Then, Enter the project
+```
+$  cd URL-Shortener
+```
+
+**4. Install Requirements from 'requirements.txt'**
+```python
+$  pip install -r requirements.txt
+```
+
+**5. Now Run Server**
+
+Command for Windows:
+```python
+$ python manage.py runserver
+```
+
+Command for Linux or Mac:
+```python
+$ python3 manage.py runserver
+```