Tests Update

PO Configure Bugfix

Author: elarroba

django_ledger/models/purchase_order.py

@@ -311,13 +311,18 @@ def configure(self,
             if self.can_generate_po_number():
                 self.generate_po_number(commit=commit)
 
-            if not po_title and not self.po_title and self.po_number:
-                self.po_title = f'PO Number {self.po_number}'
-            else:
-                self.po_title = po_title
+            if not self.po_title:
+                if all([
+                    po_title is None,
+                    self.po_title is None or not len(self.po_title),
+                    self.po_number is not None
+                ]):
+                    self.po_title = f'PO Number {self.po_number}'
+                else:
+                    self.po_title = po_title
 
-            self.clean()
             self.clean_fields()
+            self.clean()
             if commit:
                 self.save()
         return self

django_ledger/settings.py

@@ -41,7 +41,6 @@
 DJANGO_LEDGER_FEEDBACK_EMAIL_LIST = getattr(settings, 'DJANGO_LEDGER_FEEDBACK_EMAIL_LIST', [])
 DJANGO_LEDGER_FEEDBACK_FROM_EMAIL = getattr(settings, 'DJANGO_LEDGER_FEEDBACK_FROM_EMAIL', None)
 DJANGO_LEDGER_VALIDATE_SCHEMAS_AT_RUNTIME = getattr(settings, 'DJANGO_LEDGER_VALIDATE_SCHEMAS_AT_RUNTIME', False)
-DJANGO_LEDGER_LOGIN_URL = getattr(settings, 'DJANGO_LEDGER_LOGIN_URL', settings.LOGIN_URL)
 
 DJANGO_LEDGER_TRANSACTION_MAX_TOLERANCE = getattr(settings,
                                                   'DJANGO_LEDGER_TRANSACTION_MAX_TOLERANCE',

django_ledger/templatetags/django_ledger.py

@@ -18,6 +18,7 @@
 from django_ledger import __version__
 from django_ledger.forms.app_filters import EntityFilterForm, ActivityFilterForm
 from django_ledger.forms.feedback import BugReportForm, RequestNewFeatureForm
+from django_ledger.io import CREDIT, DEBIT
 from django_ledger.io.io_mixin import validate_activity
 from django_ledger.models import TransactionModel, BillModel, InvoiceModel, EntityUnitModel, ItemTransactionModel
 from django_ledger.settings import (
@@ -240,9 +241,9 @@ def bill_txs_table(context, bill_model: BillModel):
         bill_model=bill_model.uuid,
         user_model=context['request'].user,
         entity_slug=context['view'].kwargs['entity_slug']
-    ).select_related('journal_entry').order_by('journal_entry__timestamp')
-    total_credits = sum(tx.amount for tx in txs_queryset if tx.tx_type == 'credit')
-    total_debits = sum(tx.amount for tx in txs_queryset if tx.tx_type == 'debit')
+    ).select_related('journal_entry', 'journal_entry__entity_unit', 'account').order_by('-journal_entry__timestamp')
+    total_credits = sum(tx.amount for tx in txs_queryset if tx.tx_type == CREDIT)
+    total_debits = sum(tx.amount for tx in txs_queryset if tx.tx_type == DEBIT)
     return {
         'style': 'detail',
         'txs': txs_queryset,
@@ -257,9 +258,9 @@ def invoice_txs_table(context, invoice_model: InvoiceModel):
         invoice_model=invoice_model,
         user_model=context['request'].user,
         entity_slug=context['view'].kwargs['entity_slug']
-    ).select_related('journal_entry').order_by('-journal_entry__timestamp')
-    total_credits = sum(tx.amount for tx in txs_queryset if tx.tx_type == 'credit')
-    total_debits = sum(tx.amount for tx in txs_queryset if tx.tx_type == 'debit')
+    ).select_related('journal_entry', 'journal_entry__entity_unit', 'account').order_by('-journal_entry__timestamp')
+    total_credits = sum(tx.amount for tx in txs_queryset if tx.tx_type == CREDIT)
+    total_debits = sum(tx.amount for tx in txs_queryset if tx.tx_type == DEBIT)
     return {
         'style': 'detail',
         'txs': txs_queryset,

django_ledger/tests/base.py

@@ -1,4 +1,4 @@
-from datetime import datetime, date
+from datetime import date, timedelta
 from decimal import Decimal
 from logging import getLogger, DEBUG
 from random import randint, choice
@@ -38,7 +38,7 @@ def setUpTestData(cls):
         cls.USERNAME: str = 'testuser'
         cls.PASSWORD: str = 'NeverUseThisPassword12345'
         cls.USER_EMAIL: str = '[email protected]'
-        cls.N: int = 3
+        cls.N: int = 2
 
         cls.DAYS_FWD: int = randint(180, 180 * 3)
         cls.TZ = get_default_timezone()
@@ -149,3 +149,6 @@ def populate_entity_models(cls):
             cls.logger.info(f'Populating Entity {entity_model.name}...')
             data_generator.populate_entity()
         cls.ENTITY_MODEL_QUERYSET = entities_qs
+
+    def get_random_draft_date(self):
+        return self.START_DATE + timedelta(days=randint(0, 365))

django_ledger/tests/test_bill.py

@@ -10,8 +10,7 @@
 
 from django_ledger.io.roles import ASSET_CA_CASH, ASSET_CA_PREPAID, LIABILITY_CL_DEFERRED_REVENUE, \
     LIABILITY_CL_ACC_PAYABLE
-from django_ledger.models import EntityModel, BillModel, VendorModel, AccountModel
-from django_ledger.settings import DJANGO_LEDGER_LOGIN_URL
+from django_ledger.models import EntityModel, BillModel, VendorModel
 from django_ledger.tests.base import DjangoLedgerBaseTest
 from django_ledger.urls.bill import urlpatterns as bill_urls
 

django_ledger/tests/test_entity.py

@@ -2,12 +2,12 @@
 from random import choice
 from urllib.parse import urlparse
 
+from django.conf import settings
 from django.contrib.auth import get_user_model
 from django.urls import reverse
 from django.utils.timezone import localdate
 
 from django_ledger.models import EntityModel
-from django_ledger.settings import DJANGO_LEDGER_LOGIN_URL
 from django_ledger.tests.base import DjangoLedgerBaseTest
 from django_ledger.urls.entity import urlpatterns as entity_urls
 
@@ -51,12 +51,8 @@ def test_protected_views(self, test_date: date = None):
                 response = self.CLIENT.get(url, follow=False)
                 redirect_url = urlparse(response.url)
                 redirect_path = redirect_url.path
-                login_path = DJANGO_LEDGER_LOGIN_URL
-
-                self.assertEqual(response.status_code, 302,
-                                 msg='EntityModelListView is not protected.')
-                self.assertEqual(redirect_path, login_path,
-                                 msg='EntityModelListView not redirecting to correct auth URL.')
+                self.assertEqual(response.status_code, 302, msg=f'{path} is not protected.')
+                self.assertEqual(redirect_path, settings.LOGIN_URL, msg=f'{path} not redirecting to correct auth URL.')
 
     def test_entity_create(self):
         """
@@ -170,7 +166,7 @@ def test_entity_update(self):
                                         })
             response = self.CLIENT.get(entity_update_url)
 
-        with self.assertNumQueries(4):          # previously 5
+        with self.assertNumQueries(4):  # previously 5
             ent_data = response.context['form'].initial
             ent_data['name'] = 'New Cool Name LLC'
             ent_data = {k: v for k, v in ent_data.items() if v}
@@ -199,7 +195,7 @@ def test_entity_detail(self):
                                         })
             response = self.CLIENT.get(entity_detail_url)
 
-        with self.assertNumQueries(7):         # previously 10
+        with self.assertNumQueries(7):  # previously 10
             local_dt = localdate()
             entity_month_detail_url = reverse('django_ledger:entity-dashboard-month',
                                               kwargs={

django_ledger/tests/test_purchase_order.py

@@ -1,12 +1,13 @@
+from datetime import date, datetime
 from random import choice, randint
+from typing import Union, Optional
 from urllib.parse import urlparse
 from uuid import uuid4
 
 from django.contrib.auth import get_user_model
 from django.urls import reverse
 
 from django_ledger.models import EntityModel, PurchaseOrderModel
-from django_ledger.settings import DJANGO_LEDGER_LOGIN_URL
 from django_ledger.tests.base import DjangoLedgerBaseTest
 from django_ledger.urls.purchase_order import urlpatterns as po_urls
 
@@ -20,11 +21,12 @@ def setUp(self) -> None:
             p.name: set(p.pattern.converters.keys()) for p in po_urls
         }
 
-    def create_purchase_order(self, entity_model: EntityModel) -> PurchaseOrderModel:
-        po_title = f'Purchase Order General-{randint(1000, 9999)}'
-
-        po_model = PurchaseOrderModel(po_title=po_title)
+    def create_purchase_order(self,
+                              entity_model: EntityModel,
+                              draft_date: Optional[Union[date, datetime]] = None) -> PurchaseOrderModel:
+        po_model = PurchaseOrderModel()
         po_model = po_model.configure(entity_slug=entity_model,
+                                      draft_date=draft_date,
                                       user_model=self.user_model,
                                       commit=True)
         return po_model
@@ -40,7 +42,10 @@ def test_protected_views(self):
         self.logout_client()
 
         entity_model: EntityModel = choice(self.ENTITY_MODEL_QUERYSET)
-        po_model = self.create_purchase_order(entity_model)
+        po_model = self.create_purchase_order(
+            entity_model=entity_model,
+            draft_date=self.get_random_draft_date()
+        )
 
         self.assertEqual(len(self.URL_PATTERNS), 15)
         for path, kwargs in self.URL_PATTERNS.items():
@@ -51,21 +56,15 @@ def test_protected_views(self):
             if 'year' in kwargs:
                 url_kwargs['year'] = po_model.date_draft.year
             if 'month' in kwargs:
-                url_kwargs['month'] = po_model.date_draft.month 
+                url_kwargs['month'] = po_model.date_draft.month
             if 'ce_pk' in kwargs:
                 url_kwargs['ce_pk'] = uuid4()
             if 'po_pk' in kwargs:
                 url_kwargs['po_pk'] = uuid4()
 
             url = reverse(f'django_ledger:{path}', kwargs=url_kwargs)
             redirect_response = self.CLIENT.get(url, follow=False)
-            redirect_url = urlparse(redirect_response.url)
-            redirect_path = redirect_url.path
-            login_path = DJANGO_LEDGER_LOGIN_URL
-
             self.assertEqual(redirect_response.status_code, 302, msg=f'{path} view is not protected.')
-            self.assertEqual(redirect_path, login_path, msg=f'{path} view is not redirecting to correct auth URL')
-
 
     def test_purchase_order_list(self):
         """
@@ -75,14 +74,14 @@ def test_purchase_order_list(self):
         entity_model: EntityModel = choice(self.ENTITY_MODEL_QUERYSET)
         po_list_url = reverse('django_ledger:po-list', kwargs={'entity_slug': entity_model.slug})
 
-        with self.assertNumQueries(6):                  # previously 5
+        with self.assertNumQueries(6):  # previously 5
             response = self.CLIENT.get(po_list_url)
         self.assertEqual(response.status_code, 200, msg="Fail to GET Purchase Order list page")
 
         po_model_qs = response.context['po_list']
 
         for po_model in po_model_qs:
-            po_detail_url = reverse('django_ledger:po-detail', 
+            po_detail_url = reverse('django_ledger:po-detail',
                                     kwargs={
                                         'entity_slug': entity_model.slug,
                                         'po_pk': po_model.uuid
@@ -96,7 +95,6 @@ def test_purchase_order_list(self):
             # contains po-detail and po-delete urls
             self.assertContains(response, po_detail_url)
             self.assertContains(response, po_delete_url)
-    
 
     def test_purchase_order_create(self):
         """
@@ -126,7 +124,6 @@ def test_purchase_order_create(self):
         response = self.CLIENT.get(redirect_response.url)
         self.assertContains(response, po_title)
 
-
     def test_purchase_order_detail(self):
         """
         Check elements on PO detail page.
@@ -139,17 +136,17 @@ def test_purchase_order_detail(self):
         # check links, do it on every test PO
         for po_model in po_model_qs:
             po_detail_url = reverse('django_ledger:po-detail', kwargs={
-                                                                'entity_slug': entity_model.slug,
-                                                                'po_pk': po_model.uuid
-                                                            })
+                'entity_slug': entity_model.slug,
+                'po_pk': po_model.uuid
+            })
             po_update_url = reverse('django_ledger:po-update', kwargs={
-                                                                'entity_slug': entity_model.slug,
-                                                                'po_pk': po_model.uuid
-                                                            })
+                'entity_slug': entity_model.slug,
+                'po_pk': po_model.uuid
+            })
             po_delete_url = reverse('django_ledger:po-delete', kwargs={
-                                                                'entity_slug': entity_model.slug,
-                                                                'po_pk': po_model.uuid
-                                                            })
+                'entity_slug': entity_model.slug,
+                'po_pk': po_model.uuid
+            })
             status = po_model.po_status
 
             with self.assertNumQueries(5):
@@ -163,15 +160,15 @@ def test_purchase_order_detail(self):
 
             if status == po_model.PO_STATUS_DRAFT:
                 self.assertContains(response, po_model.get_mark_as_review_html_id())
-                #self.assertContains(response, po_delete_url)
+                # self.assertContains(response, po_delete_url)
                 self.assertContains(response, po_model.get_mark_as_canceled_html_id())
 
             elif status == po_model.PO_STATUS_REVIEW:
                 self.assertContains(response, po_model.get_mark_as_draft_html_id())
                 self.assertContains(response, po_model.get_mark_as_approved_html_id())
-                #self.assertContains(response, po_delete_url)
+                # self.assertContains(response, po_delete_url)
                 self.assertContains(response, po_model.get_mark_as_canceled_html_id())
-                
+
             elif status == po_model.PO_STATUS_APPROVED:
                 self.assertContains(response, po_model.get_mark_as_fulfilled_html_id())
                 self.assertContains(response, po_model.get_mark_as_void_html_id())
@@ -184,4 +181,4 @@ def test_purchase_order_detail(self):
             #     response = self.CLIENT.get(po_update_url)
             # self.assertEqual(response.status_code, 200, msg=f"Error browsing PO {po_model.uuid} update page.")
 
-            # after successful update, redirect to detail page
+            # after successful update, redirect to detail page

django_ledger/views/entity.py

@@ -133,10 +133,7 @@ def get_context_data(self, *, object_list=None, **kwargs):
     def get_success_url(self):
         return reverse('django_ledger:home')
 
-    def post(self, request, *args, **kwargs):
-        return self.delete(request, *args, **kwargs)
-
-    def delete(self, request, *args, **kwargs):
+    def form_valid(self, form):
         entity_model: EntityModel = self.get_object()
         entity_model.default_coa = None
         entity_model.save(update_fields=['default_coa'])
@@ -151,7 +148,7 @@ def delete(self, request, *args, **kwargs):
             entity_slug=self.kwargs['entity_slug']
         ).delete()
 
-        return super().delete(request, *args, **kwargs)
+        return super().form_valid(form=form)
 
 
 # DASHBOARD VIEWS START ----

django_ledger/views/mixins.py

@@ -360,12 +360,12 @@ def get_io_digest(self, context, from_date=None, to_date=None, **kwargs):
 
             if self.IO_DIGEST:
                 txs_queryset, digest = entity_model.digest(user_model=self.request.user,
-                                                     to_date=to_date,
-                                                     unit_slug=unit_slug,
-                                                     by_period=True if by_period else False,
-                                                     process_ratios=True,
-                                                     process_roles=True,
-                                                     process_groups=True)
+                                                           to_date=to_date,
+                                                           unit_slug=unit_slug,
+                                                           by_period=True if by_period else False,
+                                                           process_ratios=True,
+                                                           process_roles=True,
+                                                           process_groups=True)
 
                 context.update(digest)